jeffemmett
/
cadCAD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cadCAD==0.2.1 clean2

This commit is contained in:
Joshua E. Jodesty 2019-03-29 10:57:43 -04:00
parent c9ecf54d0d
commit c05cb7ad05
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simulations/validation/config1.py
View File

@ -79,8 +79,8 @@ def es4p2(_g, step, sL, s, _input):
ts_format = '%Y-%m-%d %H:%M:%S' ts_format = '%Y-%m-%d %H:%M:%S'
t_delta = timedelta(days=0, minutes=0, seconds=1) t_delta = timedelta(days=0, minutes=0, seconds=1)
def es5p2(_g, step, sL, s, _input): def es5p2(_g, step, sL, s, _input):
y = 'timestep' 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) return (y, x)
@ -99,14 +99,14 @@ genesis_states = {
's2': Decimal(0.0), 's2': Decimal(0.0),
's3': Decimal(1.0), 's3': Decimal(1.0),
's4': Decimal(1.0), 's4': Decimal(1.0),
# 'timestep': '2018-10-01 15:16:24' 'timestamp': '2018-10-01 15:16:24'
} }
raw_exogenous_states = { raw_exogenous_states = {
"s3": es3p1, "s3": es3p1,
"s4": es4p2, "s4": es4p2,
# "timestep": es5p2 "timestamp": es5p2
} }

8
simulations/validation/config2.py
View File

@ -77,8 +77,8 @@ def es4p2(_g, step, sL, s, _input):
ts_format = '%Y-%m-%d %H:%M:%S' ts_format = '%Y-%m-%d %H:%M:%S'
t_delta = timedelta(days=0, minutes=0, seconds=1) t_delta = timedelta(days=0, minutes=0, seconds=1)
def es5p2(_g, step, sL, s, _input): def es5p2(_g, step, sL, s, _input):
y = 'timestep' 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) return (y, x)
@ -97,14 +97,14 @@ genesis_states = {
's2': Decimal(0.0), 's2': Decimal(0.0),
's3': Decimal(1.0), 's3': Decimal(1.0),
's4': Decimal(1.0), 's4': Decimal(1.0),
# 'timestep': '2018-10-01 15:16:24' 'timestamp': '2018-10-01 15:16:24'
} }
raw_exogenous_states = { raw_exogenous_states = {
"s3": es3p1, "s3": es3p1,
"s4": es4p2, "s4": es4p2,
# "timestep": es5p2 "timestamp": es5p2
} }

4
simulations/validation/sweep_config.py
View File

@ -95,7 +95,7 @@ ts_format = '%Y-%m-%d %H:%M:%S'
t_delta = timedelta(days=0, minutes=0, seconds=1) t_delta = timedelta(days=0, minutes=0, seconds=1)
def es5p2(_g, step, sL, s, _input): def es5p2(_g, step, sL, s, _input):
y = 'timestamp' 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) return (y, x)
@ -112,6 +112,7 @@ genesis_states = {
's2': Decimal(0.0), 's2': Decimal(0.0),
's3': Decimal(1.0), 's3': Decimal(1.0),
's4': Decimal(1.0), 's4': Decimal(1.0),
'timestamp': '2018-10-01 15:16:24'
} }
@ -119,6 +120,7 @@ genesis_states = {
raw_exogenous_states = { raw_exogenous_states = {
"s3": es3p1, "s3": es3p1,
"s4": es4p2, "s4": es4p2,
'timestamp': es5p2
} }
triggered_env_b = proc_trigger(1, env_b) triggered_env_b = proc_trigger(1, env_b)