Commit graph

57 commits

Author SHA1 Message Date
verel
edefae4b28 Small modif in moIndexedSwapNeighbor 2014-06-25 17:02:38 +02:00
quemy
e71dea0c5a Fix some warnings in eo and moeo. 2014-05-03 18:58:55 +02:00
manu
1f09aa656f Typo in moeo comments. 2014-05-01 19:21:43 +02:00
quemy
b1c7e1f256 Wrapper on eoFitContinue in order to allow islands to stop as soon as an island found a good solution 2013-11-21 12:40:24 +01:00
Johann Dreo
51a1af0924 Merge branch 'master' of https://gforge.inria.fr/git/paradiseo/paradiseo 2013-09-18 10:32:46 +02:00
Johann Dreo
5b39705a20 BUGFIX pop split everywhere in exp dual fitness assignment
Apply the fitness assignment on both splited pop, not just one.
Apply also the partial update on splited pop.
Confine numeric valuesto double limits, to avoid overflows.
2013-06-26 18:09:49 +02:00
Johann Dreo
6b886664e8 Replace a cout msg by a eo::log warning 2013-06-26 18:09:26 +02:00
liefooga
6fc4d043e0 fast computation of dominance-depth corrected for minimizing objectives 2013-06-25 16:28:25 +02:00
Johann Dreo
e6beab8e5c Use the fitness type instead of the objective vectors in fitness assignments 2013-06-25 15:42:56 +02:00
Johann Dreo
0567d7be6c Use a specific comparator for the dual objective vector
Because we want to have a separated comparator to use in the archive or…
2013-06-25 15:41:29 +02:00
Johann Dreo
2233403b5f Use a dedicated setup in dual HV metric, with feasibility 2013-06-21 11:26:41 +02:00
Johann Dreo
3d0db369bc Use the feasibility of the current individual for the feasability of the metric in dual fitness assignment 2013-06-21 11:09:15 +02:00
Johann Dreo
80aa04d6da Overload setup in the dual fitness assignment, to handle comparison overloading 2013-06-21 09:52:12 +02:00
Johann Dreo
2b80b91d28 Use the templatized type for the metric in binary metric stat 2013-06-13 16:25:55 +02:00
Johann Dreo
6fa57622be Missing header and include guards for moeoBinaryMetricStat 2013-06-13 14:50:44 +02:00
Johann Dreo
70aa40f888 Add dual hypervolume operators in the framewok header 2013-06-13 10:37:48 +02:00
Johann Dreo
b132f48de2 Insert a copyright header 2013-06-13 10:37:25 +02:00
Johann Dreo
32b4f077c4 Move the dual hypervolume continuator in a separated file 2013-06-13 10:36:33 +02:00
Johann Dreo
c44264e703 Move the hyper volume dual difference metric in a separated file 2013-06-13 10:00:15 +02:00
Johann Dreo
4af7f3d1bc Allow scalar init of dual fitness; add a pop splitter
Scalar init of a dual fitness is dangerous, thus adds an explicit security against use of a partially initialized
object.
Use the pop splitter in the dual stat switch and in the MOEO dual fitness assignment.
2013-06-13 09:48:39 +02:00
Johann Dreo
39621f8711 In hyp continue, do not declare unused variable and group using 2013-06-12 10:40:20 +02:00
Johann Dreo
9250e0c3a5 Backport feasability when computing fitness in fitness assignment 2013-06-12 10:39:23 +02:00
Johann Dreo
557b24694a Do not declare unused variable
This silents warnings about unused variables
2013-06-12 10:38:34 +02:00
Johann Dreo
0badb71c65 reorder members, for safe initialization 2013-06-12 10:37:30 +02:00
Johann Dreo
475b9bc9ef Makes operator() of Hypcontinues virtual when inheritating 2013-06-12 10:14:02 +02:00
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
97156dd69a Fix the templates of moeoDualRealObjectiveVector 2013-06-11 09:24:11 +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
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
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
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
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
Johann Dreo
64476d7561 buildfix: MOEO declare base class returning non-const bool 2013-03-21 07:42:00 +01:00
Johann Dreo
bda48533e8 Suppress warnings when compiling MOEO functions returning const
When compiling whith --Wignored-qualifiers, g++ no more warns about
ignoring const in methods *returning* a const, which isn't logical.
2013-03-20 17:42:04 +01:00
Johann Dreo
9e56de7a74 Makes MOEO::objectiveVector(int) const
Const correctness demands that read-only accessors are made const, or this
could discards qualifiers.
2013-02-22 14:27:27 +01:00