Merge pull request #27 from BuildingEnergySimulationTools/corrai_adaptations

New version release
Compatible with corrai 1.0.0 and OMPython 4.0.0

Author: Tesshub

.github/workflows/build.yaml

@@ -14,16 +14,19 @@ jobs:
         include:
           - { name: '3.10', python: '3.10', tox: py310 }
           - { name: '3.11', python: '3.11', tox: py311 }
+          - { name: '3.12', python: '3.12', tox: py312 }
           - { name: 'min', python: '3.10', tox: min }
     steps:
       - name: "Set up OpenModelica Compiler"
-        uses: OpenModelica/setup-openmodelica@v1.0
+        uses: OpenModelica/setup-openmodelica@v1.0.5
         with:
-          version: 'stable'
+          version: '1.25.4'
           packages: |
-            omc
+            'omc'
+            'omsimulator'
           libraries: |
             'Modelica 4.0.0'
+            'Modelica 3.2.3+maint.om'
 
       - run: "omc --version"
       - uses: actions/checkout@v4
@@ -47,7 +50,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install pypa/build
         run: python -m pip install build
       - name: Build a binary wheel and a source tarball
@@ -70,7 +73,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - run: python -m pip install tox
       - run: python -m tox -e lint
   publish-to-pypi:

modelitool/combitabconvert.py

@@ -1,4 +1,5 @@
 import datetime as dt
+from pathlib import Path
 
 import pandas as pd
 
@@ -33,7 +34,7 @@ def get_dymo_time_index(df):
     return list(pd.Series(sec_dt).cumsum())
 
 
-def df_to_combitimetable(df, filename):
+def write_combitt_from_df(df: pd.DataFrame, file_path: Path | str):
     """
     Write a text file compatible with modelica Combitimetables object from a
     Pandas DataFrame with a DatetimeIndex. DataFrames with non monotonically increasing
@@ -45,18 +46,15 @@ def df_to_combitimetable(df, filename):
     """
     if not isinstance(df, pd.DataFrame):
         raise ValueError(f"df must be an instance of pandas DataFrame. Got {type(df)}")
-    if not isinstance(df.index, pd.DatetimeIndex):
-        raise ValueError(
-            f"DataFrame index must be an instance of DatetimeIndex. " f"Got {type(df)}"
-        )
+
     if not df.index.is_monotonic_increasing:
         raise ValueError(
             "df DateTimeIndex is not monotonically increasing, this will"
             "cause Modelica to crash."
         )
 
     df = df.copy()
-    with open(filename, "w") as file:
+    with open(file_path, "w") as file:
         file.write("#1 \n")
         line = ""
         line += f"double table1({df.shape[0]}, {df.shape[1] + 1})\n"
@@ -65,6 +63,7 @@ def df_to_combitimetable(df, filename):
             line += f"\t({i + 1}){col}"
         file.write(f"{line} \n")
 
-        df.index = datetime_to_seconds(df.index)
+        if isinstance(df.index, pd.DatetimeIndex):
+            df.index = datetime_to_seconds(df.index)
 
         file.write(df.to_csv(header=False, sep="\t", lineterminator="\n"))