From fc655d37415d8ae76784b7fd1506d335e38b0fbb Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Thu, 22 Aug 2019 18:32:40 -0400 Subject: [PATCH 1/4] added liscence and authors --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2e4e086..fa523e1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ Pipfile.lock results .mypy_cache *.csv -*.txt simulations/.ipynb_checkpoints simulations/validation/config3.py cadCAD.egg-info From 342f3a519c22dc43d29800674db6560b10bbcb1c Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Thu, 22 Aug 2019 18:33:17 -0400 Subject: [PATCH 2/4] added liscence and authors --- AUTHORS.txt | 28 ++++++++++++++++++++++++++++ LICENSE.txt | 21 +++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 AUTHORS.txt create mode 100644 LICENSE.txt diff --git a/AUTHORS.txt b/AUTHORS.txt new file mode 100644 index 0000000..0767b64 --- /dev/null +++ b/AUTHORS.txt @@ -0,0 +1,28 @@ +Authors +======= + +cadCAD was originally implemented by Joshua E. Jodesty and designed by Michael Zargham, Markus B. Koch, and +Matthew Barlin from 2018 to 2019. + +Project Maintainers: +- Joshua E. Jodesty +- Markus B. Koch + +Contributors: +- Joshua E. Jodesty +- Markus B. Koch +- Matthew Barlin +- Michael Zargham +- Zixuan Zhang + + + +We’d also like to thank: +- Andrew Clark +- Nikhil Jamdade +- Nick Hirannet +- Harry Goodnight +- Charlie Hoppes +- Jonathan Gabler +- Charles Rice + diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..31326fb --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018-2019 BlockScience + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file From ac6e6eebda7d7ee432c41e2c2ea683697cb9df55 Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Thu, 22 Aug 2019 18:55:44 -0400 Subject: [PATCH 3/4] kudos xd pt 2 --- AUTHORS.txt | 3 ++- cadCAD/engine/__init__.py | 15 +++++++++++++-- cadCAD/engine/simulation.py | 4 ---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index 0767b64..ae68b63 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -4,10 +4,12 @@ Authors cadCAD was originally implemented by Joshua E. Jodesty and designed by Michael Zargham, Markus B. Koch, and Matthew Barlin from 2018 to 2019. + Project Maintainers: - Joshua E. Jodesty - Markus B. Koch + Contributors: - Joshua E. Jodesty - Markus B. Koch @@ -16,7 +18,6 @@ Contributors: - Zixuan Zhang - We’d also like to thank: - Andrew Clark - Nikhil Jamdade diff --git a/cadCAD/engine/__init__.py b/cadCAD/engine/__init__.py index 8147f5f..c236faa 100644 --- a/cadCAD/engine/__init__.py +++ b/cadCAD/engine/__init__.py @@ -70,11 +70,22 @@ class Executor: config_proc = Processor() create_tensor_field = TensorFieldReport(config_proc).create_tensor_field - print(self.exec_context+": "+str(self.configs)) + + print(r''' + __________ ____ + ________ __ _____/ ____/ | / __ \ + / ___/ __` / __ / / / /| | / / / / + / /__/ /_/ / /_/ / /___/ ___ |/ /_/ / + \___/\__,_/\__,_/\____/_/ |_/_____/ + by BlockScience + ''') + print(f'Execution Mode: {self.exec_context + ": " + str(self.configs)}') + print(f'Configurations: {self.configs}') + var_dict_list, states_lists, Ts, Ns, eps, configs_structs, env_processes_list, partial_state_updates, simulation_execs = \ [], [], [], [], [], [], [], [], [] config_idx = 0 - print(self.configs) + for x in self.configs: Ts.append(x.sim_config['T']) diff --git a/cadCAD/engine/simulation.py b/cadCAD/engine/simulation.py index c5818a4..32e9c5b 100644 --- a/cadCAD/engine/simulation.py +++ b/cadCAD/engine/simulation.py @@ -1,4 +1,3 @@ -from pprint import pprint from typing import Any, Callable, Dict, List, Tuple from pathos.pools import ThreadPool as TPool from copy import deepcopy @@ -170,9 +169,6 @@ class Executor: time_step += 1 - pprint(states_list) - print() - return states_list # state_update_pipeline From 6489a75f1e5a3118648dce47654b7877a7990c05 Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Thu, 22 Aug 2019 19:49:09 -0400 Subject: [PATCH 4/4] opp cp --- AUTHORS.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index ae68b63..e2aaf63 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -2,7 +2,7 @@ Authors ======= cadCAD was originally implemented by Joshua E. Jodesty and designed by Michael Zargham, Markus B. Koch, and -Matthew Barlin from 2018 to 2019. +Matthew V. Barlin from 2018 to 2019. Project Maintainers: @@ -13,7 +13,7 @@ Project Maintainers: Contributors: - Joshua E. Jodesty - Markus B. Koch -- Matthew Barlin +- Matthew V. Barlin - Michael Zargham - Zixuan Zhang