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

issue to fix

Browse source
This commit is contained in:
Caner Candan 2010-08-16 15:38:39 +02:00
commit 10d1ebbb9b
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/cma_sa/main.cpp
View file

@ -38,7 +38,7 @@ int main(int ac, char** av)
// Instantiate all need parameters for CMASA algorithm
//-----------------------------------------------------------------------------
eoSelect< EOT >* selector = new eoDetSelect< EOT >(0.1);
eoSelect< EOT >* selector = new eoDetSelect< EOT >(0.5);
state.storeFunctor(selector);
doEstimator< Distrib >* estimator =
@ -47,7 +47,7 @@ int main(int ac, char** av)
new doEstimatorNormalMulti< EOT >();
state.storeFunctor(estimator);
eoSelectOne< EOT >* selectone = new eoDetTournamentSelect< EOT >();
eoSelectOne< EOT >* selectone = new eoDetTournamentSelect< EOT >( 2 );
state.storeFunctor(selectone);
doModifierMass< Distrib >* modifier =

26
src/doCMASA.h
View file

@ -162,7 +162,7 @@ public:
// several files.
//-------------------------------------------------------------
//int number_of_iterations = 0;
int number_of_iterations = 0;
//-------------------------------------------------------------
@ -213,6 +213,8 @@ public:
_selector(pop, selected_pop);
assert( selected_pop.size() > 0 );
//-------------------------------------------------------------
@ -351,23 +353,23 @@ public:
// dicreasement
//-------------------------------------------------------------
{
double size = distrib.size();
assert(size > 0);
// {
// double size = distrib.size();
// assert(size > 0);
doHyperVolume< EOT > hv;
// doHyperVolume< EOT > hv;
for (int i = 0; i < size; ++i)
{
//hv.update( distrib.varcovar()[i] );
}
// for (int i = 0; i < size; ++i)
// {
// //hv.update( distrib.varcovar()[i] );
// }
//_ofs_params_var << hv << std::endl;
}
// //_ofs_params_var << hv << std::endl;
// }
//-------------------------------------------------------------
//++number_of_iterations;
++number_of_iterations;
}
while ( _cooling_schedule( temperature ) &&

2
src/doSamplerNormalMulti.h
View file

@ -35,6 +35,8 @@ public:
assert(Vc > 0);
assert( Vl == Vc );
_L.resize(Vl, Vc);
unsigned int i,j,k;