diff --git a/README.md b/README.md index 6421442..86ce782 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # SimCad - **Warning**: **Do not** publish this package / software to **any** software repository **except** one permitted by BlockScience. diff --git a/SimCAD/__init__.py b/SimCAD/__init__.py index b4234cb..0b7fa28 100644 --- a/SimCAD/__init__.py +++ b/SimCAD/__init__.py @@ -1,2 +1,2 @@ name = "SimCAD" -configs = [] \ No newline at end of file +configs = [] diff --git a/SimCAD/configuration/utils/__init__.py b/SimCAD/configuration/utils/__init__.py index 4077199..53dad43 100644 --- a/SimCAD/configuration/utils/__init__.py +++ b/SimCAD/configuration/utils/__init__.py @@ -18,7 +18,6 @@ class TensorFieldReport: def bound_norm_random(rng, low, high): - # Add RNG Seed res = rng.normal((high+low)/2,(high-low)/6) if (reshigh): res = bound_norm_random(rng, low, high) diff --git a/SimCAD/configuration/utils/behaviorAggregation.py b/SimCAD/configuration/utils/behaviorAggregation.py index 5bcdd1a..5f8b5f6 100644 --- a/SimCAD/configuration/utils/behaviorAggregation.py +++ b/SimCAD/configuration/utils/behaviorAggregation.py @@ -42,4 +42,4 @@ def dict_op(f, d1, d2): def dict_elemwise_sum(): - return dict_op(add) \ No newline at end of file + return dict_op(add) diff --git a/SimCAD/engine/__init__.py b/SimCAD/engine/__init__.py index daa4f01..66a0773 100644 --- a/SimCAD/engine/__init__.py +++ b/SimCAD/engine/__init__.py @@ -11,7 +11,6 @@ class ExecutionMode: multi_proc = 'multi_proc' -# ToDo: switch / rename self.name & context ?? class ExecutionContext: def __init__(self, context=ExecutionMode.multi_proc): self.name = context @@ -43,7 +42,6 @@ class Executor: self.configs = configs self.main = self.execute - def execute(self): config_proc = Processor() create_tensor_field = TensorFieldReport(config_proc).create_tensor_field @@ -64,9 +62,6 @@ class Executor: config_idx += 1 - - # Dimensions: N x r x mechs - if self.exec_context == ExecutionMode.single_proc: tensor_field = create_tensor_field(mechanisms.pop(), eps.pop()) result = self.exec_method(simulation_execs, states_lists, configs_structs, env_processes_list, Ts, Ns) diff --git a/SimCAD/engine/simulation.py b/SimCAD/engine/simulation.py index 519763a..2660d2a 100644 --- a/SimCAD/engine/simulation.py +++ b/SimCAD/engine/simulation.py @@ -69,7 +69,6 @@ class Executor: def block_pipeline(self, states_list, configs, env_processes, time_seq, run): time_seq = [x + 1 for x in time_seq] simulation_list = [states_list] - # print(len(configs)) for time_step in time_seq: pipe_run = self.mech_pipeline(simulation_list[-1], configs, env_processes, time_step, run) _, *pipe_run = pipe_run diff --git a/SimCAD/utils/__init__.py b/SimCAD/utils/__init__.py index 4b67768..720ab6a 100644 --- a/SimCAD/utils/__init__.py +++ b/SimCAD/utils/__init__.py @@ -11,10 +11,6 @@ def flatten(l): return [item for sublist in l for item in sublist] -def flatmap(f, items): - return list(map(f, items)) - - def key_filter(l, keyname): return [v[keyname] for k, v in l.items()]