Merge pull request #474 from PrincetonUniversity/temp/merge-devel

Temp/merge devel
PrincetonUniversity · Sep 21, 2017 · ccf5ce8 · ccf5ce8
2 parents 001a801 + 3748551
commit ccf5ce8
Show file tree

Hide file tree

Showing 154 changed files with 8,937 additions and 7,223 deletions.
diff --git a/.idea/runConfigurations/AGT_Test_Script.xml b/.idea/runConfigurations/AGT_Test_Script.xml
diff --git a/.idea/runConfigurations/DDM_Learning_Test.xml b/.idea/runConfigurations/DDM_Learning_Test.xml
diff --git a/.idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml b/.idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml
diff --git a/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_DEBUGGING.xml b/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_DEBUGGING.xml
diff --git a/.../runConfigurations/EVC_System_Laming_Validation_Test_Script__SPECIFY_ControlSignals__.xml b/.../runConfigurations/EVC_System_Laming_Validation_Test_Script__SPECIFY_ControlSignals__.xml
diff --git a/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_with_Custom_Fn.xml b/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_with_Custom_Fn.xml
diff --git a/.idea/runConfigurations/EVC_System_Test_Script_with_Profiler.xml b/.idea/runConfigurations/EVC_System_Test_Script_with_Profiler.xml
diff --git a/.idea/runConfigurations/FinalProject.xml b/.idea/runConfigurations/FinalProject.xml
diff --git a/.idea/runConfigurations/Make_HTML.xml b/.idea/runConfigurations/Make_HTML.xml
diff --git a/.idea/runConfigurations/Multilayer_Learning_Test_Script_VARIATIONS.xml b/.idea/runConfigurations/Multilayer_Learning_Test_Script_VARIATIONS.xml
diff --git a/.idea/runConfigurations/Multilayer_Learning_Test_Script__WITH_GATING_.xml b/.idea/runConfigurations/Multilayer_Learning_Test_Script__WITH_GATING_.xml
diff --git a/.idea/runConfigurations/NEW_Learning_Markus.xml b/.idea/runConfigurations/NEW_Learning_Markus.xml
diff --git a/.idea/runConfigurations/NetworkX_Examples.xml b/.idea/runConfigurations/NetworkX_Examples.xml
diff --git a/.idea/runConfigurations/Profile_EVC_System_Test.xml b/.idea/runConfigurations/Profile_EVC_System_Test.xml
diff --git a/.idea/runConfigurations/ResetInterpreter.xml b/.idea/runConfigurations/ResetInterpreter.xml
diff --git a/.idea/runConfigurations/Stroop_Model_Learning_and_Control_Test_Script.xml b/.idea/runConfigurations/Stroop_Model_Learning_and_Control_Test_Script.xml
diff --git a/.idea/runConfigurations/Stroop_Model_Test_Script_VARIATIONS.xml b/.idea/runConfigurations/Stroop_Model_Test_Script_VARIATIONS.xml
diff --git a/.idea/runConfigurations/Two_Layer_Test_Script.xml b/.idea/runConfigurations/Two_Layer_Test_Script.xml
diff --git a/.idea/runConfigurations/Xor_Script_1_process_working.xml b/.idea/runConfigurations/Xor_Script_1_process_working.xml
diff --git a/.idea/runConfigurations/Xor_Script_2_processes.xml b/.idea/runConfigurations/Xor_Script_2_processes.xml
diff --git a/.idea/runConfigurations/_DDM_Test_Script.xml b/.idea/runConfigurations/_DDM_Test_Script.xml
diff --git a/.idea/runConfigurations/_DDM_scheduled_simple.xml b/.idea/runConfigurations/_DDM_scheduled_simple.xml
diff --git a/.idea/runConfigurations/_Documentation_Examples.xml b/.idea/runConfigurations/_Documentation_Examples.xml
diff --git a/.idea/runConfigurations/_EVC_System_DEMO_Script.xml b/.idea/runConfigurations/_EVC_System_DEMO_Script.xml
diff --git a/.idea/runConfigurations/_EVC_System_Laming_Validation_Test_Script.xml b/.idea/runConfigurations/_EVC_System_Laming_Validation_Test_Script.xml
diff --git a/.idea/runConfigurations/_Integrator_scheduled_timescales.xml b/.idea/runConfigurations/_Integrator_scheduled_timescales.xml
diff --git a/.idea/runConfigurations/_META_TEST.xml b/.idea/runConfigurations/_META_TEST.xml