From 2065287a5b99e05aa8e07b71a36fb7b2bfe4004a Mon Sep 17 00:00:00 2001 From: Markus Date: Thu, 17 Jan 2019 10:22:25 -0200 Subject: [PATCH 1/3] make some arguments of the constructor optional SimCAD can run without seed, exogenous_states and env_processes. Making those arguments optional in the configuration constructor reduces the overhead in the user's configuration file. --- SimCAD/configuration/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SimCAD/configuration/__init__.py b/SimCAD/configuration/__init__.py index 223de64..6709b80 100644 --- a/SimCAD/configuration/__init__.py +++ b/SimCAD/configuration/__init__.py @@ -7,7 +7,7 @@ from SimCAD.configuration.utils.behaviorAggregation import dict_elemwise_sum class Configuration: - def __init__(self, sim_config, state_dict, seed, exogenous_states, env_processes, mechanisms, behavior_ops=[foldr(dict_elemwise_sum())]): + def __init__(self, sim_config, state_dict, mechanisms, seed={}, exogenous_states={}, env_processes={}, behavior_ops=[foldr(dict_elemwise_sum())]): self.sim_config = sim_config self.state_dict = state_dict self.seed = seed From 0e5daaf723a00202272e9244f6a77bc404b1fb2d Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 25 Jan 2019 13:50:22 -0200 Subject: [PATCH 2/3] Revert "make some arguments of the constructor optional" This reverts commit 2065287a5b99e05aa8e07b71a36fb7b2bfe4004a. --- SimCAD/configuration/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SimCAD/configuration/__init__.py b/SimCAD/configuration/__init__.py index 6709b80..223de64 100644 --- a/SimCAD/configuration/__init__.py +++ b/SimCAD/configuration/__init__.py @@ -7,7 +7,7 @@ from SimCAD.configuration.utils.behaviorAggregation import dict_elemwise_sum class Configuration: - def __init__(self, sim_config, state_dict, mechanisms, seed={}, exogenous_states={}, env_processes={}, behavior_ops=[foldr(dict_elemwise_sum())]): + def __init__(self, sim_config, state_dict, seed, exogenous_states, env_processes, mechanisms, behavior_ops=[foldr(dict_elemwise_sum())]): self.sim_config = sim_config self.state_dict = state_dict self.seed = seed From fae948d8859e4f78418917bbfafcc68ca8364e6f Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 25 Jan 2019 14:45:03 -0200 Subject: [PATCH 3/3] make some configuration arguments optional Commit 2065287 would break configuration files that relied on the order of the arguments --- SimCAD/configuration/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SimCAD/configuration/__init__.py b/SimCAD/configuration/__init__.py index 223de64..a10d7ff 100644 --- a/SimCAD/configuration/__init__.py +++ b/SimCAD/configuration/__init__.py @@ -7,7 +7,7 @@ from SimCAD.configuration.utils.behaviorAggregation import dict_elemwise_sum class Configuration: - def __init__(self, sim_config, state_dict, seed, exogenous_states, env_processes, mechanisms, behavior_ops=[foldr(dict_elemwise_sum())]): + def __init__(self, sim_config, state_dict, seed={}, exogenous_states={}, env_processes={}, mechanisms={}, behavior_ops=[foldr(dict_elemwise_sum())]): self.sim_config = sim_config self.state_dict = state_dict self.seed = seed