Test peo modified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@910 331e1502-861f-0410-8da2-ba01fb791d7f

trunk/paradiseo-peo/test/CMakeLists.txt

@@ -62,7 +62,9 @@ ENDIF(WIN32 AND NOT CYGWIN)
 SET (TEST_LIST t-peo
 			    )
 			    
-SET (TEST_LIBRARY t-EAParaEval
+SET (TEST_LIBRARY t-ParallelEval
+				  t-ParallelTransform
+				  t-MultiStart
 				)
 			    
 				

trunk/paradiseo-peo/test/t-EAParaEval.cpp

@@ -1,41 +0,0 @@
-// Test of parallel evaluation with a PSO
-#include <peo>
-typedef eoRealParticle < double >Indi;
-double f (const Indi & _indi)
-{
-  double sum=_indi[0]+_indi[1];
-  return (-sum);
-}
-int main (int __argc, char *__argv[])
-{
-  peo :: init( __argc, __argv );
-  rng.reseed (time(0));
-  eoGenContinue < Indi > genContPara (5);
-  eoCombinedContinue <Indi> continuatorPara (genContPara);
-  eoCheckPoint<Indi> checkpoint(continuatorPara);
-  peoEvalFunc<Indi, double, const Indi& > plainEval(f);
-  peoPopEval< Indi > eval(plainEval);
-  eoUniformGenerator < double >uGen (-2., 2.);
-  eoInitFixedLength < Indi > random (2, uGen);
-  eoUniformGenerator < double >sGen (-1., 1.);
-  eoVelocityInitFixedLength < Indi > veloRandom (2, sGen);
-  eoFirstIsBestInit < Indi > localInit;
-  eoRealVectorBounds bndsFlight(2,-2.,2.);
-  eoStandardFlight < Indi > flight(bndsFlight);
-  eoPop < Indi > pop;
-  pop.append (20, random);
-  eoLinearTopology<Indi> topology(6);
-  eoRealVectorBounds bnds(2,-1.,1.);
-  eoStandardVelocity < Indi > velocity (topology,1,0.5,2.,bnds);
-  eoInitializer <Indi> init(eval,veloRandom,localInit,topology,pop);
-  eoSyncEasyPSO <Indi> psa(init,checkpoint,eval, velocity, flight);
-  peoWrapper parallelPSO( psa, pop);
-  eval.setOwner(parallelPSO);
-  peo :: run();
-  peo :: finalize();
-  if (getNodeRank()==1)
-  {
-      pop.sort();
-      std::cout<<pop;
-  }
-}

trunk/paradiseo-peo/test/t-MultiStart.cpp

@@ -0,0 +1,40 @@
+// Test : multistart
+
+#include <peo>
+
+struct Algorithm 
+{
+	void operator()(double & _d) 
+	{
+		_d = _d * _d;	
+	}
+};
+
+int main (int __argc, char * * __argv)
+{
+
+  peo :: init (__argc, __argv);
+  if (getNodeRank()==1)
+  	std::cout<<"\n\nTest : multistart\n\n";
+  std::vector < double > v;
+  if (getNodeRank()==1)
+  	std::cout<<"\n\nBefore :";
+  for(unsigned i = 0; i< 10; i++)
+  {
+  	v.push_back(i);
+ 	if (getNodeRank()==1)
+  		std::cout<<"\n"<<v[i];
+  }
+  Algorithm algo;
+  peoMultiStart < double > initParallel (algo);
+  peoWrapper parallelAlgo (initParallel, v);
+  initParallel.setOwner(parallelAlgo);
+  peo :: run( );
+  peo :: finalize( );
+  if (getNodeRank()==1)
+  {
+  	std::cout<<"\n\nAfter :\n";
+  	for(unsigned i = 0; i< 10; i++)
+		std::cout<<v[i]<<"\n";
+  }
+}

trunk/paradiseo-peo/test/t-ParallelEval.cpp

@@ -0,0 +1,42 @@
+// Test : parallel evaluation
+#include <peo>
+#include <es.h>
+typedef eoReal<double> Indi;
+double f (const Indi & _indi)
+{
+  double sum=_indi[0]+_indi[1];
+  return (-sum);
+}
+struct Algorithm 
+{
+	Algorithm( peoPopEval < Indi > & _eval): eval( _eval ){}
+	void operator()(eoPop < Indi > & _pop) 
+	{
+		eoPop < Indi > empty_pop;
+        eval(empty_pop, _pop);	
+	}
+	peoPopEval < Indi > & eval;
+};
+
+int main (int __argc, char *__argv[])
+{
+  peo :: init( __argc, __argv );
+  if (getNodeRank()==1)
+  	std::cout<<"\n\nTest : parallel evaluation\n\n";
+  rng.reseed (10);
+  peoEvalFunc<Indi, double, const Indi& > plainEval(f);
+  peoPopEval< Indi > eval(plainEval);
+  eoUniformGenerator < double >uGen (0, 1);
+  eoInitFixedLength < Indi > random (2, uGen);
+  eoPop < Indi > pop(20, random);
+  Algorithm algo ( eval );
+  peoWrapper parallelAlgo( algo, pop);
+  eval.setOwner(parallelAlgo);
+  peo :: run();
+  peo :: finalize();
+  if (getNodeRank()==1)
+  {
+      pop.sort();
+      std::cout<<pop;
+  }
+}

trunk/paradiseo-peo/test/t-ParallelTransform.cpp

@@ -0,0 +1,55 @@
+// Test : parallel transform
+#include <peo>
+#include <es.h>
+typedef eoReal<double> Indi;
+double f (const Indi & _indi)
+{
+  double sum=_indi[0]+_indi[1];
+  return (-sum);
+}
+struct Algorithm 
+{
+	Algorithm( eoEvalFunc < Indi > & _eval, eoSelect < Indi > & _select, peoTransform < Indi > & _transform): 
+		loopEval(_eval),
+        eval(loopEval),
+		selectTransform( _select, _transform),
+		breed(selectTransform) {}
+		
+	void operator()(eoPop < Indi > & _pop) 
+	{
+		eoPop < Indi > offspring, empty_pop;
+        eval(empty_pop, _pop);
+        eval(empty_pop, offspring);
+        std::cout<<"\n\nBefore :\n"<<offspring;
+        breed(_pop, offspring);
+        eval(empty_pop, offspring);
+        std::cout<<"\n\nAfter :\n"<<offspring;
+	}
+	eoPopLoopEval < Indi > loopEval;
+    eoPopEvalFunc < Indi > & eval;
+	eoSelectTransform < Indi > selectTransform;
+    eoBreed < Indi > & breed;
+};
+
+int main (int __argc, char *__argv[])
+{
+  peo :: init( __argc, __argv );
+  if (getNodeRank()==1)
+  	std::cout<<"\n\nTest : parallel transform\n\n";
+  rng.reseed (10);
+  eoEvalFuncPtr < Indi > plainEval(f);
+  eoEvalFuncCounter < Indi > eval(plainEval);
+  eoUniformGenerator < double >uGen (0, 1);
+  eoInitFixedLength < Indi > random (2, uGen);
+  eoPop < Indi > empty_pop,pop(6, random);
+  eoRankingSelect < Indi > selectionStrategy;
+  eoSelectNumber < Indi > select(selectionStrategy,6);
+  eoSegmentCrossover < Indi > crossover;
+  eoUniformMutation < Indi >  mutation(0.01);
+  peoTransform<Indi> transform(crossover,0.8,mutation,0.3);
+  Algorithm algo ( eval, select, transform );
+  peoWrapper parallelAlgo( algo, pop);
+  transform.setOwner(parallelAlgo);
+  peo :: run();
+  peo :: finalize();
+}

trunk/paradiseo-peo/test/t-peo.cpp

@@ -1,13 +1,10 @@
-
 #include <peo.h>
 
-void EAParaEval ()
-{
-  char *tmp="mpiexec -n 4 ./t-EAParaEval @param ";
-  system(tmp);
-}
-
 int main (int __argc, char *__argv[])
 {
-  EAParaEval();
+	system("mpdboot");
+	system("mpiexec -n 4 ./t-ParallelEval @param ");
+	system("mpiexec -n 4 ./t-ParallelTransform @param ");
+	system("mpiexec -n 4 ./t-MultiStart @param ");
+	system("mpdallexit");
 }