v0.4.27: resolving merge conflicts

cadCAD-org · Aug 26, 2021 · 37880a0 · 37880a0
2 parents 44661cf + 7feecf8
commit 37880a0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/documentation/System_Model_Parameter_Sweep.md b/documentation/System_Model_Parameter_Sweep.md
@@ -12,13 +12,13 @@ params = {
     'omega': [7]
 }
 ```
-The parameters above produce 2 simulations.
-* Simulation 1: 
+The parameters above produce 2 Runs per Simulation.
+* Run 1: 
     * `alpha = 1`
     * `beta = 2`
     * `gamma = 3`
     * `omega = 7`
-* Simulation 2:
+* Run 2:
     * `alpha = 1`
     * `beta = 5`
     * `gamma = 4`
@@ -70,4 +70,4 @@ sim_config = config_sim(
 )
 ```
 #### Example
-##### * [System Model Configuration](examples/param_sweep.py)
+##### * [System Model Configuration](examples/param_sweep.py)
diff --git a/simulations/regression_tests/execs/config1_test.py b/simulations/regression_tests/execs/config1_test.py
@@ -10,8 +10,7 @@
 local_proc_ctx = ExecutionContext(context=exec_mode.local_mode)
 run = Executor(exec_context=local_proc_ctx, configs=config1.exp.configs)
 
-raw_result, tensor_fields, sessions = run.execute()
+raw_result, tensor_fields, _ = run.execute()
 result = pd.DataFrame(raw_result)
 print(tabulate(tensor_fields[0], headers='keys', tablefmt='psql'))
-pprint(sessions)
-print(tabulate(result, headers='keys', tablefmt='psql'))
+print(tabulate(result, headers='keys', tablefmt='psql'))
diff --git a/simulations/regression_tests/execs/config2_test.py b/simulations/regression_tests/execs/config2_test.py
@@ -10,8 +10,7 @@
 local_proc_ctx = ExecutionContext(context=exec_mode.local_mode)
 run = Executor(exec_context=local_proc_ctx, configs=config2.exp.configs)
 
-raw_result, tensor_fields, sessions = run.execute()
+raw_result, tensor_fields, _ = run.execute()
 result = pd.DataFrame(raw_result)
 print(tabulate(tensor_fields[0], headers='keys', tablefmt='psql'))
-pprint(sessions)
-print(tabulate(result, headers='keys', tablefmt='psql'))
+print(tabulate(result, headers='keys', tablefmt='psql'))
diff --git a/simulations/regression_tests/execs/multi_config_test.py b/simulations/regression_tests/execs/multi_config_test.py
@@ -11,8 +11,7 @@
 local_proc_ctx = ExecutionContext(context=exec_mode.local_mode)
 run = Executor(exec_context=local_proc_ctx, configs=multi_exp.configs)
 
-raw_result, tensor_fields, sessions = run.execute()
+raw_result, tensor_fields, _ = run.execute()
 result = pd.DataFrame(raw_result)
 print(tabulate(tensor_fields[0], headers='keys', tablefmt='psql'))
-# pprint(sessions)
 print(tabulate(result, headers='keys', tablefmt='psql'))
diff --git a/simulations/regression_tests/execs/multi_config_test2.py b/simulations/regression_tests/execs/multi_config_test2.py
@@ -11,8 +11,7 @@
 local_proc_ctx = ExecutionContext(context=exec_mode.local_mode)
 run = Executor(exec_context=local_proc_ctx, configs=multi_exp.configs)
 
-raw_result, tensor_fields, sessions = run.execute()
+raw_result, tensor_fields, _ = run.execute()
 result = pd.DataFrame(raw_result)
 print(tabulate(tensor_fields[0], headers='keys', tablefmt='psql'))
-# pprint(sessions)
 print(tabulate(result, headers='keys', tablefmt='psql'))
diff --git a/simulations/regression_tests/execs/param_sweep_test.py b/simulations/regression_tests/execs/param_sweep_test.py
@@ -10,8 +10,7 @@
 local_proc_ctx = ExecutionContext(context=exec_mode.local_mode)
 run = Executor(exec_context=local_proc_ctx, configs=sweep_config.exp.configs)
 
-raw_result, tensor_fields, sessions = run.execute()
+raw_result, tensor_fields, _ = run.execute()
 result = pd.DataFrame(raw_result)
 print(tabulate(tensor_fields[0], headers='keys', tablefmt='psql'))
-# pprint(sessions)
 print(tabulate(result, headers='keys', tablefmt='psql'))
diff --git a/simulations/regression_tests/execs/policy_agg_test.py b/simulations/regression_tests/execs/policy_agg_test.py
@@ -11,8 +11,7 @@
 local_proc_ctx = ExecutionContext(context=exec_mode.local_mode)
 run = Executor(exec_context=local_proc_ctx, configs=policy_aggregation.exp.configs)
 
-raw_result, tensor_fields, sessions = run.execute()
+raw_result, tensor_fields, _ = run.execute()
 result = pd.DataFrame(raw_result)
 print(tabulate(tensor_fields[0], headers='keys', tablefmt='psql'))
-pprint(sessions)
 print(tabulate(result, headers='keys', tablefmt='psql'))