added 2018 test simulation

Author: adampdp

RoyalSociety2018/load_data.py

@@ -12,8 +12,6 @@
 # import random
 import helper_funcs as hf
 
-hf.dir_name = "./"
-
 
 def reload_single_run(show_plot=True, verbose=False):
     # N_muscles_perside = 24  # Number of muscles alongside the body

RoyalSociety2018/main.cpp

@@ -158,7 +158,6 @@ double EvaluationFunctionB(TVector<double> &v, RandomState &rs)
 
 ofstream bodyfile, actfile, curvfile, voltagefile, paramsfile;
 if (supArgs1.output){
-    ofstream bodyfile, actfile, curvfile, voltagefile;
     bodyfile.open(supArgs1.rename_file("body.dat"));
     actfile.open(supArgs1.rename_file("act.dat"));
     curvfile.open(supArgs1.rename_file("curv.dat"));
@@ -195,6 +194,7 @@ if (supArgs1.output){
         w.Step(StepSize, 1);
         if (supArgs1.output)
 //#ifdef OUTPUT
+if (supArgs1.output)
     {
         w.Curvature(curvature);
         curvfile << curvature << endl;
@@ -315,10 +315,11 @@ int main (int argc, const char* argv[])
     if (argc == 2)
         randomseed += atoi(argv[1]);
 
-    if (argc>2) if (!supArgs1.setArgs(argc,argv,randomseed)) return 0;
+    //supArgs1.max_gens = 40;
+    //supArgs1.pop_size = 56;
 
-    //supArgs1.max_gens = 100;
-    //supArgs1.pop_size = 26;
+    supArgs1.randomseed = randomseed;
+    if (argc>2) if (!supArgs1.setArgs(argc,argv,randomseed)) return 0;
 
     if (supArgs1.do_evol){
 
@@ -337,7 +338,7 @@ int main (int argc, const char* argv[])
     seedfile.close();
 
     // configure the search
-    s.SetRandomSeed(randomseed);
+    s.SetRandomSeed(supArgs1.randomseed);
     s.SetPopulationStatisticsDisplayFunction(EvolutionaryRunDisplay);
     s.SetSearchResultsDisplayFunction(ResultsDisplay);
     s.SetSelectionMode(RANK_BASED);             //{FITNESS_PROPORTIONATE,RANK_BASED}
@@ -356,9 +357,9 @@ int main (int argc, const char* argv[])
     // redirect standard output to a file
 //#ifdef PRINTTOFILE
 ofstream evolfile;
+std::streambuf *coutbuf = std::cout.rdbuf(); //save old buf
 if (supArgs1.printToFile)
 {
-   
     evolfile.open (supArgs1.rename_file("fitness.dat"));
     cout.rdbuf(evolfile.rdbuf());
 }
@@ -390,32 +391,37 @@ if (supArgs1.evo_seed)
 
 //#ifdef PRINTTOFILE
 if (supArgs1.printToFile)
+{
+    std::cout.rdbuf(coutbuf); //reset to standard output again
     evolfile.close();
+
+}
 //#endif
 
 
     }
 
+    supArgs1.output = 1;
+    supArgs1.speedoutput = 1;
+    RandomState rs;
+    long seed = static_cast<long>(time(NULL));
+    //rs.SetRandomSeed(seed);
+    rs.SetRandomSeed(supArgs1.randomseed);
 
-        RandomState rs;
-        long seed = static_cast<long>(time(NULL));
-        //rs.SetRandomSeed(seed);
-        rs.SetRandomSeed(supArgs1.randomseed);
+    std::cout << std::setprecision(10);
+
+    // Code to run simulation:
+    InitializeBodyConstants();
+
+    ifstream BestIndividualFile;
+    TVector<double> bestVector(1, VectSize);
+    BestIndividualFile.open(supArgs1.rename_file("best.gen.dat"));
+    BestIndividualFile >> bestVector;
 
-        std::cout << std::setprecision(10);
-    
-        // Code to run simulation:
-        InitializeBodyConstants();
-    
-        ifstream BestIndividualFile;
-        TVector<double> bestVector(1, VectSize);
-        BestIndividualFile.open(supArgs1.rename_file("best.gen.dat"));
-        BestIndividualFile >> bestVector;
 
-        EvaluationFunctionB(bestVector, rs);
+    EvaluationFunctionB(bestVector, rs);
 
 
-   
 
 
     return 0;

argUtils.cpp

@@ -43,6 +43,7 @@ SuppliedArgs::SuppliedArgs()
   do_nml = 0;
   traceDuration = 24;
   doOrigNS = 1;
+  max_gens = 10;
 }
 
 /* void SuppliedArgs::setDefaultArgs()
@@ -98,6 +99,7 @@ if (((argc-1) % 2) != 0)
 
     for (int arg = 1; arg<argc; arg+=2)
     { 
+    if (strcmp(argv[arg],"--maxgens")==0) max_gens = atoi(argv[arg+1]);
     if (strcmp(argv[arg],"--doevol")==0) do_evol = atoi(argv[arg+1]);
     if (strcmp(argv[arg],"--dorandinit")==0) simRandomInit = atoi(argv[arg+1]);
     //if (strcmp(argv[arg],"--skipOrigSim")==0) skipOrigSim = atoi(argv[arg+1]);

exampleRunRS18/ExampleActivity.png

@@ -0,0 +1 @@
+-0.2415177823988463590154651683406 -0.26189026022013811578759145959339 -0.52768628636856884650541132941726 0.65175580694887491617350860906299 0.24487725171083202235777775968018 -1 -0.64660428038295925112777240428841 0.37728595870785025523375111333735 0.8550543158976344759736321066157 0.46634864120349805993726022279589 -0.36142866864574541008181540746591 -0.59599279479593392228053971848567 -0.9154116856622225295581074533402 0.35074996085865134398673603755014 -0.43984494955289260564867959146795 -0.013562306370710201786078386021472 -0.45712619182761232705658471786592 0.019865269858451821416434057709921 -0.43627078688422460395202051586239 0.15887720639729632776671053306927 0.118538515621293624735521632374 -0.34851768736851684860056366233039 0.10425012433931908628625961910075 1 -0.90452224648122836470065522007644 -0.8674549216254889838495500953286 -0.15174208466702515663016015423636 0.17107967759744743818650647426693 0.2623833703021077323747078935412 1