From e73113754fa2710f1bb131c96275fbced6ab1e6b Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Wed, 13 Feb 2019 16:50:04 -0500 Subject: [PATCH] misc --- SimCAD/configuration/__init__.py | 2 -- SimCAD/configuration/utils/__init__.py | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/SimCAD/configuration/__init__.py b/SimCAD/configuration/__init__.py index ac79325..018a4d7 100644 --- a/SimCAD/configuration/__init__.py +++ b/SimCAD/configuration/__init__.py @@ -3,8 +3,6 @@ from fn.op import foldr import pandas as pd from SimCAD import configs -# from SimCAD.configuration.utils.parameterSweep import ParamSweep - from SimCAD.utils import key_filter from SimCAD.configuration.utils.behaviorAggregation import dict_elemwise_sum from SimCAD.configuration.utils import exo_update_per_ts diff --git a/SimCAD/configuration/utils/__init__.py b/SimCAD/configuration/utils/__init__.py index 68b68ab..797d0da 100644 --- a/SimCAD/configuration/utils/__init__.py +++ b/SimCAD/configuration/utils/__init__.py @@ -4,10 +4,8 @@ from copy import deepcopy from fn.func import curried import pandas as pd -from SimCAD.utils import dict_filter, contains_type, flatten_tabulated_dict, tabulate_dict, curry_pot +from SimCAD.utils import dict_filter, contains_type -# import pprint -# pp = pprint.PrettyPrinter(indent=4) class TensorFieldReport: def __init__(self, config_proc): @@ -45,14 +43,14 @@ def proc_trigger(trigger_step, update_f, step): return lambda x: x -t_delta = timedelta(days=0, minutes=0, seconds=30) +step_t_delta = timedelta(days=0, minutes=0, seconds=30) def time_step(dt_str, dt_format='%Y-%m-%d %H:%M:%S', _timedelta = t_delta): dt = datetime.strptime(dt_str, dt_format) t = dt + _timedelta return t.strftime(dt_format) -t_delta = timedelta(days=0, minutes=0, seconds=1) +ep_t_delta = timedelta(days=0, minutes=0, seconds=1) def ep_time_step(s, dt_str, fromat_str='%Y-%m-%d %H:%M:%S', _timedelta = t_delta): if s['mech_step'] == 0: return time_step(dt_str, fromat_str, _timedelta)