Commit graph

5,154 commits

Author SHA1 Message Date
Johann Dreo
a7134a658c Correct types for fitness assignment in IBEA
While the default fitness assignment of IBEA is the Exp indicator one, the used interface is a binary indicator.
2013-06-12 09:50:46 +02:00
Johann Dreo
83673d48b2 bugfix: clear previous pop when calling split 2013-06-12 09:45:35 +02:00
Johann Dreo
1544d7d18f Merge branch 'master' of https://gforge.inria.fr/git/paradiseo/paradiseo
Conflicts:
	cmake/Config.cmake
2013-06-11 13:33:55 +02:00
Johann Dreo
75340a5c91 Add hyper volume continuators & metrics handling feasibility constraint on objectives 2013-06-11 13:29:57 +02:00
Johann Dreo
82ce471aef Add a warning in eoDualFitness comments 2013-06-11 13:28:51 +02:00
Johann Dreo
97156dd69a Fix the templates of moeoDualRealObjectiveVector 2013-06-11 09:24:11 +02:00
Johann Dreo
55a1783605 Use member arithmetic operators and friend stream operators in dual fitness 2013-06-11 09:23:16 +02:00
Johann Dreo
ac61b782c3 Use the objective type instead of double in metrics 2013-06-07 17:51:01 +02:00
Johann Dreo
45123abbf3 Add the DUAL fitness assignment class
Change a bit the machinery of moeoExpBinaryIndicatorBasedFitnessAssignment to allow subclassing.
2013-06-07 17:50:04 +02:00
Johann Dreo
89374247a4 Add constructors with explicit fitness assignement to IBEA 2013-06-07 17:34:59 +02:00
Johann Dreo
10ea97f78d More generic eoDualFitness
Allow an imitialization on a double only, BUT an assert fails if it is not 0.0
Remove friendship on operators, because there is two differerent templated classes declared later.
More operators with base types.
2013-06-07 17:32:30 +02:00
Johann Dreo
5af8359546 Merge branch 'fix/HVrange' 2013-06-07 12:53:53 +02:00
Johann Dreo
9787d4d89c Generic ObjectiveVector types 2013-06-07 12:43:09 +02:00
Johann Dreo
c9da01c70d Add missing arithmetic operators to eoDualFitness 2013-06-07 12:42:27 +02:00
Johann Dreo
818425565d Correct templatized types across ObjectiveVector-dependant code 2013-06-07 11:52:50 +02:00
Johann Dreo
3adff8518f Add moeoDualRealObjectiveVector, to implement OV with feasability 2013-06-07 11:26:49 +02:00
Johann Dreo
54e181d460 Use generic objective vector atomic type in HV continuator
One should not use specific OV types in continuators, but get it from ObjectiveVector::Type instead.
2013-06-07 11:22:26 +02:00
Johann Dreo
9aec7780dc Add moeoScalarObjectiveVector, a generic OV with templatized atomic type
Because sometime, we may want to use something else than a double (for example an eoDualFitness, a complex or whatever).
2013-06-07 11:21:02 +02:00
Johann Dreo
b619a85718 bugfix: do not allow null interval in hypervolume diff metric 2013-06-06 11:43:34 +02:00
liefooga
effaa56cfd special two-objective case of dominance depth ranking in O(n log n) 2013-05-31 16:13:45 +02:00
quemy
97e1da3e4a Fix build for SMP 2013-05-31 00:10:47 +02:00
bc544cc4a4 buildfix: do not always build release
Remove a test that was building Release if DEBUG was not set.
The correct way to specify build is to use CMAKE_BUILD_TYPE.
2013-05-25 17:21:08 +02:00
d8022dc903 Merge branch 'serial-new' of git+ssh://scm.gforge.inria.fr//gitroot/paradiseo/paradiseo 2013-05-21 21:24:42 +02:00
Johann Dreo
defb8382bf Explicit iterator instead of auto, for old C++ compat 2013-04-30 16:05:29 +02:00
Johann Dreo
6e56f634c3 use a sub-directory in the zip archive 2013-04-30 15:56:54 +02:00
Johann Dreo
150333ef7c bugfix: include nessary headers for eoRealBounds 2013-04-30 15:56:24 +02:00
Johann Dreo
c424e9a123 Merge branch 'serial-new' of https://gforge.inria.fr/git/paradiseo/paradiseo 2013-04-30 12:04:50 +02:00
Johann Dreo
66ddb4a388 Merge branch 'master' of https://gforge.inria.fr/git/paradiseo/paradiseo 2013-04-30 12:04:34 +02:00
Johann Dreo
e04a356809 Add a warning in moeoHyperVolumeUnaryMetric if set size == 1 2013-04-30 12:02:26 +02:00
Johann Dreo
379f71f288 bugfix: call mother constructor of moeoHypervolumeBinaryMetric
Thus the default bounds are initialized.
2013-04-30 12:02:26 +02:00
Johann Dreo
7a4bc3e6d3 eoRealInterval better error handling
Replace a logic exception in eoRealInterval by an assert.
Add a warning in debug mode when the range is null.
2013-04-30 12:02:16 +02:00
Johann Dreo
74a92bfd6b Include edoTrasform in <edo> 2013-04-29 16:05:28 +02:00
Johann Dreo
768b08c8d7 Remove the DEBUG option of CMake, that was overriding CMAKE_BUILD_TYPE
CMAKE_BUILD_TYPE is the expected way of specifying a Debug/Release build.
2013-04-29 16:03:58 +02:00
Johann Dreo
c6f7707c05 buildfix: expand Eigen include dir in cmake 2013-04-19 09:46:58 +02:00
Johann Dreo
3067f3f8e4 Refactor edoBinomialMulti to allow more complex data structures
Refactor distribution, sampler and estimator related to the multi-binomial distribution.
This introduce tomic methods which may be overloaded for data structures more complex than eoReal of vector of bool (the
default implentation).
2013-04-18 10:11:32 +02:00
canape
c197e6b286 BUG GNUPLOT: corrected by Titus Cieslewski 2013-04-18 08:55:00 +02:00
Johann Dreo
63e0b26186 Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/paradiseo/paradiseo 2013-04-17 08:45:35 +02:00
Johann Dreo
618c0c4cc4 EO -> paradisEO 2013-04-16 14:32:39 +02:00
Johann Dreo
e34eb842f1 Add a parser accessor to check if a given param long name has beer asked 2013-04-03 13:51:33 +02:00
Johann Dreo
cb97ce47cc Remove a const in a return type functor template 2013-04-03 13:50:59 +02:00
Johann Dreo
0a528039e2 reorder members of moeoHypcontinue 2013-04-03 12:13:37 +02:00
Mostepha-Redouane Khouadjia
9b5ceeea65 An MOEO continuator that stops if the archive reach a target Pareto Front 2013-04-03 12:04:25 +02:00
Johann Dreo
937ac7483d Add a wrapper to save a moeoMetric in an eoStat
Example:
    moeoHyperVolumeDifferenceMetric<OVT> * m_hypervolume = new moeoHyperVolumeDifferenceMetric<OVT>(true,1.1);
    moeoBinaryMetricStat<EOT>* hypervolume = new moeoBinaryMetricStat<EOT>( *m_hypervolume, "hyp-vol" );
    checkpoint.add( *hypervolume );
2013-04-02 17:15:47 +02:00
Benjamin Bouvier
95e4dfc625 eoserial: packing and unpacking of map<string, T> 2013-03-22 18:03:36 +01:00
Benjamin Bouvier
6c148f8ae2 eoserial: example of using the new-new serialization 2013-03-22 17:53:50 +01:00
Benjamin Bouvier
a9bdf2d51b eoserial: comments Utils.h 2013-03-22 17:46:20 +01:00
Benjamin Bouvier
5ab91c6139 eoserial: merged former Serialize.h with Utils.h: pack / unpack. 2013-03-22 17:05:42 +01:00
Benjamin Bouvier
a98563b118 eoserial: removed Serialize.h (something else coming soon...) 2013-03-22 17:05:19 +01:00
Benjamin Bouvier
d2680f986b eoserial: traits for knowing whether a class is derived from another one at compile time. Thanks Herb Sutter 2013-03-22 17:01:12 +01:00
Benjamin Bouvier
9ff8c7e499 eoserial: added Serialize by default for eoserial. 2013-03-22 01:14:18 +01:00