fixed depreciation pandas fc index

LBNL-ETA · Apr 6, 2024 · 35c44ef · 35c44ef
1 parent 49691cf
commit 35c44ef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/afc/optModel.py b/afc/optModel.py
@@ -35,7 +35,7 @@ def control_model(inputs, parameter):
 
     inputs = inputs.copy(deep=True)
     if isinstance(inputs.index[0], type(pd.to_datetime(0))):
-        inputs.index = inputs.index.astype(int)/1e9 # Convert datetime to UNIX
+        inputs.index = inputs.index.astype('int64').astype(int)/1e9 # Convert datetime to UNIX
 
     model.fzones = Set(initialize=parameter['facade']['windows'], doc='window zones')
     model.fstates = Set(initialize=parameter['facade']['states'], doc='facade states')

diff --git a/dev/Development-Controller.ipynb b/dev/Development-Controller.ipynb
@@ -136,7 +136,7 @@
     "\n",
     "    inputs = inputs.copy(deep=True)\n",
     "    if isinstance(inputs.index[0], type(pd.to_datetime(0))):\n",
-    "        inputs.index = inputs.index.astype(int)/1e9 # Convert datetime to UNIX\n",
+    "        inputs.index = inputs.index.astype('int64').astype(int)/1e9 # Convert datetime to UNIX\n",
     "\n",
     "    model.fzones = Set(initialize=parameter['facade']['windows'], doc='window zones')\n",
     "    model.fstates = Set(initialize=parameter['facade']['states'], doc='facade states')\n",

diff --git a/dev/Development-ControllerWrapper.ipynb b/dev/Development-ControllerWrapper.ipynb
@@ -66,9 +66,9 @@
       "CO2 Emissions [kg]\t\t0.0\n",
       "\n",
       "Duration:\n",
-      " {'duration': {'radiance': 30.29151749610901, 'glare': 69.52729845046997, 'varts': 0.13071012496948242, 'optall': 0.5158815383911133, 'outputs': 0.0016393661499023438, 'all': 104.46238040924072}}\n",
+      " {'duration': {'radiance': 30.415552616119385, 'glare': 2.1435093879699707, 'varts': 0.13152146339416504, 'optall': 0.5150332450866699, 'outputs': 0.0015900135040283203, 'all': 37.19069528579712}}\n",
       "Optimization:\n",
-      " {'opt-stats': {'duration': 0.2025301456451416, 'termination': 'optimal', 'objective': 20.28974844}}\n"
+      " {'opt-stats': {'duration': 0.20344018936157227, 'termination': 'optimal', 'objective': 20.28974844}}\n"
      ]
     },
     {