more simulations peformed

Author: adampdp

experiments/analysis.py

@@ -73,7 +73,7 @@ def getUniques(list1):
     return result1
 
 path_list = []
-outFolderBases = ["varyEvolSeeds", "varyEvolSeeds1"]
+outFolderBases = ["varyEvolSeeds", "varyEvolSeeds1", "varyEvolSeeds2", "varyEvolSeeds3"]
 current = os.path.dirname(os.path.realpath(__file__))  # location of this file!
 for outFolderBase in outFolderBases:
     path = current + "/" + outFolderBase
@@ -102,6 +102,8 @@ def getUniques(list1):
 worm_vals_list = []
 for dir in path_list:
     json_file = dir + "/worm_data.json"
+    if not os.path.isfile(json_file): break
+    if not os.path.isfile(dir + '/fitness.dat'): break
     with open(json_file, "r") as file:
         worm_data = json.load(file)
     cell_names = getCellNames(worm_data)
@@ -154,7 +156,7 @@ def getUniques(list1):
 
 if not make_directory("results", overwrite=True):
     sys.exit(1)
-fit_level = 0.9
+fit_level = 0.95
 
 results_titles = ['ChemWei', 'ElectWei', 'Bias', 'Worm']
 data_results_list = [weights_list, elec_weights_list, biases_list, worm_vals_list]

experiments/results/Bias_DA.png

@@ -5,9 +5,10 @@
 from run_main import run
 from run_main import make_directory
 
-outFolderBase = "varyEvolSeeds"
+outFolderBase = "varyEvolSeeds3"
 popSize = 10
-make_directory(outFolderBase)
+if not make_directory(outFolderBase):
+    sys.exit(1)
 
 for ind in range(500):
     outputFolderName = outFolderBase + "/run_" + str(ind)

experiments/results/Bias_DB.png

@@ -119,7 +119,7 @@ def reload_single_run(show_plot=True, verbose=False):
 
     if show_plot:
         plt.show()
-
+    plt.close()
 
 if __name__ == "__main__":
     import sys

experiments/results/Bias_DD.png

@@ -207,14 +207,7 @@ double save_traces(TVector<double> &v, RandomState &rs){
     w.AVA_output =  w.AVA_inact;
     w.AVB_output =  w.AVB_act;
 
-    
-    /* if (checkNervousSystemForJson()){
-    cout << "making json" << endl;
-    writeParsToJson(w, "worm_data.json");
-    testNervousSystemJson("worm_data.json", static_cast<NervousSystem &>(*w.n_ptr)); 
-    } */
-    
-    //#endif
+  
 
     for (double t = 0.0; t <= Transient + Duration; t += StepSize){
         w.Step(StepSize, 1);
@@ -458,24 +451,6 @@ int main (int argc, const char* argv[])
     Best >> best;
 
 
-    /* TVector<double> phenotype(1, VectSize);
-    GenPhenMapping(best, phenotype);
-    double sra = phenotype(SR_A);
-    double srb = phenotype(SR_B);
-    
-    
-    Worm w(phenotype, 1);
-    w.InitializeState(rs);
-    w.sr.SR_A_gain = 0.0;
-    w.sr.SR_B_gain = srb;
-    w.AVA_output =  w.AVA_inact;
-    w.AVB_output =  w.AVB_act; */
-
-
-    
-    /* if (strcmp(sim_output_dir_name.c_str(), "")!=0){
-    output_dir_name = sim_output_dir_name;
-    } */
 
     if (do_nml){
     nervousSystemName = nervousSystemNameForSim;
@@ -486,12 +461,7 @@ int main (int argc, const char* argv[])
     }
     save_traces(best, rs);
 
-    /* if (strcmp(nml_output_dir_name.c_str(), "")!=0){
-    nervousSystemName = nervousSystemNameForSim;
-    output_dir_name = nml_output_dir_name;
-    cout << "Performing nml run and saving data\n" << endl;
-    save_traces(best, rs);
-    } */
+