Merge branch 'master' of ssh://git.code.sf.net/p/easea/code

examples/EAtemplate.ez

@@ -9,12 +9,37 @@ _______________________________________________________________*/
 \User functions:
 \end
 
+\User CUDA:
+//Transfert some variables to GPU here (cudaMalloc, MemCpy)
+\end
+
 \User classes :
 GenomeClass { 
   // need to declare the genome here
+  int i;
 }
 \end
 
+\Before everything else function:
+//cout<<"Before everything else function called "<<endl;
+\end
+
+\After everything else function:
+//cout << "After everything else function called" << endl;
+\end
+
+\At the beginning of each generation function:
+//cout << "At the beginning of each generation function called" << endl;
+\end
+
+\At the end of each generation function:
+//cout << "At the end of each generation function called" << endl;
+\end
+
+\At each generation before reduce function:
+//cout << "At each generation before replacement function called" << endl;
+\end
+
 \GenomeClass::display:
 \end
 
@@ -64,8 +89,8 @@ GenomeClass {
 
   Remote island model: false
   IP file: ip.txt 			         // List of IP:PORT of islands to send individuals to
-  Server port : 2929
   Migration probability: 0.33    // Probability of sending an individual per generation
+  Server port : 2929
 
   Save population: false
   Start from file:false

libeasea/CEvolutionaryAlgorithm.cpp

@@ -168,7 +168,7 @@ void CEvolutionaryAlgorithm::addStoppingCriterion(CStoppingCriterion* sc){
 
 /* MAIN FUNCTION TO RUN THE EVOLUTIONARY LOOP */
 void CEvolutionaryAlgorithm::runEvolutionaryLoop(){
-  CIndividual** elitistPopulation;
+  CIndividual** elitistPopulation = NULL;
 
 #ifdef WIN32
    clock_t begin(clock());