From 588d62331aa39df88ada4904c585fbe440f542a4 Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Wed, 5 Dec 2018 17:18:05 -0500 Subject: [PATCH] readme --- .gitignore | 3 ++- README.md | 25 ++++++++++++++++--------- SimCAD/configuration/__init__.py | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index f16b75a..75d13dc 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ __pycache__ Pipfile Pipfile.lock scrapbox/ -results/ \ No newline at end of file +results/ +.mypy_cache/ \ No newline at end of file diff --git a/README.md b/README.md index 62608a1..0630e5f 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ pip install -r requirements.txt **Project:** Example Runs: -`/DiffyQ-SimCAD/sandboxUX/sim_test.py` +`/simulations/sim_test.py` Example Configurations: -`/DiffyQ-SimCAD/sandboxUX/connfig#.py` +`/simulations/validation/` **User Interface: Simulation Configuration** @@ -44,26 +44,33 @@ from SimCAD import configs exec_mode = ExecutionMode() -print("Simulation Run 1") +print("Simulation Execution 1") print() first_config = [configs[0]] # from config1 single_proc_ctx = ExecutionContext(context=exec_mode.single_proc) run1 = Executor(exec_context=single_proc_ctx, configs=first_config) -run1_raw_result = run1.main() +run1_raw_result, tensor_field = run1.main() result = pd.DataFrame(run1_raw_result) -# result.to_csv('~/Projects/DiffyQ-SimCAD/results/config4csv', sep=',') +# result.to_csv('~/Projects/DiffyQ-SimCAD/results/config4.csv', sep=',') +print() +print("Tensor Field:") +print(tabulate(tensor_field, headers='keys', tablefmt='psql')) +print("Output:") print(tabulate(result, headers='keys', tablefmt='psql')) print() -print("Simulation Run 2: Pairwise Execution") +print("Simulation Execution 2: Pairwise Execution") print() multi_proc_ctx = ExecutionContext(context=exec_mode.multi_proc) run2 = Executor(exec_context=multi_proc_ctx, configs=configs) -run2_raw_results = run2.main() -for raw_result in run2_raw_results: +for raw_result, tensor_field in run2.main(): result = pd.DataFrame(raw_result) + print() + print("Tensor Field:") + print(tabulate(tensor_field, headers='keys', tablefmt='psql')) + print("Output:") print(tabulate(result, headers='keys', tablefmt='psql')) -print() + print() ``` Same can be run in Jupyter . diff --git a/SimCAD/configuration/__init__.py b/SimCAD/configuration/__init__.py index b9befca..0af1af7 100644 --- a/SimCAD/configuration/__init__.py +++ b/SimCAD/configuration/__init__.py @@ -18,7 +18,7 @@ class Configuration: class Identity: - def __init__(self, behavior_id={'indentity': 0}): + def __init__(self, behavior_id={'identity': 0}): self.beh_id_return_val = behavior_id def b_identity(self, step, sL, s):