nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

intermediate commit 6

Browse source
This commit is contained in:
LPTK 2013-07-10 17:49:08 +02:00
commit 483f815610
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
eo/NEWS
View file

@ -1,5 +1,6 @@
* current release: * current release:
- added an EOT& parameter to the moCoolingSchedule::update interface because some cooling schedules need it - added an EOT& parameter to the moCoolingSchedule::update interface method because some cooling schedules need it
- eoMonitor's are no more executed in moCheckpoint::init to prevent access to uninitialized data
* release 1.3.1 (2012-07-27) * release 1.3.1 (2012-07-27)
- the eo::mpi modules is no longer dependent from boost::mpi - the eo::mpi modules is no longer dependent from boost::mpi

10
mo/src/continuator/moCheckpoint.h
View file

@ -109,14 +109,16 @@ public :
stats[i]->init(_sol); stats[i]->init(_sol);
counter = 1; counter = 1;
for (unsigned i = 0; i < moupdaters.size(); ++i)
moupdaters[i]->init();
//for (unsigned i = 0; i < updaters.size(); ++i) //for (unsigned i = 0; i < updaters.size(); ++i)
// updaters[i]->init(); // updaters[i]->init();
for (unsigned i = 0; i < moupdaters.size(); ++i)
moupdaters[i]->init();
/* /*
* Removed because there was no reason for it to be done here. * Removed because there was no reason for it to be done here
* It caused premature monitoring of eoParams with undefined values * It caused premature monitoring of eoParams with uninitialized values
* (eoUpdater's don't have a init function)
* *
for (unsigned int i = 0; i < monitors.size(); ++i) for (unsigned int i = 0; i < monitors.size(); ++i)
(*monitors[i])(); (*monitors[i])();

6
mo/src/coolingSchedule/moTrikiCoolingSchedule.h
View file

@ -187,7 +187,7 @@ public:
chainStat.acceptedSolutions = accepted; chainStat.acceptedSolutions = accepted;
generated++; generated++;
cout << "gen " << generated << endl; //cout << "gen " << generated << endl;
if (_acceptedMove) if (_acceptedMove)
@ -263,7 +263,7 @@ public:
/// ///
if (avgFitness/(prevAvgFitness-delta) > xi) if (avgFitness/(prevAvgFitness-delta) > xi)
equilibrium_not_reached++; equilibrium_not_reached++, chainStat.equilibriumNotReached = true;
else equilibrium_not_reached = 0; else equilibrium_not_reached = 0;
} }
if (equilibrium_not_reached > K1) if (equilibrium_not_reached > K1)
@ -274,7 +274,7 @@ public:
//chainStat.reinitializing = true; //chainStat.reinitializing = true;
reinitializing = true; reinitializing = true;
chainStat.equilibriumNotReached = true; //chainStat.equilibriumNotReached = true;
alpha = lambda1; alpha = lambda1;
delta = sigma/mu1; delta = sigma/mu1;

1
mo/src/neighborhood/moRealNeighborhood.h
View file

@ -27,7 +27,6 @@ Lionel Parreaux <lionel.parreaux@gmail.com>
#define __moRealNeighborhood_h__ #define __moRealNeighborhood_h__
#include <mo> #include <mo>
#include <eoFunctor.h> // FIXME: Why don't we use eoFunctorBase on the mother classes
#include "neighborhood/moRealNeighbor.h" #include "neighborhood/moRealNeighbor.h"
template<class Distrib, class Neighbor> template<class Distrib, class Neighbor>