neurodesign not GA

neuropower · Feb 13, 2018 · fd463d3 · fd463d3
1 parent 6dd97ed
commit fd463d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...s/designtoolbox/batch/geneticalgorithm.py → ...r/apps/designtoolbox/batch/neurodesign.py b/...s/designtoolbox/batch/geneticalgorithm.py → ...r/apps/designtoolbox/batch/neurodesign.py
diff --git a/neuropower/apps/designtoolbox/utils/prepare_GA.py b/neuropower/apps/designtoolbox/utils/prepare_GA.py
@@ -43,10 +43,11 @@ def create_neurodesign_string(sid):
     "if 'TASK_UID' in os.environ.keys(): \n" + \
     "    import sys \n" + \
     "    sys.path.append('/usr/local/bin/') \n" + \
-    "    import geneticalgorithm \n" + \
+    "    from neurodesign import experiment, optimisation \n" + \
+    "     \n" + \
     "else: \n" + \
-    "    from neurodesign import geneticalgorithm, generate, msequence \n" + \
-    "EXP = geneticalgorithm.experiment( \n" + \
+    "    from neurodesign import experiment, optimisation \n" + \
+    "EXP = experiment( \n" + \
     "    TR = %s, \n " %desdata.TR + \
     "    n_trials = %s, \n " %desdata.L + \
     "    P = %s, \n " %matrices['P'].tolist() + \
@@ -69,7 +70,7 @@ def create_neurodesign_string(sid):
     "    t_post = %s, \n" %desdata.t_poststim + \
     ") \n \n" + \
     "seed = %s \n" %np.random.randint(10000) + \
-    "POP = geneticalgorithm.population( \n" + \
+    "POP = optimisation( \n" + \
     "    experiment = EXP, \n " + \
     "    G = %s, \n " %desdata.G + \
     "    R = %s, \n " %R + \