diff --git a/notebooks/barlin/App2_Config6a-temp.ipynb b/notebooks/barlin/App2_Config6a-temp.ipynb index 5ce4711..a7721ad 100644 --- a/notebooks/barlin/App2_Config6a-temp.ipynb +++ b/notebooks/barlin/App2_Config6a-temp.ipynb @@ -23,15 +23,11 @@ "metadata": {}, "outputs": [ { - "ename": "ModuleNotFoundError", - "evalue": "No module named 'SimCAD.configuration'", - "output_type": "error", - "traceback": [ - "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[1;31mModuleNotFoundError\u001b[0m Traceback (most recent call last)", - "\u001b[1;32m\u001b[0m in \u001b[0;36m\u001b[1;34m()\u001b[0m\n\u001b[0;32m 2\u001b[0m \u001b[1;32mfrom\u001b[0m \u001b[0mtabulate\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mtabulate\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 3\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m----> 4\u001b[1;33m \u001b[1;32mfrom\u001b[0m \u001b[0mSimCAD\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mengine\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mExecutionMode\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mExecutionContext\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mExecutor\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 5\u001b[0m \u001b[1;32mfrom\u001b[0m \u001b[0msandbox\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mbarlin\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mconfig6atemp\u001b[0m \u001b[1;31m#, config2\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 6\u001b[0m \u001b[1;32mfrom\u001b[0m \u001b[0mSimCAD\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mconfigs\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;32m~\\AppData\\Local\\Continuum\\anaconda3\\lib\\site-packages\\SimCAD\\__init__.py\u001b[0m in \u001b[0;36m\u001b[1;34m()\u001b[0m\n\u001b[0;32m 1\u001b[0m \u001b[1;32mfrom\u001b[0m \u001b[0mfn\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mop\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mfoldr\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m----> 2\u001b[1;33m \u001b[1;32mfrom\u001b[0m \u001b[0mSimCAD\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mconfiguration\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mutils\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mbehaviorAggregation\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mdict_elemwise_sum\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 3\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 4\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 5\u001b[0m \u001b[0mconfigs\u001b[0m \u001b[1;33m=\u001b[0m \u001b[1;33m[\u001b[0m\u001b[1;33m]\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;31mModuleNotFoundError\u001b[0m: No module named 'SimCAD.configuration'" + "name": "stdout", + "output_type": "stream", + "text": [ + "Simulation Run 1\n", + "single_proc: []\n" ] } ], @@ -84,7 +80,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 2, "metadata": {}, "outputs": [ { @@ -225,7 +221,7 @@ "4 1 2 2018-10-01 15:16:26 " ] }, - "execution_count": 3, + "execution_count": 2, "metadata": {}, "output_type": "execute_result" } diff --git a/sandbox/barlin/config5.py b/sandbox/barlin/config5.py index 4d03f4d..fc007dc 100644 --- a/sandbox/barlin/config5.py +++ b/sandbox/barlin/config5.py @@ -1,8 +1,9 @@ from decimal import Decimal import numpy as np +from datetime import timedelta from SimCAD import Configuration, configs -from SimCAD.utils.configuration import exo_update_per_ts, proc_trigger, bound_norm_random, \ +from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step seed = { diff --git a/sandbox/barlin/config6.py b/sandbox/barlin/config6.py index 959311a..14b325a 100644 --- a/sandbox/barlin/config6.py +++ b/sandbox/barlin/config6.py @@ -1,8 +1,9 @@ from decimal import Decimal import numpy as np +from datetime import timedelta from SimCAD import Configuration, configs -from SimCAD.utils.configuration import exo_update_per_ts, proc_trigger, bound_norm_random, \ +from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step seed = { diff --git a/sandbox/barlin/config6a.py b/sandbox/barlin/config6a.py index 253451b..d213400 100644 --- a/sandbox/barlin/config6a.py +++ b/sandbox/barlin/config6a.py @@ -1,8 +1,9 @@ from decimal import Decimal import numpy as np +from datetime import timedelta from SimCAD import Configuration, configs -from SimCAD.utils.configuration import exo_update_per_ts, proc_trigger, bound_norm_random, \ +from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step seed = {