From d618ab07dfb2e98f8c798a3569b8dd976584b496 Mon Sep 17 00:00:00 2001 From: Johann Dreo Date: Thu, 27 Jan 2011 11:23:23 +0100 Subject: [PATCH] rename everything from 'do' to 'edo' --- AUTHORS | 36 ++ CMakeLists.txt | 10 +- COPYING | 503 +++++++++++++++++- README | 8 +- application/CMakeLists.txt | 2 +- application/eda/CMakeLists.txt | 6 +- application/eda/main.cpp | 51 +- application/eda_sa/CMakeLists.txt | 6 +- application/eda_sa/main.cpp | 26 +- build_gcc_linux_debug | 2 +- build_gcc_linux_release | 2 +- do.pc | 12 - doc/CMakeLists.txt | 2 +- edo.pc | 12 + src/CMakeLists.txt | 4 +- src/do | 59 -- src/do.cpp | 8 - src/doAlgo.h | 23 - src/doBounder.h | 34 -- src/doBounderBound.h | 42 -- src/doBounderNo.h | 20 - src/doBounderRng.h | 42 -- src/doBounderUniform.h | 35 -- src/doContinue.h | 41 -- src/doDistrib.h | 23 - src/doEstimator.h | 23 - src/doEstimatorNormalMono.h | 77 --- src/doEstimatorUniform.h | 51 -- src/doModifier.h | 20 - src/doModifierDispersion.h | 23 - src/doModifierMass.h | 24 - src/doNormalMono.h | 38 -- src/doNormalMonoCenter.h | 26 - src/doNormalMultiCenter.h | 28 - src/doSampler.h | 75 --- src/doSamplerNormalMono.h | 71 --- src/doSamplerUniform.h | 76 --- src/doUniform.h | 23 - src/doUniformCenter.h | 35 -- src/doVectorBounds.h | 36 -- src/edo | 79 +++ src/edo.cpp | 28 + src/edoAlgo.h | 44 ++ src/edoBounder.h | 54 ++ src/edoBounderBound.h | 62 +++ src/edoBounderNo.h | 40 ++ src/edoBounderRng.h | 63 +++ src/edoBounderUniform.h | 55 ++ src/edoContinue.h | 61 +++ src/edoDistrib.h | 43 ++ src/{doEDA.h => edoEDA.h} | 66 ++- src/{doEDASA.h => edoEDASA.h} | 66 ++- src/edoEstimator.h | 43 ++ src/edoEstimatorNormalMono.h | 97 ++++ ...ormalMulti.h => edoEstimatorNormalMulti.h} | 45 +- src/edoEstimatorUniform.h | 71 +++ src/edoModifier.h | 41 ++ src/edoModifierDispersion.h | 43 ++ src/edoModifierMass.h | 45 ++ src/edoNormalMono.h | 58 ++ src/edoNormalMonoCenter.h | 47 ++ src/{doNormalMulti.h => edoNormalMulti.h} | 12 +- src/edoNormalMultiCenter.h | 48 ++ src/edoSampler.h | 95 ++++ src/edoSamplerNormalMono.h | 91 ++++ ...rNormalMulti.h => edoSamplerNormalMulti.h} | 59 +- src/edoSamplerUniform.h | 96 ++++ src/edoUniform.h | 43 ++ src/edoUniformCenter.h | 55 ++ src/edoVectorBounds.h | 56 ++ src/utils/CMakeLists.txt | 6 +- src/utils/doFileSnapshot.h | 74 --- src/utils/doHyperVolume.h | 32 -- src/utils/doPopStat.h | 75 --- src/utils/doStat.h | 54 -- src/utils/doStatNormalMono.h | 35 -- src/utils/doStatNormalMulti.h | 48 -- src/utils/doStatUniform.h | 35 -- src/utils/{doCheckPoint.h => edoCheckPoint.h} | 52 +- ...doFileSnapshot.cpp => edoFileSnapshot.cpp} | 61 ++- src/utils/edoFileSnapshot.h | 79 +++ src/utils/edoHyperVolume.h | 52 ++ src/utils/edoPopStat.h | 70 +++ src/utils/edoStat.h | 74 +++ src/utils/edoStatNormalMono.h | 55 ++ src/utils/edoStatNormalMulti.h | 68 +++ src/utils/edoStatUniform.h | 55 ++ test/CMakeLists.txt | 6 +- test/t-bounderno.cpp | 31 +- test/t-continue.cpp | 33 +- ...ulti.cpp => t-edoEstimatorNormalMulti.cpp} | 53 +- test/t-mean-distance.cpp | 42 +- test/t-uniform.cpp | 31 +- test/test_cov_parameters.py | 2 +- 94 files changed, 2933 insertions(+), 1531 deletions(-) create mode 100644 AUTHORS delete mode 100644 do.pc create mode 100644 edo.pc delete mode 100644 src/do delete mode 100644 src/do.cpp delete mode 100644 src/doAlgo.h delete mode 100644 src/doBounder.h delete mode 100644 src/doBounderBound.h delete mode 100644 src/doBounderNo.h delete mode 100644 src/doBounderRng.h delete mode 100644 src/doBounderUniform.h delete mode 100644 src/doContinue.h delete mode 100644 src/doDistrib.h delete mode 100644 src/doEstimator.h delete mode 100644 src/doEstimatorNormalMono.h delete mode 100644 src/doEstimatorUniform.h delete mode 100644 src/doModifier.h delete mode 100644 src/doModifierDispersion.h delete mode 100644 src/doModifierMass.h delete mode 100644 src/doNormalMono.h delete mode 100644 src/doNormalMonoCenter.h delete mode 100644 src/doNormalMultiCenter.h delete mode 100644 src/doSampler.h delete mode 100644 src/doSamplerNormalMono.h delete mode 100644 src/doSamplerUniform.h delete mode 100644 src/doUniform.h delete mode 100644 src/doUniformCenter.h delete mode 100644 src/doVectorBounds.h create mode 100644 src/edo create mode 100644 src/edo.cpp create mode 100644 src/edoAlgo.h create mode 100644 src/edoBounder.h create mode 100644 src/edoBounderBound.h create mode 100644 src/edoBounderNo.h create mode 100644 src/edoBounderRng.h create mode 100644 src/edoBounderUniform.h create mode 100644 src/edoContinue.h create mode 100644 src/edoDistrib.h rename src/{doEDA.h => edoEDA.h} (79%) rename src/{doEDASA.h => edoEDASA.h} (79%) create mode 100644 src/edoEstimator.h create mode 100644 src/edoEstimatorNormalMono.h rename src/{doEstimatorNormalMulti.h => edoEstimatorNormalMulti.h} (68%) create mode 100644 src/edoEstimatorUniform.h create mode 100644 src/edoModifier.h create mode 100644 src/edoModifierDispersion.h create mode 100644 src/edoModifierMass.h create mode 100644 src/edoNormalMono.h create mode 100644 src/edoNormalMonoCenter.h rename src/{doNormalMulti.h => edoNormalMulti.h} (86%) create mode 100644 src/edoNormalMultiCenter.h create mode 100644 src/edoSampler.h create mode 100644 src/edoSamplerNormalMono.h rename src/{doSamplerNormalMulti.h => edoSamplerNormalMulti.h} (67%) create mode 100644 src/edoSamplerUniform.h create mode 100644 src/edoUniform.h create mode 100644 src/edoUniformCenter.h create mode 100644 src/edoVectorBounds.h delete mode 100644 src/utils/doFileSnapshot.h delete mode 100644 src/utils/doHyperVolume.h delete mode 100644 src/utils/doPopStat.h delete mode 100644 src/utils/doStat.h delete mode 100644 src/utils/doStatNormalMono.h delete mode 100644 src/utils/doStatNormalMulti.h delete mode 100644 src/utils/doStatUniform.h rename src/utils/{doCheckPoint.h => edoCheckPoint.h} (57%) rename src/utils/{doFileSnapshot.cpp => edoFileSnapshot.cpp} (57%) create mode 100644 src/utils/edoFileSnapshot.h create mode 100644 src/utils/edoHyperVolume.h create mode 100644 src/utils/edoPopStat.h create mode 100644 src/utils/edoStat.h create mode 100644 src/utils/edoStatNormalMono.h create mode 100644 src/utils/edoStatNormalMulti.h create mode 100644 src/utils/edoStatUniform.h rename test/{t-doEstimatorNormalMulti.cpp => t-edoEstimatorNormalMulti.cpp} (78%) diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..550b46c09 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,36 @@ + +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group + +Authors: + +N:Johann Dréo +P:nojhan +E:johann.dreo@thalesgroup.com +D:2010-07-01 +C:original design and code + +N:Caner Candan +P: +E:caner.candan@thalesgroup.com +D:2010-07-01 +C:original design and code + +As of 2011-01-25, Thales SA disclaims all copyright interest in the Evolving Distribution Objects (EDO) framework. diff --git a/CMakeLists.txt b/CMakeLists.txt index 31da2b9c8..868c456be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # Checks cmake version compatibility CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(DO) +PROJECT(EDO) SET(PROJECT_VERSION_MAJOR 1) SET(PROJECT_VERSION_MINOR 0) @@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES( ${EO_INCLUDE_DIRS} ${MO_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - /Dev/ometah-0.3/common + # /Dev/ometah-0.3/common ) ###################################################################################### @@ -92,8 +92,8 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}) -ADD_LIBRARY(do STATIC ${SAMPLE_SRCS}) -INSTALL(TARGETS do ARCHIVE DESTINATION lib COMPONENT libraries) +ADD_LIBRARY(edo STATIC ${SAMPLE_SRCS}) +INSTALL(TARGETS edo ARCHIVE DESTINATION lib COMPONENT libraries) ###################################################################################### @@ -102,7 +102,7 @@ INSTALL(TARGETS do ARCHIVE DESTINATION lib COMPONENT libraries) ### 8) Install pkg-config config file for EO ###################################################################################### -INSTALL(FILES do.pc DESTINATION lib/pkgconfig COMPONENT headers) +INSTALL(FILES edo.pc DESTINATION lib/pkgconfig COMPONENT headers) ###################################################################################### diff --git a/COPYING b/COPYING index 8862bf50f..4362b4915 100644 --- a/COPYING +++ b/COPYING @@ -1 +1,502 @@ -(c) Thales group, 2010 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/README b/README index f58d9d3c6..5b814b15d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This package contains the source code for DO. +This package contains the source code for EDO. # Step 1 - Configuration ------------------------ @@ -19,7 +19,7 @@ Note for windows users: if you don't use VisualStudio 9, enter the name of your # Step 3 - Compilation ---------------------- -In the do/build/ directory: +In the edo/build/ directory: (Unix) > make (Windows) Open the VisualStudio solution and compile it, compile also the target install. You can refer to this tutorial if you don't know how to compile a solution: http://paradiseo.gforge.inria.fr/index.php?n=Paradiseo.VisualCTutorial @@ -29,7 +29,7 @@ You can refer to this tutorial if you don't know how to compile a solution: http --------------------- A toy example is given to test the components. You can run these tests as following. To define problem-related components for your own problem, please refer to the tutorials available on the website : http://paradiseo.gforge.inria.fr/. -In the do/build/ directory: +In the edo/build/ directory: (Unix) > ctest Windows users, please refer to this tutorial: http://paradiseo.gforge.inria.fr/index.php?n=Paradiseo.VisualCTutorial @@ -46,7 +46,7 @@ Windows users, please refer to this tutorial: http://paradiseo.gforge.inria.fr/i The API-documentation is available in doc/html/index.html -# Things to keep in mind when using DO +# Things to keep in mind when using EDO ---------------------------------------- * By default, the EO random generator's seed is initialized by the number of seconds since the epoch (with time(0)). It is available in the status file dumped at each execution. Please, keep in mind that if you start two run at the same second without modifying the seed, you will get exactly the same results. diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 24b57198d..eea3dcb90 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -9,6 +9,6 @@ INCLUDE_DIRECTORIES( ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(eda_sa) ADD_SUBDIRECTORY(eda) -ADD_SUBDIRECTORY(sa) +#ADD_SUBDIRECTORY(sa) ###################################################################################### diff --git a/application/eda/CMakeLists.txt b/application/eda/CMakeLists.txt index 41d61ce04..2f1a52a57 100644 --- a/application/eda/CMakeLists.txt +++ b/application/eda/CMakeLists.txt @@ -15,13 +15,13 @@ FOREACH(file ${RESOURCES}) EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${file} - ${DO_BINARY_DIR}/${file} + ${EDO_BINARY_DIR}/${file} ) ENDFOREACH(file) FILE(GLOB SOURCES *.cpp) -SET(EXECUTABLE_OUTPUT_PATH ${DO_BINARY_DIR}) +SET(EXECUTABLE_OUTPUT_PATH ${EDO_BINARY_DIR}) ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} do doutils ${EO_LIBRARIES} ${MO_LIBRARIES} ${Boost_LIBRARIES}) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} edo edoutils ${EO_LIBRARIES} ${MO_LIBRARIES} ${Boost_LIBRARIES}) diff --git a/application/eda/main.cpp b/application/eda/main.cpp index 3e8e0fae4..8fc663fd1 100644 --- a/application/eda/main.cpp +++ b/application/eda/main.cpp @@ -1,3 +1,30 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + #include #include @@ -11,14 +38,14 @@ #include #include -#include +#include #include "Rosenbrock.h" #include "Sphere.h" typedef eoReal EOT; -typedef doNormalMulti< EOT > Distrib; +typedef edoNormalMulti< EOT > Distrib; int main(int ac, char** av) @@ -45,13 +72,13 @@ int main(int ac, char** av) eoSelect< EOT >* selector = new eoDetSelect< EOT >( selection_rate ); state.storeFunctor(selector); - doEstimator< Distrib >* estimator = new doEstimatorNormalMulti< EOT >(); + edoEstimator< Distrib >* estimator = new edoEstimatorNormalMulti< EOT >(); state.storeFunctor(estimator); eoSelectOne< EOT >* selectone = new eoDetTournamentSelect< EOT >( 2 ); state.storeFunctor(selectone); - doModifierMass< Distrib >* modifier = new doNormalMultiCenter< EOT >(); + edoModifierMass< Distrib >* modifier = new edoNormalMultiCenter< EOT >(); state.storeFunctor(modifier); eoEvalFunc< EOT >* plainEval = new Rosenbrock< EOT >(); @@ -100,7 +127,7 @@ int main(int ac, char** av) // This is used by doSampler. //----------------------------------------------------------------------------- - doBounder< EOT >* bounder = new doBounderRng< EOT >(EOT(pop[0].size(), -5), + edoBounder< EOT >* bounder = new edoBounderRng< EOT >(EOT(pop[0].size(), -5), EOT(pop[0].size(), 5), *gen); state.storeFunctor(bounder); @@ -112,7 +139,7 @@ int main(int ac, char** av) // Prepare sampler class with a specific distribution //----------------------------------------------------------------------------- - doSampler< Distrib >* sampler = new doSamplerNormalMulti< EOT >( *bounder ); + edoSampler< Distrib >* sampler = new edoSamplerNormalMulti< EOT >( *bounder ); state.storeFunctor(sampler); //----------------------------------------------------------------------------- @@ -166,10 +193,10 @@ int main(int ac, char** av) // distribution output //----------------------------------------------------------------------------- - doDummyContinue< Distrib >* dummy_continue = new doDummyContinue< Distrib >(); + edoDummyContinue< Distrib >* dummy_continue = new edoDummyContinue< Distrib >(); state.storeFunctor(dummy_continue); - doCheckPoint< Distrib >* distribution_continue = new doCheckPoint< Distrib >( *dummy_continue ); + edoCheckPoint< Distrib >* distribution_continue = new edoCheckPoint< Distrib >( *dummy_continue ); state.storeFunctor(distribution_continue); //----------------------------------------------------------------------------- @@ -216,11 +243,11 @@ int main(int ac, char** av) // removing as doFileSnapshot does within ctor. //----------------------------------------------------------------------------- - doPopStat< EOT >* popStat = new doPopStat; + edoPopStat< EOT >* popStat = new edoPopStat; state.storeFunctor(popStat); pop_continue.add(*popStat); - doFileSnapshot* fileSnapshot = new doFileSnapshot("EDA_ResPop"); + edoFileSnapshot* fileSnapshot = new edoFileSnapshot("EDA_ResPop"); state.storeFunctor(fileSnapshot); fileSnapshot->add(*popStat); pop_continue.add(*fileSnapshot); @@ -232,7 +259,7 @@ int main(int ac, char** av) // distribution output (after helper) //----------------------------------------------------------------------------- - doDistribStat< Distrib >* distrib_stat = new doStatNormalMulti< EOT >(); + edoDistribStat< Distrib >* distrib_stat = new edoStatNormalMulti< EOT >(); state.storeFunctor(distrib_stat); distribution_continue->add( *distrib_stat ); @@ -254,7 +281,7 @@ int main(int ac, char** av) // EDA algorithm configuration //----------------------------------------------------------------------------- - doAlgo< Distrib >* algo = new doEDA< Distrib > + edoAlgo< Distrib >* algo = new edoEDA< Distrib > (*selector, *estimator, *selectone, *modifier, *sampler, pop_continue, *distribution_continue, eval, diff --git a/application/eda_sa/CMakeLists.txt b/application/eda_sa/CMakeLists.txt index f92e105f2..39a9a5464 100644 --- a/application/eda_sa/CMakeLists.txt +++ b/application/eda_sa/CMakeLists.txt @@ -15,13 +15,13 @@ FOREACH(file ${RESOURCES}) EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${file} - ${DO_BINARY_DIR}/${file} + ${EDO_BINARY_DIR}/${file} ) ENDFOREACH(file) FILE(GLOB SOURCES *.cpp) -SET(EXECUTABLE_OUTPUT_PATH ${DO_BINARY_DIR}) +SET(EXECUTABLE_OUTPUT_PATH ${EDO_BINARY_DIR}) ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} do doutils ${EO_LIBRARIES} ${MO_LIBRARIES} ${Boost_LIBRARIES}) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} edo edoutils ${EO_LIBRARIES} ${MO_LIBRARIES} ${Boost_LIBRARIES}) diff --git a/application/eda_sa/main.cpp b/application/eda_sa/main.cpp index 2d72ad832..8ee173e30 100644 --- a/application/eda_sa/main.cpp +++ b/application/eda_sa/main.cpp @@ -11,14 +11,14 @@ #include #include -#include +#include #include "Rosenbrock.h" #include "Sphere.h" typedef eoReal EOT; -typedef doNormalMulti< EOT > Distrib; +typedef edoNormalMulti< EOT > Distrib; int main(int ac, char** av) @@ -45,13 +45,13 @@ int main(int ac, char** av) eoSelect< EOT >* selector = new eoDetSelect< EOT >( selection_rate ); state.storeFunctor(selector); - doEstimator< Distrib >* estimator = new doEstimatorNormalMulti< EOT >(); + edoEstimator< Distrib >* estimator = new edoEstimatorNormalMulti< EOT >(); state.storeFunctor(estimator); eoSelectOne< EOT >* selectone = new eoDetTournamentSelect< EOT >( 2 ); state.storeFunctor(selectone); - doModifierMass< Distrib >* modifier = new doNormalMultiCenter< EOT >(); + edoModifierMass< Distrib >* modifier = new edoNormalMultiCenter< EOT >(); state.storeFunctor(modifier); eoEvalFunc< EOT >* plainEval = new Rosenbrock< EOT >(); @@ -100,7 +100,7 @@ int main(int ac, char** av) // This is used by doSampler. //----------------------------------------------------------------------------- - doBounder< EOT >* bounder = new doBounderRng< EOT >(EOT(pop[0].size(), -5), + edoBounder< EOT >* bounder = new edoBounderRng< EOT >(EOT(pop[0].size(), -5), EOT(pop[0].size(), 5), *gen); state.storeFunctor(bounder); @@ -112,7 +112,7 @@ int main(int ac, char** av) // Prepare sampler class with a specific distribution //----------------------------------------------------------------------------- - doSampler< Distrib >* sampler = new doSamplerNormalMulti< EOT >( *bounder ); + edoSampler< Distrib >* sampler = new edoSamplerNormalMulti< EOT >( *bounder ); state.storeFunctor(sampler); //----------------------------------------------------------------------------- @@ -166,10 +166,10 @@ int main(int ac, char** av) // distribution output //----------------------------------------------------------------------------- - doDummyContinue< Distrib >* dummy_continue = new doDummyContinue< Distrib >(); + edoDummyContinue< Distrib >* dummy_continue = new edoDummyContinue< Distrib >(); state.storeFunctor(dummy_continue); - doCheckPoint< Distrib >* distribution_continue = new doCheckPoint< Distrib >( *dummy_continue ); + edoCheckPoint< Distrib >* distribution_continue = new edoCheckPoint< Distrib >( *dummy_continue ); state.storeFunctor(distribution_continue); //----------------------------------------------------------------------------- @@ -213,14 +213,14 @@ int main(int ac, char** av) // population output (after helper) // // FIXME: theses objects are instanciate there in order to avoid a folder - // removing as doFileSnapshot does within ctor. + // removing as edoFileSnapshot does within ctor. //----------------------------------------------------------------------------- - doPopStat< EOT >* popStat = new doPopStat; + edoPopStat< EOT >* popStat = new edoPopStat; state.storeFunctor(popStat); pop_continue.add(*popStat); - doFileSnapshot* fileSnapshot = new doFileSnapshot("EDASA_ResPop"); + edoFileSnapshot* fileSnapshot = new edoFileSnapshot("EDASA_ResPop"); state.storeFunctor(fileSnapshot); fileSnapshot->add(*popStat); pop_continue.add(*fileSnapshot); @@ -232,7 +232,7 @@ int main(int ac, char** av) // distribution output (after helper) //----------------------------------------------------------------------------- - doDistribStat< Distrib >* distrib_stat = new doStatNormalMulti< EOT >(); + edoDistribStat< Distrib >* distrib_stat = new edoStatNormalMulti< EOT >(); state.storeFunctor(distrib_stat); distribution_continue->add( *distrib_stat ); @@ -254,7 +254,7 @@ int main(int ac, char** av) // EDASA algorithm configuration //----------------------------------------------------------------------------- - doAlgo< Distrib >* algo = new doEDASA< Distrib > + edoAlgo< Distrib >* algo = new edoEDASA< Distrib > (*selector, *estimator, *selectone, *modifier, *sampler, pop_continue, *distribution_continue, eval, *sa_continue, *cooling_schedule, diff --git a/build_gcc_linux_debug b/build_gcc_linux_debug index da385fdb8..144a5298a 100755 --- a/build_gcc_linux_debug +++ b/build_gcc_linux_debug @@ -1,6 +1,6 @@ #!/usr/bin/env sh -mkdir debug +mkdir -p debug cd debug cmake -DCMAKE_BUILD_TYPE=Debug .. make diff --git a/build_gcc_linux_release b/build_gcc_linux_release index 78a66c551..fb220d044 100755 --- a/build_gcc_linux_release +++ b/build_gcc_linux_release @@ -1,6 +1,6 @@ #!/usr/bin/env sh -mkdir release +mkdir -p release cd release cmake .. make diff --git a/do.pc b/do.pc deleted file mode 100644 index b207747db..000000000 --- a/do.pc +++ /dev/null @@ -1,12 +0,0 @@ -# Package Information for pkg-config - -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include/do - -Name: Distribution Object -Description: Distribution Object -Version: 1.0 -Libs: -L${libdir} -ldo -ldoutils -Cflags: -I${includedir} diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 056f3f2fc..6c7b15937 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -22,7 +22,7 @@ IF (DOXYGEN_FOUND) INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DESTINATION share/do COMPONENT libraries + DESTINATION share/edo COMPONENT libraries PATTERN "CMakeFiles" EXCLUDE PATTERN "cmake_install.cmake" EXCLUDE PATTERN "Makefile" EXCLUDE diff --git a/edo.pc b/edo.pc new file mode 100644 index 000000000..a70434383 --- /dev/null +++ b/edo.pc @@ -0,0 +1,12 @@ +# Package Information for pkg-config + +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include/edo + +Name: Evolving Distribution Objects +Description: Evolving Distribution Objects +Version: 1.0 +Libs: -L${libdir} -ledo -ledoutils +Cflags: -I${includedir} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f4cdbfae1..6b2176f56 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,8 +2,8 @@ ### 1) Set all needed source files for the project ###################################################################################### -FILE(GLOB HDRS *.h do) -INSTALL(FILES ${HDRS} DESTINATION include/do COMPONENT headers) +FILE(GLOB HDRS *.h edo) +INSTALL(FILES ${HDRS} DESTINATION include/edo COMPONENT headers) FILE(GLOB SOURCES *.cpp) diff --git a/src/do b/src/do deleted file mode 100644 index ff2b3e674..000000000 --- a/src/do +++ /dev/null @@ -1,59 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _do_ -#define _do_ - -#include "doAlgo.h" -#include "doEDASA.h" -#include "doEDA.h" - -#include "doDistrib.h" -#include "doUniform.h" -#include "doNormalMono.h" -#include "doNormalMulti.h" - -#include "doEstimator.h" -#include "doEstimatorUniform.h" -#include "doEstimatorNormalMono.h" -#include "doEstimatorNormalMulti.h" - -#include "doModifier.h" -#include "doModifierDispersion.h" -#include "doModifierMass.h" -#include "doUniformCenter.h" -#include "doNormalMonoCenter.h" -#include "doNormalMultiCenter.h" - -#include "doSampler.h" -#include "doSamplerUniform.h" -#include "doSamplerNormalMono.h" -#include "doSamplerNormalMulti.h" - -#include "doVectorBounds.h" - -#include "doBounder.h" -#include "doBounderNo.h" -#include "doBounderBound.h" -#include "doBounderRng.h" - -#include "doContinue.h" -#include "utils/doCheckPoint.h" - -#include "utils/doStat.h" -#include "utils/doStatUniform.h" -#include "utils/doStatNormalMono.h" -#include "utils/doStatNormalMulti.h" - -#include "utils/doFileSnapshot.h" -#include "utils/doPopStat.h" - -#endif // !_do_ - -// Local Variables: -// mode: C++ -// End: diff --git a/src/do.cpp b/src/do.cpp deleted file mode 100644 index 082374a40..000000000 --- a/src/do.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#include "do" diff --git a/src/doAlgo.h b/src/doAlgo.h deleted file mode 100644 index 0f260d933..000000000 --- a/src/doAlgo.h +++ /dev/null @@ -1,23 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doAlgo_h -#define _doAlgo_h - -#include - -template < typename D > -class doAlgo : public eoAlgo< typename D::EOType > -{ - //! Alias for the type - typedef typename D::EOType EOT; - -public: - virtual ~doAlgo(){} -}; - -#endif // !_doAlgo_h diff --git a/src/doBounder.h b/src/doBounder.h deleted file mode 100644 index 44240246e..000000000 --- a/src/doBounder.h +++ /dev/null @@ -1,34 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doBounder_h -#define _doBounder_h - -#include - -template < typename EOT > -class doBounder : public eoUF< EOT&, void > -{ -public: - doBounder( EOT min = EOT(1, 0), EOT max = EOT(1, 0) ) - : _min(min), _max(max) - { - assert(_min.size() > 0); - assert(_min.size() == _max.size()); - } - - // virtual void operator()( EOT& ) = 0 (provided by eoUF< A1, R >) - - EOT& min(){return _min;} - EOT& max(){return _max;} - -private: - EOT _min; - EOT _max; -}; - -#endif // !_doBounder_h diff --git a/src/doBounderBound.h b/src/doBounderBound.h deleted file mode 100644 index cff765b8e..000000000 --- a/src/doBounderBound.h +++ /dev/null @@ -1,42 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doBounderBound_h -#define _doBounderBound_h - -#include "doBounder.h" - -template < typename EOT > -class doBounderBound : public doBounder< EOT > -{ -public: - doBounderBound( EOT min, EOT max ) - : doBounder< EOT >( min, max ) - {} - - void operator()( EOT& x ) - { - unsigned int size = x.size(); - assert(size > 0); - - for (unsigned int d = 0; d < size; ++d) // browse all dimensions - { - if (x[d] < this->min()[d]) - { - x[d] = this->min()[d]; - continue; - } - - if (x[d] > this->max()[d]) - { - x[d] = this->max()[d]; - } - } - } -}; - -#endif // !_doBounderBound_h diff --git a/src/doBounderNo.h b/src/doBounderNo.h deleted file mode 100644 index 0ca883bc7..000000000 --- a/src/doBounderNo.h +++ /dev/null @@ -1,20 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doBounderNo_h -#define _doBounderNo_h - -#include "doBounder.h" - -template < typename EOT > -class doBounderNo : public doBounder< EOT > -{ -public: - void operator()( EOT& ) {} -}; - -#endif // !_doBounderNo_h diff --git a/src/doBounderRng.h b/src/doBounderRng.h deleted file mode 100644 index 52b95bcac..000000000 --- a/src/doBounderRng.h +++ /dev/null @@ -1,42 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doBounderRng_h -#define _doBounderRng_h - -#include "doBounder.h" - -template < typename EOT > -class doBounderRng : public doBounder< EOT > -{ -public: - doBounderRng( EOT min, EOT max, eoRndGenerator< double > & rng ) - : doBounder< EOT >( min, max ), _rng(rng) - {} - - void operator()( EOT& x ) - { - unsigned int size = x.size(); - assert(size > 0); - - for (unsigned int d = 0; d < size; ++d) // browse all dimensions - { - - // FIXME: attention: les bornes RNG ont les memes bornes quelque soit les dimensions idealement on voudrait avoir des bornes differentes pour chaque dimensions. - - if (x[d] < this->min()[d] || x[d] > this->max()[d]) - { - x[d] = _rng(); - } - } - } - -private: - eoRndGenerator< double> & _rng; -}; - -#endif // !_doBounderRng_h diff --git a/src/doBounderUniform.h b/src/doBounderUniform.h deleted file mode 100644 index 9fac7dac3..000000000 --- a/src/doBounderUniform.h +++ /dev/null @@ -1,35 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo -*/ - -#ifndef _doBounderUniform_h -#define _doBounderUniform_h - -#include "doBounder.h" - -template < typename EOT > -class doBounderUniform : public doBounder< EOT > -{ -public: - doBounderUniform( EOT min, EOT max ) - : doBounder< EOT >( min, max ) - {} - - void operator()( EOT& sol ) - { - unsigned int size = sol.size(); - assert(size > 0); - - for (unsigned int d = 0; d < size; ++d) { - - if ( sol[d] < this->min()[d] || sol[d] > this->max()[d]) { - // use EO's global "rng" - sol[d] = rng.uniform( this->min()[d], this->max()[d] ); - } - } // for d in size - } -}; - -#endif // !_doBounderUniform_h diff --git a/src/doContinue.h b/src/doContinue.h deleted file mode 100644 index 64f1d4831..000000000 --- a/src/doContinue.h +++ /dev/null @@ -1,41 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doContinue_h -#define _doContinue_h - -#include -#include - -//! doContinue< EOT > classe fitted to Distribution Object library - -template < typename D > -class doContinue : public eoUF< const D&, bool >, public eoPersistent -{ -public: - virtual std::string className(void) const { return "doContinue"; } - - void readFrom(std::istream&) - { - /* It should be implemented by subclasses ! */ - } - - void printOn(std::ostream&) const - { - /* It should be implemented by subclasses ! */ - } -}; - -template < typename D > -class doDummyContinue : public doContinue< D > -{ - bool operator()(const D&){ return true; } - - virtual std::string className() const { return "doDummyContinue"; } -}; - -#endif // !_doContinue_h diff --git a/src/doDistrib.h b/src/doDistrib.h deleted file mode 100644 index f150e8e0e..000000000 --- a/src/doDistrib.h +++ /dev/null @@ -1,23 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doDistrib_h -#define _doDistrib_h - -#include - -template < typename EOT > -class doDistrib : public eoFunctorBase -{ -public: - //! Alias for the type - typedef EOT EOType; - - virtual ~doDistrib(){} -}; - -#endif // !_doDistrib_h diff --git a/src/doEstimator.h b/src/doEstimator.h deleted file mode 100644 index 956bed78b..000000000 --- a/src/doEstimator.h +++ /dev/null @@ -1,23 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doEstimator_h -#define _doEstimator_h - -#include -#include - -template < typename D > -class doEstimator : public eoUF< eoPop< typename D::EOType >&, D > -{ -public: - typedef typename D::EOType EOType; - - // virtual D operator() ( eoPop< EOT >& )=0 (provided by eoUF< A1, R >) -}; - -#endif // !_doEstimator_h diff --git a/src/doEstimatorNormalMono.h b/src/doEstimatorNormalMono.h deleted file mode 100644 index fb9c1f2fd..000000000 --- a/src/doEstimatorNormalMono.h +++ /dev/null @@ -1,77 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doEstimatorNormalMono_h -#define _doEstimatorNormalMono_h - -#include "doEstimator.h" -#include "doNormalMono.h" - -template < typename EOT > -class doEstimatorNormalMono : public doEstimator< doNormalMono< EOT > > -{ -public: - typedef typename EOT::AtomType AtomType; - - class Variance - { - public: - Variance() : _sumvar(0){} - - void update(AtomType v) - { - _n++; - - AtomType d = v - _mean; - - _mean += 1 / _n * d; - _sumvar += (_n - 1) / _n * d * d; - } - - AtomType get_mean() const {return _mean;} - AtomType get_var() const {return _sumvar / (_n - 1);} - AtomType get_std() const {return sqrt( get_var() );} - - private: - AtomType _n; - AtomType _mean; - AtomType _sumvar; - }; - -public: - doNormalMono< EOT > operator()(eoPop& pop) - { - unsigned int popsize = pop.size(); - assert(popsize > 0); - - unsigned int dimsize = pop[0].size(); - assert(dimsize > 0); - - std::vector< Variance > var( dimsize ); - - for (unsigned int i = 0; i < popsize; ++i) - { - for (unsigned int d = 0; d < dimsize; ++d) - { - var[d].update( pop[i][d] ); - } - } - - EOT mean( dimsize ); - EOT variance( dimsize ); - - for (unsigned int d = 0; d < dimsize; ++d) - { - mean[d] = var[d].get_mean(); - variance[d] = var[d].get_var(); - } - - return doNormalMono< EOT >( mean, variance ); - } -}; - -#endif // !_doEstimatorNormalMono_h diff --git a/src/doEstimatorUniform.h b/src/doEstimatorUniform.h deleted file mode 100644 index ca361ce00..000000000 --- a/src/doEstimatorUniform.h +++ /dev/null @@ -1,51 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doEstimatorUniform_h -#define _doEstimatorUniform_h - -#include "doEstimator.h" -#include "doUniform.h" - -// TODO: calcule de la moyenne + covariance dans une classe derivee - -template < typename EOT > -class doEstimatorUniform : public doEstimator< doUniform< EOT > > -{ -public: - doUniform< EOT > operator()(eoPop& pop) - { - unsigned int size = pop.size(); - - assert(size > 0); - - EOT min = pop[0]; - EOT max = pop[0]; - - for (unsigned int i = 1; i < size; ++i) - { - unsigned int size = pop[i].size(); - - assert(size > 0); - - // possibilité d'utiliser std::min_element et std::max_element mais exige 2 pass au lieu d'1. - - for (unsigned int d = 0; d < size; ++d) - { - if (pop[i][d] < min[d]) - min[d] = pop[i][d]; - - if (pop[i][d] > max[d]) - max[d] = pop[i][d]; - } - } - - return doUniform< EOT >(min, max); - } -}; - -#endif // !_doEstimatorUniform_h diff --git a/src/doModifier.h b/src/doModifier.h deleted file mode 100644 index b36106c98..000000000 --- a/src/doModifier.h +++ /dev/null @@ -1,20 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doModifier_h -#define _doModifier_h - -template < typename D > -class doModifier -{ -public: - virtual ~doModifier(){} - - typedef typename D::EOType EOType; -}; - -#endif // !_doModifier_h diff --git a/src/doModifierDispersion.h b/src/doModifierDispersion.h deleted file mode 100644 index 4d5e42c46..000000000 --- a/src/doModifierDispersion.h +++ /dev/null @@ -1,23 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doModifierDispersion_h -#define _doModifierDispersion_h - -#include -#include - -#include "doModifier.h" - -template < typename D > -class doModifierDispersion : public doModifier< D >, public eoBF< D&, eoPop< typename D::EOType >&, void > -{ -public: - // virtual void operator() ( D&, eoPop< D::EOType >& )=0 (provided by eoBF< A1, A2, R >) -}; - -#endif // !_doModifierDispersion_h diff --git a/src/doModifierMass.h b/src/doModifierMass.h deleted file mode 100644 index 4f5df5c0a..000000000 --- a/src/doModifierMass.h +++ /dev/null @@ -1,24 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doModifierMass_h -#define _doModifierMass_h - -#include - -#include "doModifier.h" - -template < typename D > -class doModifierMass : public doModifier< D >, public eoBF< D&, typename D::EOType&, void > -{ -public: - //typedef typename D::EOType::AtomType AtomType; // does not work !!! - - // virtual void operator() ( D&, D::EOType& )=0 (provided by eoBF< A1, A2, R >) -}; - -#endif // !_doModifierMass_h diff --git a/src/doNormalMono.h b/src/doNormalMono.h deleted file mode 100644 index fa8f8e6f4..000000000 --- a/src/doNormalMono.h +++ /dev/null @@ -1,38 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doNormalMono_h -#define _doNormalMono_h - -#include "doDistrib.h" - -template < typename EOT > -class doNormalMono : public doDistrib< EOT > -{ -public: - doNormalMono( const EOT& mean, const EOT& variance ) - : _mean(mean), _variance(variance) - { - assert(_mean.size() > 0); - assert(_mean.size() == _variance.size()); - } - - unsigned int size() - { - assert(_mean.size() == _variance.size()); - return _mean.size(); - } - - EOT mean(){return _mean;} - EOT variance(){return _variance;} - -private: - EOT _mean; - EOT _variance; -}; - -#endif // !_doNormalMono_h diff --git a/src/doNormalMonoCenter.h b/src/doNormalMonoCenter.h deleted file mode 100644 index 7786d347c..000000000 --- a/src/doNormalMonoCenter.h +++ /dev/null @@ -1,26 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doNormalMonoCenter_h -#define _doNormalMonoCenter_h - -#include "doModifierMass.h" -#include "doNormalMono.h" - -template < typename EOT > -class doNormalMonoCenter : public doModifierMass< doNormalMono< EOT > > -{ -public: - typedef typename EOT::AtomType AtomType; - - void operator() ( doNormalMono< EOT >& distrib, EOT& mass ) - { - distrib.mean() = mass; - } -}; - -#endif // !_doNormalMonoCenter_h diff --git a/src/doNormalMultiCenter.h b/src/doNormalMultiCenter.h deleted file mode 100644 index bf52ecf13..000000000 --- a/src/doNormalMultiCenter.h +++ /dev/null @@ -1,28 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doNormalMultiCenter_h -#define _doNormalMultiCenter_h - -#include "doModifierMass.h" -#include "doNormalMulti.h" - -template < typename EOT > -class doNormalMultiCenter : public doModifierMass< doNormalMulti< EOT > > -{ -public: - typedef typename EOT::AtomType AtomType; - - void operator() ( doNormalMulti< EOT >& distrib, EOT& mass ) - { - ublas::vector< AtomType > mean( distrib.size() ); - std::copy( mass.begin(), mass.end(), mean.begin() ); - distrib.mean() = mean; - } -}; - -#endif // !_doNormalMultiCenter_h diff --git a/src/doSampler.h b/src/doSampler.h deleted file mode 100644 index 0d69223c4..000000000 --- a/src/doSampler.h +++ /dev/null @@ -1,75 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doSampler_h -#define _doSampler_h - -#include - -#include "doBounder.h" -#include "doBounderNo.h" - -template < typename D > -class doSampler : public eoUF< D&, typename D::EOType > -{ -public: - typedef typename D::EOType EOType; - - doSampler(doBounder< EOType > & bounder) - : /*_dummy_bounder(),*/ _bounder(bounder) - {} - - /* - doSampler() - : _dummy_bounder(), _bounder( _dummy_bounder ) - {} - */ - - // virtual EOType operator()( D& ) = 0 (provided by eoUF< A1, R >) - - virtual EOType sample( D& ) = 0; - - EOType operator()( D& distrib ) - { - unsigned int size = distrib.size(); - assert(size > 0); - - - //------------------------------------------------------------- - // Point we want to sample to get higher a set of points - // (coordinates in n dimension) - // x = {x1, x2, ..., xn} - // the sample method is implemented in the derivated class - //------------------------------------------------------------- - - EOType solution(sample(distrib)); - - //------------------------------------------------------------- - - - //------------------------------------------------------------- - // Now we are bounding the distribution thanks to min and max - // parameters. - //------------------------------------------------------------- - - _bounder(solution); - - //------------------------------------------------------------- - - - return solution; - } - -private: - //doBounderNo _dummy_bounder; - - //! Bounder functor - doBounder< EOType > & _bounder; - -}; - -#endif // !_doSampler_h diff --git a/src/doSamplerNormalMono.h b/src/doSamplerNormalMono.h deleted file mode 100644 index b790ee6b0..000000000 --- a/src/doSamplerNormalMono.h +++ /dev/null @@ -1,71 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doSamplerNormalMono_h -#define _doSamplerNormalMono_h - -#include - -#include "doSampler.h" -#include "doNormalMono.h" -#include "doBounder.h" - -/** - * doSamplerNormalMono - * This class uses the NormalMono distribution parameters (bounds) to return - * a random position used for population sampling. - */ -template < typename EOT > -class doSamplerNormalMono : public doSampler< doNormalMono< EOT > > -{ -public: - typedef typename EOT::AtomType AtomType; - - doSamplerNormalMono( doBounder< EOT > & bounder ) - : doSampler< doNormalMono< EOT > >( bounder ) - {} - - EOT sample( doNormalMono< EOT >& distrib ) - { - unsigned int size = distrib.size(); - assert(size > 0); - - - //------------------------------------------------------------- - // Point we want to sample to get higher a set of points - // (coordinates in n dimension) - // x = {x1, x2, ..., xn} - //------------------------------------------------------------- - - EOT solution; - - //------------------------------------------------------------- - - - //------------------------------------------------------------- - // Sampling all dimensions - //------------------------------------------------------------- - - for (unsigned int i = 0; i < size; ++i) - { - AtomType mean = distrib.mean()[i]; - AtomType variance = distrib.variance()[i]; - AtomType random = rng.normal(mean, variance); - - assert(variance >= 0); - - solution.push_back(random); - } - - //------------------------------------------------------------- - - - return solution; - } -}; - -#endif // !_doSamplerNormalMono_h diff --git a/src/doSamplerUniform.h b/src/doSamplerUniform.h deleted file mode 100644 index 6f79c1387..000000000 --- a/src/doSamplerUniform.h +++ /dev/null @@ -1,76 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doSamplerUniform_h -#define _doSamplerUniform_h - -#include - -#include "doSampler.h" -#include "doUniform.h" - -/** - * doSamplerUniform - * This class uses the Uniform distribution parameters (bounds) to return - * a random position used for population sampling. - */ -template < typename EOT, class D=doUniform > // FIXME: D template name is there really used ?!? -class doSamplerUniform : public doSampler< doUniform< EOT > > -{ -public: - typedef D Distrib; - - doSamplerUniform(doBounder< EOT > & bounder) - : doSampler< doUniform >(bounder) // FIXME: Why D is not used here ? - {} - - /* - doSamplerUniform() - : doSampler< doUniform >() - {} - */ - - EOT sample( doUniform< EOT >& distrib ) - { - unsigned int size = distrib.size(); - assert(size > 0); - - - //------------------------------------------------------------- - // Point we want to sample to get higher a set of points - // (coordinates in n dimension) - // x = {x1, x2, ..., xn} - //------------------------------------------------------------- - - EOT solution; - - //------------------------------------------------------------- - - - //------------------------------------------------------------- - // Sampling all dimensions - //------------------------------------------------------------- - - for (unsigned int i = 0; i < size; ++i) - { - double min = distrib.min()[i]; - double max = distrib.max()[i]; - double random = rng.uniform(min, max); - - assert(min <= random && random <= max); - - solution.push_back(random); - } - - //------------------------------------------------------------- - - - return solution; - } -}; - -#endif // !_doSamplerUniform_h diff --git a/src/doUniform.h b/src/doUniform.h deleted file mode 100644 index 624fec1fa..000000000 --- a/src/doUniform.h +++ /dev/null @@ -1,23 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doUniform_h -#define _doUniform_h - -#include "doDistrib.h" -#include "doVectorBounds.h" - -template < typename EOT > -class doUniform : public doDistrib< EOT >, public doVectorBounds< EOT > -{ -public: - doUniform(EOT min, EOT max) - : doVectorBounds< EOT >(min, max) - {} -}; - -#endif // !_doUniform_h diff --git a/src/doUniformCenter.h b/src/doUniformCenter.h deleted file mode 100644 index 8b0016bc6..000000000 --- a/src/doUniformCenter.h +++ /dev/null @@ -1,35 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doUniformCenter_h -#define _doUniformCenter_h - -#include "doModifierMass.h" -#include "doUniform.h" - -template < typename EOT > -class doUniformCenter : public doModifierMass< doUniform< EOT > > -{ -public: - typedef typename EOT::AtomType AtomType; - - void operator() ( doUniform< EOT >& distrib, EOT& mass ) - { - for (unsigned int i = 0, n = mass.size(); i < n; ++i) - { - AtomType& min = distrib.min()[i]; - AtomType& max = distrib.max()[i]; - - AtomType range = (max - min) / 2; - - min = mass[i] - range; - max = mass[i] + range; - } - } -}; - -#endif // !_doUniformCenter_h diff --git a/src/doVectorBounds.h b/src/doVectorBounds.h deleted file mode 100644 index 4e23d4863..000000000 --- a/src/doVectorBounds.h +++ /dev/null @@ -1,36 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doVectorBounds_h -#define _doVectorBounds_h - -template < typename EOT > -class doVectorBounds -{ -public: - doVectorBounds(EOT min, EOT max) - : _min(min), _max(max) - { - assert(_min.size() > 0); - assert(_min.size() == _max.size()); - } - - EOT min(){return _min;} - EOT max(){return _max;} - - unsigned int size() - { - assert(_min.size() == _max.size()); - return _min.size(); - } - -private: - EOT _min; - EOT _max; -}; - -#endif // !_doVectorBounds_h diff --git a/src/edo b/src/edo new file mode 100644 index 000000000..54f20284e --- /dev/null +++ b/src/edo @@ -0,0 +1,79 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edo_ +#define _edo_ + +#include "edoAlgo.h" +#include "edoEDASA.h" +#include "edoEDA.h" + +#include "edoDistrib.h" +#include "edoUniform.h" +#include "edoNormalMono.h" +#include "edoNormalMulti.h" + +#include "edoEstimator.h" +#include "edoEstimatorUniform.h" +#include "edoEstimatorNormalMono.h" +#include "edoEstimatorNormalMulti.h" + +#include "edoModifier.h" +#include "edoModifierDispersion.h" +#include "edoModifierMass.h" +#include "edoUniformCenter.h" +#include "edoNormalMonoCenter.h" +#include "edoNormalMultiCenter.h" + +#include "edoSampler.h" +#include "edoSamplerUniform.h" +#include "edoSamplerNormalMono.h" +#include "edoSamplerNormalMulti.h" + +#include "edoVectorBounds.h" + +#include "edoBounder.h" +#include "edoBounderNo.h" +#include "edoBounderBound.h" +#include "edoBounderRng.h" + +#include "edoContinue.h" +#include "utils/edoCheckPoint.h" + +#include "utils/edoStat.h" +#include "utils/edoStatUniform.h" +#include "utils/edoStatNormalMono.h" +#include "utils/edoStatNormalMulti.h" + +#include "utils/edoFileSnapshot.h" +#include "utils/edoPopStat.h" + +#endif // !_edo_ + +// Local Variables: +// mode: C++ +// End: diff --git a/src/edo.cpp b/src/edo.cpp new file mode 100644 index 000000000..ff2bd2f93 --- /dev/null +++ b/src/edo.cpp @@ -0,0 +1,28 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Caner Candan +*/ + +#include "edo" + diff --git a/src/edoAlgo.h b/src/edoAlgo.h new file mode 100644 index 000000000..249e42dde --- /dev/null +++ b/src/edoAlgo.h @@ -0,0 +1,44 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + + +#ifndef _edoAlgo_h +#define _edoAlgo_h + +#include + +template < typename D > +class edoAlgo : public eoAlgo< typename D::EOType > +{ + //! Alias for the type + typedef typename D::EOType EOT; + +public: + virtual ~edoAlgo(){} +}; + +#endif // !_edoAlgo_h diff --git a/src/edoBounder.h b/src/edoBounder.h new file mode 100644 index 000000000..98bfc1a84 --- /dev/null +++ b/src/edoBounder.h @@ -0,0 +1,54 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoBounder_h +#define _edoBounder_h + +#include + +template < typename EOT > +class edoBounder : public eoUF< EOT&, void > +{ +public: + edoBounder( EOT min = EOT(1, 0), EOT max = EOT(1, 0) ) + : _min(min), _max(max) + { + assert(_min.size() > 0); + assert(_min.size() == _max.size()); + } + + // virtual void operator()( EOT& ) = 0 (provided by eoUF< A1, R >) + + EOT& min(){return _min;} + EOT& max(){return _max;} + +private: + EOT _min; + EOT _max; +}; + +#endif // !_edoBounder_h diff --git a/src/edoBounderBound.h b/src/edoBounderBound.h new file mode 100644 index 000000000..8d5e52be8 --- /dev/null +++ b/src/edoBounderBound.h @@ -0,0 +1,62 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoBounderBound_h +#define _edoBounderBound_h + +#include "edoBounder.h" + +template < typename EOT > +class edoBounderBound : public edoBounder< EOT > +{ +public: + edoBounderBound( EOT min, EOT max ) + : edoBounder< EOT >( min, max ) + {} + + void operator()( EOT& x ) + { + unsigned int size = x.size(); + assert(size > 0); + + for (unsigned int d = 0; d < size; ++d) // browse all dimensions + { + if (x[d] < this->min()[d]) + { + x[d] = this->min()[d]; + continue; + } + + if (x[d] > this->max()[d]) + { + x[d] = this->max()[d]; + } + } + } +}; + +#endif // !_edoBounderBound_h diff --git a/src/edoBounderNo.h b/src/edoBounderNo.h new file mode 100644 index 000000000..27d65e6c7 --- /dev/null +++ b/src/edoBounderNo.h @@ -0,0 +1,40 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoBounderNo_h +#define _edoBounderNo_h + +#include "edoBounder.h" + +template < typename EOT > +class edoBounderNo : public edoBounder< EOT > +{ +public: + void operator()( EOT& ) {} +}; + +#endif // !_edoBounderNo_h diff --git a/src/edoBounderRng.h b/src/edoBounderRng.h new file mode 100644 index 000000000..e1e3617f5 --- /dev/null +++ b/src/edoBounderRng.h @@ -0,0 +1,63 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoBounderRng_h +#define _edoBounderRng_h + +#include "edoBounder.h" + +template < typename EOT > +class edoBounderRng : public edoBounder< EOT > +{ +public: + edoBounderRng( EOT min, EOT max, eoRndGenerator< double > & rng ) + : edoBounder< EOT >( min, max ), _rng(rng) + {} + + void operator()( EOT& x ) + { + unsigned int size = x.size(); + assert(size > 0); + + for (unsigned int d = 0; d < size; ++d) // browse all dimensions + { + + // FIXME: attention: les bornes RNG ont les memes bornes quelque soit les dimensions idealement on voudrait avoir des bornes differentes pour chaque dimensions. + + if (x[d] < this->min()[d] || x[d] > this->max()[d]) + { + x[d] = _rng(); + } + } + } + +private: + eoRndGenerator< double> & _rng; +}; + +#endif // !_edoBounderRng_h + diff --git a/src/edoBounderUniform.h b/src/edoBounderUniform.h new file mode 100644 index 000000000..fef1674da --- /dev/null +++ b/src/edoBounderUniform.h @@ -0,0 +1,55 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo +*/ + +#ifndef _edoBounderUniform_h +#define _edoBounderUniform_h + +#include "edoBounder.h" + +template < typename EOT > +class edoBounderUniform : public edoBounder< EOT > +{ +public: + edoBounderUniform( EOT min, EOT max ) + : edoBounder< EOT >( min, max ) + {} + + void operator()( EOT& sol ) + { + unsigned int size = sol.size(); + assert(size > 0); + + for (unsigned int d = 0; d < size; ++d) { + + if ( sol[d] < this->min()[d] || sol[d] > this->max()[d]) { + // use EO's global "rng" + sol[d] = rng.uniform( this->min()[d], this->max()[d] ); + } + } // for d in size + } +}; + +#endif // !_edoBounderUniform_h diff --git a/src/edoContinue.h b/src/edoContinue.h new file mode 100644 index 000000000..2f7dff5a6 --- /dev/null +++ b/src/edoContinue.h @@ -0,0 +1,61 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _doContinue_h +#define _doContinue_h + +#include +#include + +//! edoContinue< EOT > classe fitted to Distribution Object library + +template < typename D > +class edoContinue : public eoUF< const D&, bool >, public eoPersistent +{ +public: + virtual std::string className(void) const { return "edoContinue"; } + + void readFrom(std::istream&) + { + /* It should be implemented by subclasses ! */ + } + + void printOn(std::ostream&) const + { + /* It should be implemented by subclasses ! */ + } +}; + +template < typename D > +class edoDummyContinue : public edoContinue< D > +{ + bool operator()(const D&){ return true; } + + virtual std::string className() const { return "edoDummyContinue"; } +}; + +#endif // !_edoContinue_h diff --git a/src/edoDistrib.h b/src/edoDistrib.h new file mode 100644 index 000000000..29ff500df --- /dev/null +++ b/src/edoDistrib.h @@ -0,0 +1,43 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoDistrib_h +#define _edoDistrib_h + +#include + +template < typename EOT > +class edoDistrib : public eoFunctorBase +{ +public: + //! Alias for the type + typedef EOT EOType; + + virtual ~edoDistrib(){} +}; + +#endif // !_edoDistrib_h diff --git a/src/doEDA.h b/src/edoEDA.h similarity index 79% rename from src/doEDA.h rename to src/edoEDA.h index 6873e5da4..dde0bb3ad 100644 --- a/src/doEDA.h +++ b/src/edoEDA.h @@ -1,26 +1,46 @@ -// (c) Thales group, 2010 /* - Authors: - Johann Dreo - Caner Candan +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan */ -#ifndef _doEDA_h -#define _doEDA_h +#ifndef _edoEDA_h +#define _edoEDA_h #include #include #include -#include "doAlgo.h" -#include "doEstimator.h" -#include "doModifierMass.h" -#include "doSampler.h" -#include "doContinue.h" +#include "edoAlgo.h" +#include "edoEstimator.h" +#include "edoModifierMass.h" +#include "edoSampler.h" +#include "edoContinue.h" template < typename D > -class doEDA : public doAlgo< D > +class edoEDA : public edoAlgo< D > { public: //! Alias for the type EOT @@ -34,7 +54,7 @@ public: public: - //! doEDA constructor + //! edoEDA constructor /*! All the boxes used by a EDASA need to be given. @@ -51,13 +71,13 @@ public: \param initial_temperature The initial temperature. \param replacor Population replacor */ - doEDA (eoSelect< EOT > & selector, - doEstimator< D > & estimator, + edoEDA (eoSelect< EOT > & selector, + edoEstimator< D > & estimator, eoSelectOne< EOT > & selectone, - doModifierMass< D > & modifier, - doSampler< D > & sampler, + edoModifierMass< D > & modifier, + edoSampler< D > & sampler, eoContinue< EOT > & pop_continue, - doContinue< D > & distribution_continue, + edoContinue< D > & distribution_continue, eoEvalFunc < EOT > & evaluation, //moContinuator< moDummyNeighbor > & sa_continue, //moCoolingSchedule & cooling_schedule, @@ -216,22 +236,22 @@ private: eoSelect < EOT > & _selector; //! A EOT estimator. It is going to estimate distribution parameters. - doEstimator< D > & _estimator; + edoEstimator< D > & _estimator; //! SelectOne eoSelectOne< EOT > & _selectone; //! A D modifier - doModifierMass< D > & _modifier; + edoModifierMass< D > & _modifier; //! A D sampler - doSampler< D > & _sampler; + edoSampler< D > & _sampler; //! A EOT population continuator eoContinue < EOT > & _pop_continue; //! A D continuator - doContinue < D > & _distribution_continue; + edoContinue < D > & _distribution_continue; //! A full evaluation function. eoEvalFunc < EOT > & _evaluation; @@ -249,4 +269,4 @@ private: eoReplacement < EOT > & _replacor; }; -#endif // !_doEDA_h +#endif // !_edoEDA_h diff --git a/src/doEDASA.h b/src/edoEDASA.h similarity index 79% rename from src/doEDASA.h rename to src/edoEDASA.h index c6fb4927d..b77daa079 100644 --- a/src/doEDASA.h +++ b/src/edoEDASA.h @@ -1,26 +1,46 @@ -// (c) Thales group, 2010 /* - Authors: - Johann Dreo - Caner Candan +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan */ -#ifndef _doEDASA_h -#define _doEDASA_h +#ifndef _edoEDASA_h +#define _edoEDASA_h #include #include #include -#include "doAlgo.h" -#include "doEstimator.h" -#include "doModifierMass.h" -#include "doSampler.h" -#include "doContinue.h" +#include "edoAlgo.h" +#include "edoEstimator.h" +#include "edoModifierMass.h" +#include "edoSampler.h" +#include "edoContinue.h" template < typename D > -class doEDASA : public doAlgo< D > +class edoEDASA : public edoAlgo< D > { public: //! Alias for the type EOT @@ -34,7 +54,7 @@ public: public: - //! doEDASA constructor + //! edoEDASA constructor /*! All the boxes used by a EDASA need to be given. @@ -51,13 +71,13 @@ public: \param initial_temperature The initial temperature. \param replacor Population replacor */ - doEDASA (eoSelect< EOT > & selector, - doEstimator< D > & estimator, + edoEDASA (eoSelect< EOT > & selector, + edoEstimator< D > & estimator, eoSelectOne< EOT > & selectone, - doModifierMass< D > & modifier, - doSampler< D > & sampler, + edoModifierMass< D > & modifier, + edoSampler< D > & sampler, eoContinue< EOT > & pop_continue, - doContinue< D > & distribution_continue, + edoContinue< D > & distribution_continue, eoEvalFunc < EOT > & evaluation, moContinuator< moDummyNeighbor > & sa_continue, moCoolingSchedule & cooling_schedule, @@ -214,22 +234,22 @@ private: eoSelect < EOT > & _selector; //! A EOT estimator. It is going to estimate distribution parameters. - doEstimator< D > & _estimator; + edoEstimator< D > & _estimator; //! SelectOne eoSelectOne< EOT > & _selectone; //! A D modifier - doModifierMass< D > & _modifier; + edoModifierMass< D > & _modifier; //! A D sampler - doSampler< D > & _sampler; + edoSampler< D > & _sampler; //! A EOT population continuator eoContinue < EOT > & _pop_continue; //! A D continuator - doContinue < D > & _distribution_continue; + edoContinue < D > & _distribution_continue; //! A full evaluation function. eoEvalFunc < EOT > & _evaluation; @@ -247,4 +267,4 @@ private: eoReplacement < EOT > & _replacor; }; -#endif // !_doEDASA_h +#endif // !_edoEDASA_h diff --git a/src/edoEstimator.h b/src/edoEstimator.h new file mode 100644 index 000000000..6a2be7a33 --- /dev/null +++ b/src/edoEstimator.h @@ -0,0 +1,43 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoEstimator_h +#define _edoEstimator_h + +#include +#include + +template < typename D > +class edoEstimator : public eoUF< eoPop< typename D::EOType >&, D > +{ +public: + typedef typename D::EOType EOType; + + // virtual D operator() ( eoPop< EOT >& )=0 (provided by eoUF< A1, R >) +}; + +#endif // !_edoEstimator_h diff --git a/src/edoEstimatorNormalMono.h b/src/edoEstimatorNormalMono.h new file mode 100644 index 000000000..1ef61ab71 --- /dev/null +++ b/src/edoEstimatorNormalMono.h @@ -0,0 +1,97 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoEstimatorNormalMono_h +#define _edoEstimatorNormalMono_h + +#include "edoEstimator.h" +#include "edoNormalMono.h" + +template < typename EOT > +class edoEstimatorNormalMono : public edoEstimator< edoNormalMono< EOT > > +{ +public: + typedef typename EOT::AtomType AtomType; + + class Variance + { + public: + Variance() : _sumvar(0){} + + void update(AtomType v) + { + _n++; + + AtomType d = v - _mean; + + _mean += 1 / _n * d; + _sumvar += (_n - 1) / _n * d * d; + } + + AtomType get_mean() const {return _mean;} + AtomType get_var() const {return _sumvar / (_n - 1);} + AtomType get_std() const {return sqrt( get_var() );} + + private: + AtomType _n; + AtomType _mean; + AtomType _sumvar; + }; + +public: + edoNormalMono< EOT > operator()(eoPop& pop) + { + unsigned int popsize = pop.size(); + assert(popsize > 0); + + unsigned int dimsize = pop[0].size(); + assert(dimsize > 0); + + std::vector< Variance > var( dimsize ); + + for (unsigned int i = 0; i < popsize; ++i) + { + for (unsigned int d = 0; d < dimsize; ++d) + { + var[d].update( pop[i][d] ); + } + } + + EOT mean( dimsize ); + EOT variance( dimsize ); + + for (unsigned int d = 0; d < dimsize; ++d) + { + mean[d] = var[d].get_mean(); + variance[d] = var[d].get_var(); + } + + return edoNormalMono< EOT >( mean, variance ); + } +}; + +#endif // !_edoEstimatorNormalMono_h diff --git a/src/doEstimatorNormalMulti.h b/src/edoEstimatorNormalMulti.h similarity index 68% rename from src/doEstimatorNormalMulti.h rename to src/edoEstimatorNormalMulti.h index 286c752f2..f06fadd86 100644 --- a/src/doEstimatorNormalMulti.h +++ b/src/edoEstimatorNormalMulti.h @@ -1,18 +1,39 @@ -// (c) Thales group, 2010 /* - Authors: - Johann Dreo - Caner Candan +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan */ -#ifndef _doEstimatorNormalMulti_h -#define _doEstimatorNormalMulti_h -#include "doEstimator.h" -#include "doNormalMulti.h" +#ifndef _edoEstimatorNormalMulti_h +#define _edoEstimatorNormalMulti_h + +#include "edoEstimator.h" +#include "edoNormalMulti.h" template < typename EOT > -class doEstimatorNormalMulti : public doEstimator< doNormalMulti< EOT > > +class edoEstimatorNormalMulti : public edoEstimator< edoNormalMulti< EOT > > { public: class CovMatrix @@ -112,7 +133,7 @@ public: public: typedef typename EOT::AtomType AtomType; - doNormalMulti< EOT > operator()(eoPop& pop) + edoNormalMulti< EOT > operator()(eoPop& pop) { unsigned int popsize = pop.size(); assert(popsize > 0); @@ -122,8 +143,8 @@ public: CovMatrix cov( pop ); - return doNormalMulti< EOT >( cov.get_mean(), cov.get_varcovar() ); + return edoNormalMulti< EOT >( cov.get_mean(), cov.get_varcovar() ); } }; -#endif // !_doEstimatorNormalMulti_h +#endif // !_edoEstimatorNormalMulti_h diff --git a/src/edoEstimatorUniform.h b/src/edoEstimatorUniform.h new file mode 100644 index 000000000..7c5779fff --- /dev/null +++ b/src/edoEstimatorUniform.h @@ -0,0 +1,71 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoEstimatorUniform_h +#define _edoEstimatorUniform_h + +#include "edoEstimator.h" +#include "edoUniform.h" + +// TODO: calcule de la moyenne + covariance dans une classe derivee + +template < typename EOT > +class edoEstimatorUniform : public edoEstimator< edoUniform< EOT > > +{ +public: + edoUniform< EOT > operator()(eoPop& pop) + { + unsigned int size = pop.size(); + + assert(size > 0); + + EOT min = pop[0]; + EOT max = pop[0]; + + for (unsigned int i = 1; i < size; ++i) + { + unsigned int size = pop[i].size(); + + assert(size > 0); + + // possibilité d'utiliser std::min_element et std::max_element mais exige 2 pass au lieu d'1. + + for (unsigned int d = 0; d < size; ++d) + { + if (pop[i][d] < min[d]) + min[d] = pop[i][d]; + + if (pop[i][d] > max[d]) + max[d] = pop[i][d]; + } + } + + return edoUniform< EOT >(min, max); + } +}; + +#endif // !_edoEstimatorUniform_h diff --git a/src/edoModifier.h b/src/edoModifier.h new file mode 100644 index 000000000..5aac0bb51 --- /dev/null +++ b/src/edoModifier.h @@ -0,0 +1,41 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoModifier_h +#define _edoModifier_h + +template < typename D > +class edoModifier +{ +public: + virtual ~edoModifier(){} + + typedef typename D::EOType EOType; +}; + +#endif // !_edoModifier_h + diff --git a/src/edoModifierDispersion.h b/src/edoModifierDispersion.h new file mode 100644 index 000000000..81a6b5415 --- /dev/null +++ b/src/edoModifierDispersion.h @@ -0,0 +1,43 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoModifierDispersion_h +#define _edoModifierDispersion_h + +#include +#include + +#include "edoModifier.h" + +template < typename D > +class edoModifierDispersion : public edoModifier< D >, public eoBF< D&, eoPop< typename D::EOType >&, void > +{ +public: + // virtual void operator() ( D&, eoPop< D::EOType >& )=0 (provided by eoBF< A1, A2, R >) +}; + +#endif // !_edoModifierDispersion_h diff --git a/src/edoModifierMass.h b/src/edoModifierMass.h new file mode 100644 index 000000000..fee69d2db --- /dev/null +++ b/src/edoModifierMass.h @@ -0,0 +1,45 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoModifierMass_h +#define _edoModifierMass_h + +#include + +#include "edoModifier.h" + +template < typename D > +class edoModifierMass : public edoModifier< D >, public eoBF< D&, typename D::EOType&, void > +{ +public: + //typedef typename D::EOType::AtomType AtomType; // does not work !!! + + // virtual void operator() ( D&, D::EOType& )=0 (provided by eoBF< A1, A2, R >) +}; + +#endif // !_edoModifierMass_h + diff --git a/src/edoNormalMono.h b/src/edoNormalMono.h new file mode 100644 index 000000000..0850386cf --- /dev/null +++ b/src/edoNormalMono.h @@ -0,0 +1,58 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoNormalMono_h +#define _edoNormalMono_h + +#include "edoDistrib.h" + +template < typename EOT > +class edoNormalMono : public edoDistrib< EOT > +{ +public: + edoNormalMono( const EOT& mean, const EOT& variance ) + : _mean(mean), _variance(variance) + { + assert(_mean.size() > 0); + assert(_mean.size() == _variance.size()); + } + + unsigned int size() + { + assert(_mean.size() == _variance.size()); + return _mean.size(); + } + + EOT mean(){return _mean;} + EOT variance(){return _variance;} + +private: + EOT _mean; + EOT _variance; +}; + +#endif // !_edoNormalMono_h diff --git a/src/edoNormalMonoCenter.h b/src/edoNormalMonoCenter.h new file mode 100644 index 000000000..8bd990a72 --- /dev/null +++ b/src/edoNormalMonoCenter.h @@ -0,0 +1,47 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoNormalMonoCenter_h +#define _edoNormalMonoCenter_h + +#include "edoModifierMass.h" +#include "edoNormalMono.h" + +template < typename EOT > +class edoNormalMonoCenter : public edoModifierMass< edoNormalMono< EOT > > +{ +public: + typedef typename EOT::AtomType AtomType; + + void operator() ( edoNormalMono< EOT >& distrib, EOT& mass ) + { + distrib.mean() = mass; + } +}; + +#endif // !_edoNormalMonoCenter_h + diff --git a/src/doNormalMulti.h b/src/edoNormalMulti.h similarity index 86% rename from src/doNormalMulti.h rename to src/edoNormalMulti.h index 1b3e3f16c..54f695b1b 100644 --- a/src/doNormalMulti.h +++ b/src/edoNormalMulti.h @@ -5,23 +5,23 @@ Caner Candan */ -#ifndef _doNormalMulti_h -#define _doNormalMulti_h +#ifndef _edoNormalMulti_h +#define _edoNormalMulti_h #include #include -#include "doDistrib.h" +#include "edoDistrib.h" namespace ublas = boost::numeric::ublas; template < typename EOT > -class doNormalMulti : public doDistrib< EOT > +class edoNormalMulti : public edoDistrib< EOT > { public: typedef typename EOT::AtomType AtomType; - doNormalMulti + edoNormalMulti ( const ublas::vector< AtomType >& mean, const ublas::symmetric_matrix< AtomType, ublas::lower >& varcovar @@ -48,4 +48,4 @@ private: ublas::symmetric_matrix< AtomType, ublas::lower > _varcovar; }; -#endif // !_doNormalMulti_h +#endif // !_edoNormalMulti_h diff --git a/src/edoNormalMultiCenter.h b/src/edoNormalMultiCenter.h new file mode 100644 index 000000000..e59c5634a --- /dev/null +++ b/src/edoNormalMultiCenter.h @@ -0,0 +1,48 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoNormalMultiCenter_h +#define _edoNormalMultiCenter_h + +#include "edoModifierMass.h" +#include "edoNormalMulti.h" + +template < typename EOT > +class edoNormalMultiCenter : public edoModifierMass< edoNormalMulti< EOT > > +{ +public: + typedef typename EOT::AtomType AtomType; + + void operator() ( edoNormalMulti< EOT >& distrib, EOT& mass ) + { + ublas::vector< AtomType > mean( distrib.size() ); + std::copy( mass.begin(), mass.end(), mean.begin() ); + distrib.mean() = mean; + } +}; + +#endif // !_edoNormalMultiCenter_h diff --git a/src/edoSampler.h b/src/edoSampler.h new file mode 100644 index 000000000..efd776492 --- /dev/null +++ b/src/edoSampler.h @@ -0,0 +1,95 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoSampler_h +#define _edoSampler_h + +#include + +#include "edoBounder.h" +#include "edoBounderNo.h" + +template < typename D > +class edoSampler : public eoUF< D&, typename D::EOType > +{ +public: + typedef typename D::EOType EOType; + + edoSampler(edoBounder< EOType > & bounder) + : /*_dummy_bounder(),*/ _bounder(bounder) + {} + + /* + edoSampler() + : _dummy_bounder(), _bounder( _dummy_bounder ) + {} + */ + + // virtual EOType operator()( D& ) = 0 (provided by eoUF< A1, R >) + + virtual EOType sample( D& ) = 0; + + EOType operator()( D& distrib ) + { + unsigned int size = distrib.size(); + assert(size > 0); + + + //------------------------------------------------------------- + // Point we want to sample to get higher a set of points + // (coordinates in n dimension) + // x = {x1, x2, ..., xn} + // the sample method is implemented in the derivated class + //------------------------------------------------------------- + + EOType solution(sample(distrib)); + + //------------------------------------------------------------- + + + //------------------------------------------------------------- + // Now we are bounding the distribution thanks to min and max + // parameters. + //------------------------------------------------------------- + + _bounder(solution); + + //------------------------------------------------------------- + + + return solution; + } + +private: + //edoBounderNo _dummy_bounder; + + //! Bounder functor + edoBounder< EOType > & _bounder; + +}; + +#endif // !_edoSampler_h diff --git a/src/edoSamplerNormalMono.h b/src/edoSamplerNormalMono.h new file mode 100644 index 000000000..d628ba2fb --- /dev/null +++ b/src/edoSamplerNormalMono.h @@ -0,0 +1,91 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoSamplerNormalMono_h +#define _edoSamplerNormalMono_h + +#include + +#include "edoSampler.h" +#include "edoNormalMono.h" +#include "edoBounder.h" + +/** + * edoSamplerNormalMono + * This class uses the NormalMono distribution parameters (bounds) to return + * a random position used for population sampling. + */ +template < typename EOT > +class edoSamplerNormalMono : public edoSampler< edoNormalMono< EOT > > +{ +public: + typedef typename EOT::AtomType AtomType; + + edoSamplerNormalMono( edoBounder< EOT > & bounder ) + : edoSampler< edoNormalMono< EOT > >( bounder ) + {} + + EOT sample( edoNormalMono< EOT >& distrib ) + { + unsigned int size = distrib.size(); + assert(size > 0); + + + //------------------------------------------------------------- + // Point we want to sample to get higher a set of points + // (coordinates in n dimension) + // x = {x1, x2, ..., xn} + //------------------------------------------------------------- + + EOT solution; + + //------------------------------------------------------------- + + + //------------------------------------------------------------- + // Sampling all dimensions + //------------------------------------------------------------- + + for (unsigned int i = 0; i < size; ++i) + { + AtomType mean = distrib.mean()[i]; + AtomType variance = distrib.variance()[i]; + AtomType random = rng.normal(mean, variance); + + assert(variance >= 0); + + solution.push_back(random); + } + + //------------------------------------------------------------- + + + return solution; + } +}; + +#endif // !_edoSamplerNormalMono_h diff --git a/src/doSamplerNormalMulti.h b/src/edoSamplerNormalMulti.h similarity index 67% rename from src/doSamplerNormalMulti.h rename to src/edoSamplerNormalMulti.h index 2378634a5..c1ce57453 100644 --- a/src/doSamplerNormalMulti.h +++ b/src/edoSamplerNormalMulti.h @@ -1,30 +1,39 @@ -// (c) Thales group, 2010 /* - Authors: - Johann Dreo - Caner Candan +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan */ -#ifndef _doSamplerNormalMulti_h -#define _doSamplerNormalMulti_h +#ifndef _edoSamplerNormalMulti_h +#define _edoSamplerNormalMulti_h -#include -#include +#include #include +#include -#include - -#include "doSampler.h" -#include "doNormalMulti.h" -#include "doBounder.h" - -/** - * doSamplerNormalMulti - * This class uses the Normal distribution parameters (bounds) to return - * a random position used for population sampling. - */ -template < typename EOT > -class doSamplerNormalMulti : public doSampler< doNormalMulti< EOT > > +template< class EOT > +class edoSamplerNormalMulti : public edoSampler< edoNormalMulti< EOT > > { public: typedef typename EOT::AtomType AtomType; @@ -96,11 +105,11 @@ public: ublas::symmetric_matrix< AtomType, ublas::lower > _L; }; - doSamplerNormalMulti( doBounder< EOT > & bounder ) - : doSampler< doNormalMulti< EOT > >( bounder ) + edoSamplerNormalMulti( edoBounder< EOT > & bounder ) + : edoSampler< edoNormalMulti< EOT > >( bounder ) {} - EOT sample( doNormalMulti< EOT >& distrib ) + EOT sample( edoNormalMulti< EOT >& distrib ) { unsigned int size = distrib.size(); @@ -162,4 +171,4 @@ public: } }; -#endif // !_doSamplerNormalMulti_h +#endif // !_edoSamplerNormalMulti_h diff --git a/src/edoSamplerUniform.h b/src/edoSamplerUniform.h new file mode 100644 index 000000000..a7b4c316d --- /dev/null +++ b/src/edoSamplerUniform.h @@ -0,0 +1,96 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoSamplerUniform_h +#define _edoSamplerUniform_h + +#include + +#include "edoSampler.h" +#include "edoUniform.h" + +/** + * edoSamplerUniform + * This class uses the Uniform distribution parameters (bounds) to return + * a random position used for population sampling. + */ +template < typename EOT, class D=edoUniform > // FIXME: D template name is there really used ?!? +class edoSamplerUniform : public edoSampler< edoUniform< EOT > > +{ +public: + typedef D Distrib; + + edoSamplerUniform(edoBounder< EOT > & bounder) + : edoSampler< edoUniform >(bounder) // FIXME: Why D is not used here ? + {} + + /* + edoSamplerUniform() + : edoSampler< edoUniform >() + {} + */ + + EOT sample( edoUniform< EOT >& distrib ) + { + unsigned int size = distrib.size(); + assert(size > 0); + + + //------------------------------------------------------------- + // Point we want to sample to get higher a set of points + // (coordinates in n dimension) + // x = {x1, x2, ..., xn} + //------------------------------------------------------------- + + EOT solution; + + //------------------------------------------------------------- + + + //------------------------------------------------------------- + // Sampling all dimensions + //------------------------------------------------------------- + + for (unsigned int i = 0; i < size; ++i) + { + double min = distrib.min()[i]; + double max = distrib.max()[i]; + double random = rng.uniform(min, max); + + assert(min <= random && random <= max); + + solution.push_back(random); + } + + //------------------------------------------------------------- + + + return solution; + } +}; + +#endif // !_edoSamplerUniform_h diff --git a/src/edoUniform.h b/src/edoUniform.h new file mode 100644 index 000000000..93d3b5372 --- /dev/null +++ b/src/edoUniform.h @@ -0,0 +1,43 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoUniform_h +#define _edoUniform_h + +#include "edoDistrib.h" +#include "edoVectorBounds.h" + +template < typename EOT > +class edoUniform : public edoDistrib< EOT >, public edoVectorBounds< EOT > +{ +public: + edoUniform(EOT min, EOT max) + : edoVectorBounds< EOT >(min, max) + {} +}; + +#endif // !_edoUniform_h diff --git a/src/edoUniformCenter.h b/src/edoUniformCenter.h new file mode 100644 index 000000000..8284439b1 --- /dev/null +++ b/src/edoUniformCenter.h @@ -0,0 +1,55 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoUniformCenter_h +#define _edoUniformCenter_h + +#include "edoModifierMass.h" +#include "edoUniform.h" + +template < typename EOT > +class edoUniformCenter : public edoModifierMass< edoUniform< EOT > > +{ +public: + typedef typename EOT::AtomType AtomType; + + void operator() ( edoUniform< EOT >& distrib, EOT& mass ) + { + for (unsigned int i = 0, n = mass.size(); i < n; ++i) + { + AtomType& min = distrib.min()[i]; + AtomType& max = distrib.max()[i]; + + AtomType range = (max - min) / 2; + + min = mass[i] - range; + max = mass[i] + range; + } + } +}; + +#endif // !_edoUniformCenter_h diff --git a/src/edoVectorBounds.h b/src/edoVectorBounds.h new file mode 100644 index 000000000..3c00995f0 --- /dev/null +++ b/src/edoVectorBounds.h @@ -0,0 +1,56 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoVectorBounds_h +#define _edoVectorBounds_h + +template < typename EOT > +class edoVectorBounds +{ +public: + edoVectorBounds(EOT min, EOT max) + : _min(min), _max(max) + { + assert(_min.size() > 0); + assert(_min.size() == _max.size()); + } + + EOT min(){return _min;} + EOT max(){return _max;} + + unsigned int size() + { + assert(_min.size() == _max.size()); + return _min.size(); + } + +private: + EOT _min; + EOT _max; +}; + +#endif // !_edoVectorBounds_h diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 48a655194..490adc1a0 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -5,10 +5,10 @@ FILE(GLOB SOURCES *.cpp) SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) -ADD_LIBRARY(doutils ${SOURCES}) -INSTALL(TARGETS doutils ARCHIVE DESTINATION lib COMPONENT libraries) +ADD_LIBRARY(edoutils ${SOURCES}) +INSTALL(TARGETS edoutils ARCHIVE DESTINATION lib COMPONENT libraries) FILE(GLOB HDRS *.h utils) -INSTALL(FILES ${HDRS} DESTINATION include/do/utils COMPONENT headers) +INSTALL(FILES ${HDRS} DESTINATION include/edo/utils COMPONENT headers) ###################################################################################### diff --git a/src/utils/doFileSnapshot.h b/src/utils/doFileSnapshot.h deleted file mode 100644 index ea0ffeb63..000000000 --- a/src/utils/doFileSnapshot.h +++ /dev/null @@ -1,74 +0,0 @@ -//----------------------------------------------------------------------------- -// doFileSnapshot.h -// (c) Marc Schoenauer, Maarten Keijzer and GeNeura Team, 2001 -/* - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: todos@geneura.ugr.es, http://geneura.ugr.es - Marc.Schoenauer@polytechnique.fr - mkeijzer@dhi.dk - Johann Dreo - Caner Candan - */ -//----------------------------------------------------------------------------- - -#ifndef _doFileSnapshot_h -#define _doFileSnapshot_h - -#include -#include -#include - -#include "utils/eoMonitor.h" - -class doFileSnapshot : public eoMonitor -{ -public: - - doFileSnapshot(std::string dirname, - unsigned int frequency = 1, - std::string filename = "gen", - std::string delim = " ", - unsigned int counter = 0, - bool rmFiles = true, - bool saveFilenames = true); - - virtual ~doFileSnapshot(); - - virtual bool hasChanged() {return _boolChanged;} - virtual std::string getDirName() { return _dirname; } - virtual unsigned int getCounter() { return _counter; } - virtual const std::string baseFileName() { return _filename;} - std::string getFileName() {return _currentFileName;} - - void setCurrentFileName(); - - virtual eoMonitor& operator()(void); - - virtual eoMonitor& operator()(std::ostream& os); - -private : - std::string _dirname; - unsigned int _frequency; - std::string _filename; - std::string _delim; - std::string _currentFileName; - unsigned int _counter; - bool _saveFilenames; - std::ofstream* _descOfFiles; - bool _boolChanged; -}; - -#endif // !_doFileSnapshot diff --git a/src/utils/doHyperVolume.h b/src/utils/doHyperVolume.h deleted file mode 100644 index 2a1be37fb..000000000 --- a/src/utils/doHyperVolume.h +++ /dev/null @@ -1,32 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doHyperVolume_h -#define _doHyperVolume_h - -template < typename EOT > -class doHyperVolume -{ -public: - typedef typename EOT::AtomType AtomType; - - doHyperVolume() : _hv(1) {} - - void update(AtomType v) - { - _hv *= ::sqrt( v ); - - assert( _hv <= std::numeric_limits< AtomType >::max() ); - } - - AtomType get_hypervolume() const { return _hv; } - -protected: - AtomType _hv; -}; - -#endif // !_doHyperVolume_h diff --git a/src/utils/doPopStat.h b/src/utils/doPopStat.h deleted file mode 100644 index a3ae45753..000000000 --- a/src/utils/doPopStat.h +++ /dev/null @@ -1,75 +0,0 @@ -// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- - -//----------------------------------------------------------------------------- -// doPopStat.h -// (c) Maarten Keijzer, Marc Schoenauer and GeNeura Team, 2001 -/* - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Contact: todos@geneura.ugr.es, http://geneura.ugr.es - Marc.Schoenauer@polytechnique.fr - mkeijzer@dhi.dk - Johann Dreo - Caner Candan - */ -//----------------------------------------------------------------------------- - -/** WARNING: this file contains 2 classes: - -eoPopString and eoSortedPopString - -that transform the population into a std::string -that can be used to dump to the screen -*/ - -#ifndef _doPopStat_h -#define _doPopStat_h - -#include - - -/** Thanks to MS/VC++, eoParam mechanism is unable to handle std::vectors of stats. -This snippet is a workaround: -This class will "print" a whole population into a std::string - that you can later -send to any stream -This is the plain version - see eoPopString for the Sorted version - -Note: this Stat should probably be used only within eoStdOutMonitor, and not -inside an eoFileMonitor, as the eoState construct will work much better there. -*/ -template -class doPopStat : public eoStat -{ -public: - - using eoStat::value; - - /** default Ctor, void std::string by default, as it appears - on the description line once at beginning of evolution. and - is meaningless there. _howMany defaults to 0, that is, the whole - population*/ - doPopStat(std::string _desc ="") - : eoStat("", _desc) {} - - /** Fills the value() of the eoParam with the dump of the population. */ - void operator()(const eoPop& _pop) - { - std::ostringstream os; - os << _pop; - value() = os.str(); - } -}; - -#endif // !_doPopStat_h diff --git a/src/utils/doStat.h b/src/utils/doStat.h deleted file mode 100644 index 5a6056a9f..000000000 --- a/src/utils/doStat.h +++ /dev/null @@ -1,54 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doStat_h -#define _doStat_h - -#include - -template < typename D > -class doStatBase : public eoUF< const D&, void > -{ -public: - // virtual void operator()( const D& ) = 0 (provided by eoUF< A1, R >) - - virtual void lastCall( const D& ) {} - virtual std::string className() const { return "doStatBase"; } -}; - -template < typename D > class doCheckPoint; - -template < typename D, typename T > -class doStat : public eoValueParam< T >, public doStatBase< D > -{ -public: - doStat(T value, std::string description) - : eoValueParam< T >(value, description) - {} - - virtual std::string className(void) const { return "doStat"; } - - doStat< D, T >& addTo(doCheckPoint< D >& cp) { cp.add(*this); return *this; } - - // TODO: doStat< D, T >& addTo(eoMonitor& mon) { mon.add(*this); return *this; } -}; - - -//! A parent class for any kind of distribution to dump parameter to std::string type - -template < typename D > -class doDistribStat : public doStat< D, std::string > -{ -public: - using doStat< D, std::string >::value; - - doDistribStat(std::string desc) - : doStat< D, std::string >("", desc) - {} -}; - -#endif // !_doStat_h diff --git a/src/utils/doStatNormalMono.h b/src/utils/doStatNormalMono.h deleted file mode 100644 index 1eab0d53d..000000000 --- a/src/utils/doStatNormalMono.h +++ /dev/null @@ -1,35 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doStatNormalMono_h -#define _doStatNormalMono_h - -#include "doStat.h" -#include "doNormalMono.h" - -template < typename EOT > -class doStatNormalMono : public doDistribStat< doNormalMono< EOT > > -{ -public: - using doDistribStat< doNormalMono< EOT > >::value; - - doStatNormalMono( std::string desc = "" ) - : doDistribStat< doNormalMono< EOT > >( desc ) - {} - - void operator()( const doNormalMono< EOT >& distrib ) - { - value() = "\n# ====== mono normal distribution dump =====\n"; - - std::ostringstream os; - os << distrib.mean() << " " << distrib.variance() << std::endl; - - value() += os.str(); - } -}; - -#endif // !_doStatNormalMono_h diff --git a/src/utils/doStatNormalMulti.h b/src/utils/doStatNormalMulti.h deleted file mode 100644 index d433e40e2..000000000 --- a/src/utils/doStatNormalMulti.h +++ /dev/null @@ -1,48 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doStatNormalMulti_h -#define _doStatNormalMulti_h - -#include - -#include "doStat.h" -#include "doNormalMulti.h" - -template < typename EOT > -class doStatNormalMulti : public doDistribStat< doNormalMulti< EOT > > -{ -public: - typedef typename EOT::AtomType AtomType; - - using doDistribStat< doNormalMulti< EOT > >::value; - - doStatNormalMulti( std::string desc = "" ) - : doDistribStat< doNormalMulti< EOT > >( desc ) - {} - - void operator()( const doNormalMulti< EOT >& distrib ) - { - value() = "\n# ====== multi normal distribution dump =====\n"; - - std::ostringstream os; - - os << distrib.mean() << " " << distrib.varcovar() << std::endl; - - // ublas::vector< AtomType > mean = distrib.mean(); - // std::copy(mean.begin(), mean.end(), std::ostream_iterator< std::string >( os, " " )); - - // ublas::symmetric_matrix< AtomType, ublas::lower > varcovar = distrib.varcovar(); - // std::copy(varcovar.begin(), varcovar.end(), std::ostream_iterator< std::string >( os, " " )); - - // os << std::endl; - - value() += os.str(); - } -}; - -#endif // !_doStatNormalMulti_h diff --git a/src/utils/doStatUniform.h b/src/utils/doStatUniform.h deleted file mode 100644 index 808750f7f..000000000 --- a/src/utils/doStatUniform.h +++ /dev/null @@ -1,35 +0,0 @@ -// (c) Thales group, 2010 -/* - Authors: - Johann Dreo - Caner Candan -*/ - -#ifndef _doStatUniform_h -#define _doStatUniform_h - -#include "doStat.h" -#include "doUniform.h" - -template < typename EOT > -class doStatUniform : public doDistribStat< doUniform< EOT > > -{ -public: - using doDistribStat< doUniform< EOT > >::value; - - doStatUniform( std::string desc = "" ) - : doDistribStat< doUniform< EOT > >( desc ) - {} - - void operator()( const doUniform< EOT >& distrib ) - { - value() = "\n# ====== uniform distribution dump =====\n"; - - std::ostringstream os; - os << distrib.min() << " " << distrib.max() << std::endl; - - value() += os.str(); - } -}; - -#endif // !_doStatUniform_h diff --git a/src/utils/doCheckPoint.h b/src/utils/edoCheckPoint.h similarity index 57% rename from src/utils/doCheckPoint.h rename to src/utils/edoCheckPoint.h index d424e1843..90ba72e66 100644 --- a/src/utils/doCheckPoint.h +++ b/src/utils/edoCheckPoint.h @@ -1,28 +1,48 @@ -// (c) Thales group, 2010 /* - Authors: - Johann Dreo - Caner Candan +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan */ -#ifndef _doCheckPoint_h -#define _doCheckPoint_h +#ifndef _edoCheckPoint_h +#define _edoCheckPoint_h #include #include -#include "doContinue.h" -#include "doStat.h" +#include "edoContinue.h" +#include "edoStat.h" //! eoCheckPoint< EOT > classe fitted to Distribution Object library template < typename D > -class doCheckPoint : public doContinue< D > +class edoCheckPoint : public edoContinue< D > { public: typedef typename D::EOType EOType; - doCheckPoint(doContinue< D >& _cont) + edoCheckPoint(edoContinue< D >& _cont) { _continuators.push_back( &_cont ); } @@ -74,12 +94,12 @@ public: return bContinue; } - void add(doContinue< D >& cont) { _continuators.push_back( &cont ); } - void add(doStatBase< D >& stat) { _stats.push_back( &stat ); } + void add(edoContinue< D >& cont) { _continuators.push_back( &cont ); } + void add(edoStatBase< D >& stat) { _stats.push_back( &stat ); } void add(eoMonitor& mon) { _monitors.push_back( &mon ); } void add(eoUpdater& upd) { _updaters.push_back( &upd ); } - virtual std::string className(void) const { return "doCheckPoint"; } + virtual std::string className(void) const { return "edoCheckPoint"; } std::string allClassNames() const { @@ -117,10 +137,10 @@ public: } private: - std::vector< doContinue< D >* > _continuators; - std::vector< doStatBase< D >* > _stats; + std::vector< edoContinue< D >* > _continuators; + std::vector< edoStatBase< D >* > _stats; std::vector< eoMonitor* > _monitors; std::vector< eoUpdater* > _updaters; }; -#endif // !_doCheckPoint_h +#endif // !_edoCheckPoint_h diff --git a/src/utils/doFileSnapshot.cpp b/src/utils/edoFileSnapshot.cpp similarity index 57% rename from src/utils/doFileSnapshot.cpp rename to src/utils/edoFileSnapshot.cpp index 268cfe82e..40f1db689 100644 --- a/src/utils/doFileSnapshot.cpp +++ b/src/utils/edoFileSnapshot.cpp @@ -1,28 +1,33 @@ -//----------------------------------------------------------------------------- -// doFileSnapshot.cpp -// (c) Marc Schoenauer, Maarten Keijzer and GeNeura Team, 2001 /* - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. - Contact: todos@geneura.ugr.es, http://geneura.ugr.es - Marc.Schoenauer@polytechnique.fr - mkeijzer@dhi.dk - Johann Dreo - Caner Candan - */ -//----------------------------------------------------------------------------- +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (c) Marc Schoenauer, Maarten Keijzer and GeNeura Team, 2001 +Copyright (C) 2010 Thales group +*/ +/* +Authors: + todos@geneura.ugr.es + Marc Schoenauer + Martin Keijzer + Johann Dréo + Caner Candan +*/ #include @@ -30,11 +35,11 @@ #include #include -#include +#include #include #include -doFileSnapshot::doFileSnapshot(std::string dirname, +edoFileSnapshot::edoFileSnapshot(std::string dirname, unsigned int frequency /*= 1*/, std::string filename /*= "gen"*/, std::string delim /*= " "*/, @@ -79,19 +84,19 @@ doFileSnapshot::doFileSnapshot(std::string dirname, } -doFileSnapshot::~doFileSnapshot() +edoFileSnapshot::~edoFileSnapshot() { delete _descOfFiles; } -void doFileSnapshot::setCurrentFileName() +void edoFileSnapshot::setCurrentFileName() { std::ostringstream oscount; oscount << _counter; _currentFileName = _dirname + "/" + _filename + oscount.str(); } -eoMonitor& doFileSnapshot::operator()(void) +eoMonitor& edoFileSnapshot::operator()(void) { if (_counter % _frequency) { @@ -107,7 +112,7 @@ eoMonitor& doFileSnapshot::operator()(void) if (!os) { - std::string str = "doFileSnapshot: Could not open " + _currentFileName; + std::string str = "edoFileSnapshot: Could not open " + _currentFileName; throw std::runtime_error(str); } @@ -119,7 +124,7 @@ eoMonitor& doFileSnapshot::operator()(void) return operator()(os); } -eoMonitor& doFileSnapshot::operator()(std::ostream& os) +eoMonitor& edoFileSnapshot::operator()(std::ostream& os) { iterator it = vec.begin(); diff --git a/src/utils/edoFileSnapshot.h b/src/utils/edoFileSnapshot.h new file mode 100644 index 000000000..43e6f0885 --- /dev/null +++ b/src/utils/edoFileSnapshot.h @@ -0,0 +1,79 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (c) Marc Schoenauer, Maarten Keijzer and GeNeura Team, 2001 +Copyright (C) 2010 Thales group +*/ +/* +Authors: + todos@geneura.ugr.es + Marc Schoenauer + Martin Keijzer + Johann Dréo + Caner Candan +*/ + +#ifndef _edoFileSnapshot_h +#define _edoFileSnapshot_h + +#include +#include +#include + +#include "utils/eoMonitor.h" + +class edoFileSnapshot : public eoMonitor +{ +public: + + edoFileSnapshot(std::string dirname, + unsigned int frequency = 1, + std::string filename = "gen", + std::string delim = " ", + unsigned int counter = 0, + bool rmFiles = true, + bool saveFilenames = true); + + virtual ~edoFileSnapshot(); + + virtual bool hasChanged() {return _boolChanged;} + virtual std::string getDirName() { return _dirname; } + virtual unsigned int getCounter() { return _counter; } + virtual const std::string baseFileName() { return _filename;} + std::string getFileName() {return _currentFileName;} + + void setCurrentFileName(); + + virtual eoMonitor& operator()(void); + + virtual eoMonitor& operator()(std::ostream& os); + +private : + std::string _dirname; + unsigned int _frequency; + std::string _filename; + std::string _delim; + std::string _currentFileName; + unsigned int _counter; + bool _saveFilenames; + std::ofstream* _descOfFiles; + bool _boolChanged; +}; + +#endif // !_edoFileSnapshot diff --git a/src/utils/edoHyperVolume.h b/src/utils/edoHyperVolume.h new file mode 100644 index 000000000..a1bf4e594 --- /dev/null +++ b/src/utils/edoHyperVolume.h @@ -0,0 +1,52 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoHyperVolume_h +#define _edoHyperVolume_h + +template < typename EOT > +class edoHyperVolume +{ +public: + typedef typename EOT::AtomType AtomType; + + edoHyperVolume() : _hv(1) {} + + void update(AtomType v) + { + _hv *= ::sqrt( v ); + + assert( _hv <= std::numeric_limits< AtomType >::max() ); + } + + AtomType get_hypervolume() const { return _hv; } + +protected: + AtomType _hv; +}; + +#endif // !_edoHyperVolume_h diff --git a/src/utils/edoPopStat.h b/src/utils/edoPopStat.h new file mode 100644 index 000000000..c8df5f969 --- /dev/null +++ b/src/utils/edoPopStat.h @@ -0,0 +1,70 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (c) Marc Schoenauer, Maarten Keijzer and GeNeura Team, 2001 +Copyright (C) 2010 Thales group +*/ +/* +Authors: + todos@geneura.ugr.es + Marc Schoenauer + Martin Keijzer + Johann Dréo + Caner Candan +*/ + +#ifndef _edoPopStat_h +#define _edoPopStat_h + +#include + + +/** Thanks to MS/VC++, eoParam mechanism is unable to handle std::vectors of stats. +This snippet is a workaround: +This class will "print" a whole population into a std::string - that you can later +send to any stream +This is the plain version - see eoPopString for the Sorted version + +Note: this Stat should probably be used only within eoStdOutMonitor, and not +inside an eoFileMonitor, as the eoState construct will work much better there. +*/ +template +class edoPopStat : public eoStat +{ +public: + + using eoStat::value; + + /** default Ctor, void std::string by default, as it appears + on the description line once at beginning of evolution. and + is meaningless there. _howMany defaults to 0, that is, the whole + population*/ + edoPopStat(std::string _desc ="") + : eoStat("", _desc) {} + + /** Fills the value() of the eoParam with the dump of the population. */ + void operator()(const eoPop& _pop) + { + std::ostringstream os; + os << _pop; + value() = os.str(); + } +}; + +#endif // !_edoPopStat_h diff --git a/src/utils/edoStat.h b/src/utils/edoStat.h new file mode 100644 index 000000000..24dce9c49 --- /dev/null +++ b/src/utils/edoStat.h @@ -0,0 +1,74 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoStat_h +#define _edoStat_h + +#include + +template < typename D > +class edoStatBase : public eoUF< const D&, void > +{ +public: + // virtual void operator()( const D& ) = 0 (provided by eoUF< A1, R >) + + virtual void lastCall( const D& ) {} + virtual std::string className() const { return "edoStatBase"; } +}; + +template < typename D > class edoCheckPoint; + +template < typename D, typename T > +class edoStat : public eoValueParam< T >, public edoStatBase< D > +{ +public: + edoStat(T value, std::string description) + : eoValueParam< T >(value, description) + {} + + virtual std::string className(void) const { return "edoStat"; } + + edoStat< D, T >& addTo(edoCheckPoint< D >& cp) { cp.add(*this); return *this; } + + // TODO: edoStat< D, T >& addTo(eoMonitor& mon) { mon.add(*this); return *this; } +}; + + +//! A parent class for any kind of distribution to dump parameter to std::string type + +template < typename D > +class edoDistribStat : public edoStat< D, std::string > +{ +public: + using edoStat< D, std::string >::value; + + edoDistribStat(std::string desc) + : edoStat< D, std::string >("", desc) + {} +}; + +#endif // !_edoStat_h diff --git a/src/utils/edoStatNormalMono.h b/src/utils/edoStatNormalMono.h new file mode 100644 index 000000000..8cb28553c --- /dev/null +++ b/src/utils/edoStatNormalMono.h @@ -0,0 +1,55 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoStatNormalMono_h +#define _edoStatNormalMono_h + +#include "edoStat.h" +#include "edoNormalMono.h" + +template < typename EOT > +class edoStatNormalMono : public edoDistribStat< edoNormalMono< EOT > > +{ +public: + using edoDistribStat< edoNormalMono< EOT > >::value; + + edoStatNormalMono( std::string desc = "" ) + : edoDistribStat< edoNormalMono< EOT > >( desc ) + {} + + void operator()( const edoNormalMono< EOT >& distrib ) + { + value() = "\n# ====== mono normal distribution dump =====\n"; + + std::ostringstream os; + os << distrib.mean() << " " << distrib.variance() << std::endl; + + value() += os.str(); + } +}; + +#endif // !_edoStatNormalMono_h diff --git a/src/utils/edoStatNormalMulti.h b/src/utils/edoStatNormalMulti.h new file mode 100644 index 000000000..74adb0baf --- /dev/null +++ b/src/utils/edoStatNormalMulti.h @@ -0,0 +1,68 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoStatNormalMulti_h +#define _edoStatNormalMulti_h + +#include + +#include "edoStat.h" +#include "edoNormalMulti.h" + +template < typename EOT > +class edoStatNormalMulti : public edoDistribStat< edoNormalMulti< EOT > > +{ +public: + typedef typename EOT::AtomType AtomType; + + using edoDistribStat< edoNormalMulti< EOT > >::value; + + edoStatNormalMulti( std::string desc = "" ) + : edoDistribStat< edoNormalMulti< EOT > >( desc ) + {} + + void operator()( const edoNormalMulti< EOT >& distrib ) + { + value() = "\n# ====== multi normal distribution dump =====\n"; + + std::ostringstream os; + + os << distrib.mean() << " " << distrib.varcovar() << std::endl; + + // ublas::vector< AtomType > mean = distrib.mean(); + // std::copy(mean.begin(), mean.end(), std::ostream_iterator< std::string >( os, " " )); + + // ublas::symmetric_matrix< AtomType, ublas::lower > varcovar = distrib.varcovar(); + // std::copy(varcovar.begin(), varcovar.end(), std::ostream_iterator< std::string >( os, " " )); + + // os << std::endl; + + value() += os.str(); + } +}; + +#endif // !_edoStatNormalMulti_h diff --git a/src/utils/edoStatUniform.h b/src/utils/edoStatUniform.h new file mode 100644 index 000000000..ab75e66be --- /dev/null +++ b/src/utils/edoStatUniform.h @@ -0,0 +1,55 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + +#ifndef _edoStatUniform_h +#define _edoStatUniform_h + +#include "edoStat.h" +#include "edoUniform.h" + +template < typename EOT > +class edoStatUniform : public edoDistribStat< edoUniform< EOT > > +{ +public: + using edoDistribStat< edoUniform< EOT > >::value; + + edoStatUniform( std::string desc = "" ) + : edoDistribStat< edoUniform< EOT > >( desc ) + {} + + void operator()( const edoUniform< EOT >& distrib ) + { + value() = "\n# ====== uniform distribution dump =====\n"; + + std::ostringstream os; + os << distrib.min() << " " << distrib.max() << std::endl; + + value() += os.str(); + } +}; + +#endif // !_edoStatUniform_h diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 74ad84ac6..aea8eaee2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -33,7 +33,7 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/application/common) SET(SOURCES - t-doEstimatorNormalMulti + t-edoEstimatorNormalMulti t-mean-distance t-bounderno t-uniform @@ -43,8 +43,8 @@ SET(SOURCES FOREACH(current ${SOURCES}) ADD_EXECUTABLE(${current} ${current}.cpp) ADD_TEST(${current} ${current}) - TARGET_LINK_LIBRARIES(${current} do doutils ${EO_LIBRARIES} ${MO_LIBRARIES} ${Boost_LIBRARIES}) - INSTALL(TARGETS ${current} RUNTIME DESTINATION share/do/test COMPONENT test) + TARGET_LINK_LIBRARIES(${current} edo edoutils ${EO_LIBRARIES} ${MO_LIBRARIES} ${Boost_LIBRARIES}) + INSTALL(TARGETS ${current} RUNTIME DESTINATION share/edo/test COMPONENT test) ENDFOREACH() ###################################################################################### diff --git a/test/t-bounderno.cpp b/test/t-bounderno.cpp index 0898520b4..3f7a189b1 100644 --- a/test/t-bounderno.cpp +++ b/test/t-bounderno.cpp @@ -1,5 +1,32 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + #include -#include +#include #include "Rosenbrock.h" @@ -7,7 +34,7 @@ typedef eoReal< eoMinimizingFitness > EOT; int main(void) { - doBounderNo< EOT > bounder; + edoBounderNo< EOT > bounder; return 0; } diff --git a/test/t-continue.cpp b/test/t-continue.cpp index 5cae79ff3..7206a0c35 100644 --- a/test/t-continue.cpp +++ b/test/t-continue.cpp @@ -1,16 +1,43 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + #include -#include +#include #include "Rosenbrock.h" typedef eoReal< eoMinimizingFitness > EOT; -typedef doUniform< EOT > Distrib; +typedef edoUniform< EOT > Distrib; int main(void) { eoState state; - doContinue< Distrib >* continuator = new doDummyContinue< Distrib >(); + edoContinue< Distrib >* continuator = new edoDummyContinue< Distrib >(); state.storeFunctor(continuator); return 0; diff --git a/test/t-doEstimatorNormalMulti.cpp b/test/t-edoEstimatorNormalMulti.cpp similarity index 78% rename from test/t-doEstimatorNormalMulti.cpp rename to test/t-edoEstimatorNormalMulti.cpp index 71b07e2a5..23324eef3 100644 --- a/test/t-doEstimatorNormalMulti.cpp +++ b/test/t-edoEstimatorNormalMulti.cpp @@ -1,3 +1,30 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + #include #include @@ -7,13 +34,13 @@ #include #include -#include +#include #include "Rosenbrock.h" #include "Sphere.h" typedef eoReal< eoMinimizingFitness > EOT; -typedef doNormalMulti< EOT > Distrib; +typedef edoNormalMulti< EOT > Distrib; typedef EOT::AtomType AtomType; int main(int ac, char** av) @@ -37,7 +64,7 @@ int main(int ac, char** av) AtomType covar3_value = parser.createParam((AtomType)1.0, "covar3", "Covar value 3", '3', section).value(); std::ostringstream ss; - ss << p_size << "_" << fixed << setprecision(1) + ss << p_size << "_" << std::fixed << std::setprecision(1) << mean_value << "_" << covar1_value << "_" << covar2_value << "_" << covar3_value << "_gen"; std::string gen_filename = ss.str(); @@ -101,18 +128,18 @@ int main(int ac, char** av) // (3a) distribution output preparation //----------------------------------------------------------------------------- - doDummyContinue< Distrib >* distrib_dummy_continue = new doDummyContinue< Distrib >(); + edoDummyContinue< Distrib >* distrib_dummy_continue = new edoDummyContinue< Distrib >(); state.storeFunctor(distrib_dummy_continue); - doCheckPoint< Distrib >* distrib_continue = new doCheckPoint< Distrib >( *distrib_dummy_continue ); + edoCheckPoint< Distrib >* distrib_continue = new edoCheckPoint< Distrib >( *distrib_dummy_continue ); state.storeFunctor(distrib_continue); - doDistribStat< Distrib >* distrib_stat = new doStatNormalMulti< EOT >(); + edoDistribStat< Distrib >* distrib_stat = new edoStatNormalMulti< EOT >(); state.storeFunctor(distrib_stat); distrib_continue->add( *distrib_stat ); - doFileSnapshot* distrib_file_snapshot = new doFileSnapshot( "TestResDistrib", 1, gen_filename ); + edoFileSnapshot* distrib_file_snapshot = new edoFileSnapshot( "TestResDistrib", 1, gen_filename ); state.storeFunctor(distrib_file_snapshot); distrib_file_snapshot->add(*distrib_stat); distrib_continue->add(*distrib_file_snapshot); @@ -131,10 +158,10 @@ int main(int ac, char** av) //----------------------------------------------------------------------------- // Prepare bounder class to set bounds of sampling. - // This is used by doSampler. + // This is used by edoSampler. //----------------------------------------------------------------------------- - doBounder< EOT >* bounder = new doBounderRng< EOT >(EOT(pop[0].size(), -5), + edoBounder< EOT >* bounder = new edoBounderRng< EOT >(EOT(pop[0].size(), -5), EOT(pop[0].size(), 5), *gen); state.storeFunctor(bounder); @@ -146,7 +173,7 @@ int main(int ac, char** av) // Prepare sampler class with a specific distribution //----------------------------------------------------------------------------- - doSampler< Distrib >* sampler = new doSamplerNormalMulti< EOT >( *bounder ); + edoSampler< Distrib >* sampler = new edoSamplerNormalMulti< EOT >( *bounder ); state.storeFunctor(sampler); //----------------------------------------------------------------------------- @@ -177,11 +204,11 @@ int main(int ac, char** av) eoCheckPoint< EOT >* pop_continue = new eoCheckPoint< EOT >( *pop_cont ); state.storeFunctor(pop_continue); - doPopStat< EOT >* pop_stat = new doPopStat; + edoPopStat< EOT >* pop_stat = new edoPopStat; state.storeFunctor(pop_stat); pop_continue->add(*pop_stat); - doFileSnapshot* pop_file_snapshot = new doFileSnapshot( "TestResPop", 1, gen_filename ); + edoFileSnapshot* pop_file_snapshot = new edoFileSnapshot( "TestResPop", 1, gen_filename ); state.storeFunctor(pop_file_snapshot); pop_file_snapshot->add(*pop_stat); pop_continue->add(*pop_file_snapshot); @@ -195,7 +222,7 @@ int main(int ac, char** av) // (6) estimation phase //----------------------------------------------------------------------------- - doEstimator< Distrib >* estimator = new doEstimatorNormalMulti< EOT >(); + edoEstimator< Distrib >* estimator = new edoEstimatorNormalMulti< EOT >(); state.storeFunctor(estimator); distrib = (*estimator)( pop ); diff --git a/test/t-mean-distance.cpp b/test/t-mean-distance.cpp index 46173883f..40a95c994 100644 --- a/test/t-mean-distance.cpp +++ b/test/t-mean-distance.cpp @@ -1,3 +1,30 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + #include #include @@ -11,13 +38,16 @@ #include #include -#include +#include + +#include +#include #include "Rosenbrock.h" #include "Sphere.h" typedef eoReal< eoMinimizingFitness > EOT; -typedef doNormalMulti< EOT > Distrib; +typedef edoNormalMulti< EOT > Distrib; typedef EOT::AtomType AtomType; int main(int ac, char** av) @@ -121,10 +151,10 @@ int main(int ac, char** av) //----------------------------------------------------------------------------- // Prepare bounder class to set bounds of sampling. - // This is used by doSampler. + // This is used by edoSampler. //----------------------------------------------------------------------------- - doBounder< EOT >* bounder = new doBounderRng< EOT >(EOT(pop[0].size(), -5), + edoBounder< EOT >* bounder = new edoBounderRng< EOT >(EOT(pop[0].size(), -5), EOT(pop[0].size(), 5), *gen); state.storeFunctor(bounder); @@ -136,7 +166,7 @@ int main(int ac, char** av) // Prepare sampler class with a specific distribution //----------------------------------------------------------------------------- - doSampler< Distrib >* sampler = new doSamplerNormalMulti< EOT >( *bounder ); + edoSampler< Distrib >* sampler = new edoSamplerNormalMulti< EOT >( *bounder ); state.storeFunctor(sampler); //----------------------------------------------------------------------------- @@ -161,7 +191,7 @@ int main(int ac, char** av) // (6) estimation phase //----------------------------------------------------------------------------- - doEstimator< Distrib >* estimator = new doEstimatorNormalMulti< EOT >(); + edoEstimator< Distrib >* estimator = new edoEstimatorNormalMulti< EOT >(); state.storeFunctor(estimator); distrib = (*estimator)( pop ); diff --git a/test/t-uniform.cpp b/test/t-uniform.cpp index d7aedfea6..ec01ec7a5 100644 --- a/test/t-uniform.cpp +++ b/test/t-uniform.cpp @@ -1,5 +1,32 @@ +/* +The Evolving Distribution Objects framework (EDO) is a template-based, +ANSI-C++ evolutionary computation library which helps you to write your +own estimation of distribution algorithms. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Copyright (C) 2010 Thales group +*/ +/* +Authors: + Johann Dréo + Caner Candan +*/ + #include -#include +#include #include "Rosenbrock.h" @@ -9,7 +36,7 @@ int main(void) { eoState state; - doUniform< EOT >* distrib = new doUniform< EOT >( EOT(3, -1), EOT(3, 1) ); + edoUniform< EOT >* distrib = new edoUniform< EOT >( EOT(3, -1), EOT(3, 1) ); state.storeFunctor(distrib); return 0; diff --git a/test/test_cov_parameters.py b/test/test_cov_parameters.py index f9199a9e4..7a90f1670 100755 --- a/test/test_cov_parameters.py +++ b/test/test_cov_parameters.py @@ -2,7 +2,7 @@ PSIZE = 10000 MEAN = 0 -CMD = "./test/t-doEstimatorNormalMulti -P=%s -m=%.1f -1=%.1f -2=%.1f -3=%.1f && ./gplot.py -r TestResPop -p -w 5 -u -g %s -G results_for_test_cov_parameters -f %s_gen1" +CMD = "./test/t-edoEstimatorNormalMulti -P=%s -m=%.1f -1=%.1f -2=%.1f -3=%.1f && ./gplot.py -r TestResPop -p -w 5 -u -g %s -G results_for_test_cov_parameters -f %s_gen1" from os import system from numpy import arange