diff --git a/simulations/validation/config1.py b/simulations/validation/config1.py index d2a8f2b..1a98822 100644 --- a/simulations/validation/config1.py +++ b/simulations/validation/config1.py @@ -79,8 +79,8 @@ def es4p2(_g, step, sL, s, _input): ts_format = '%Y-%m-%d %H:%M:%S' t_delta = timedelta(days=0, minutes=0, seconds=1) def es5p2(_g, step, sL, s, _input): - y = 'timestep' - x = ep_time_step(s, dt_str=s['timestep'], fromat_str=ts_format, _timedelta=t_delta) + y = 'timestamp' + x = ep_time_step(s, dt_str=s['timestamp'], fromat_str=ts_format, _timedelta=t_delta) return (y, x) @@ -99,14 +99,14 @@ genesis_states = { 's2': Decimal(0.0), 's3': Decimal(1.0), 's4': Decimal(1.0), -# 'timestep': '2018-10-01 15:16:24' + 'timestamp': '2018-10-01 15:16:24' } raw_exogenous_states = { "s3": es3p1, "s4": es4p2, -# "timestep": es5p2 + "timestamp": es5p2 } diff --git a/simulations/validation/config2.py b/simulations/validation/config2.py index 80adcb5..ebba912 100644 --- a/simulations/validation/config2.py +++ b/simulations/validation/config2.py @@ -77,8 +77,8 @@ def es4p2(_g, step, sL, s, _input): ts_format = '%Y-%m-%d %H:%M:%S' t_delta = timedelta(days=0, minutes=0, seconds=1) def es5p2(_g, step, sL, s, _input): - y = 'timestep' - x = ep_time_step(s, dt_str=s['timestep'], fromat_str=ts_format, _timedelta=t_delta) + y = 'timestamp' + x = ep_time_step(s, dt_str=s['timestamp'], fromat_str=ts_format, _timedelta=t_delta) return (y, x) @@ -97,14 +97,14 @@ genesis_states = { 's2': Decimal(0.0), 's3': Decimal(1.0), 's4': Decimal(1.0), -# 'timestep': '2018-10-01 15:16:24' + 'timestamp': '2018-10-01 15:16:24' } raw_exogenous_states = { "s3": es3p1, "s4": es4p2, -# "timestep": es5p2 + "timestamp": es5p2 } diff --git a/simulations/validation/sweep_config.py b/simulations/validation/sweep_config.py index c9c92ab..04f5698 100644 --- a/simulations/validation/sweep_config.py +++ b/simulations/validation/sweep_config.py @@ -95,7 +95,7 @@ ts_format = '%Y-%m-%d %H:%M:%S' t_delta = timedelta(days=0, minutes=0, seconds=1) def es5p2(_g, step, sL, s, _input): y = 'timestamp' - x = ep_time_step(s, dt_str=s['timestep'], fromat_str=ts_format, _timedelta=t_delta) + x = ep_time_step(s, dt_str=s['timestamp'], fromat_str=ts_format, _timedelta=t_delta) return (y, x) @@ -112,6 +112,7 @@ genesis_states = { 's2': Decimal(0.0), 's3': Decimal(1.0), 's4': Decimal(1.0), + 'timestamp': '2018-10-01 15:16:24' } @@ -119,6 +120,7 @@ genesis_states = { raw_exogenous_states = { "s3": es3p1, "s4": es4p2, + 'timestamp': es5p2 } triggered_env_b = proc_trigger(1, env_b)