formatting.

misi9170 · Oct 16, 2024 · 4101f8f · 4101f8f
1 parent 5636071
commit 4101f8f
Show file tree

Hide file tree

Showing 6 changed files with 1,096 additions and 1,090 deletions.
diff --git a/examples_artificial_data/01_raw_data_processing/00_filter_ws_power_curves.ipynb b/examples_artificial_data/01_raw_data_processing/00_filter_ws_power_curves.ipynb
diff --git a/examples_artificial_data/04_floris_tuning/00_tune_floris_to_artificial_data.ipynb b/examples_artificial_data/04_floris_tuning/00_tune_floris_to_artificial_data.ipynb
diff --git a/examples_smarteole/02_download_and_format_dataset.ipynb b/examples_smarteole/02_download_and_format_dataset.ipynb
diff --git a/examples_smarteole/09_wind-up_wake_steering_uplift_analysis.ipynb b/examples_smarteole/09_wind-up_wake_steering_uplift_analysis.ipynb
@@ -350,7 +350,6 @@
     "    f = root_path / \"postprocessed\" / \"df_scada_data_60s_filtered_and_northing_calibrated.pkl\"\n",
     "    df_scada = pd.read_pickle(f)\n",
     "\n",
-    "\n",
     "    if timebase_s != 60:\n",
     "        import flasc.data_processing.time_operations as fto\n",
     "\n",

diff --git a/flasc/flasc_dataframe.py b/flasc/flasc_dataframe.py
@@ -47,7 +47,7 @@ def __init__(self, *args, channel_name_map=None, long_data_columns=None, **kwarg
         super().__init__(*args, **kwargs)
 
         # Check that the time column is present
-        #if "time" not in self.columns:
+        # if "time" not in self.columns:
         #    raise ValueError("Column 'time' must be present in the DataFrame")
 
         # check that name_map dictionary is valid
@@ -83,19 +83,21 @@ def in_flasc_format(self):
             return True
         else:
             return False
-        
+
     @property
     def channel_name_map(self):
         """Return the channel_name_map attribute."""
         return self._channel_name_map
-    
+
     @channel_name_map.setter
     def channel_name_map(self, value):
         """Set the channel_name_map attribute."""
         self._channel_name_map = value
         # Save the reversed name_map (to go to user_format)
         self._channel_name_map_to_user = (
-            {v: k for k, v in self._channel_name_map.items()} if self._channel_name_map is not None else None
+            {v: k for k, v in self._channel_name_map.items()}
+            if self._channel_name_map is not None
+            else None
         )
 
     @property
@@ -133,7 +135,7 @@ def check_flasc_format(self):
 
     def copy_metadata(self, other):
         """Copy metadata from another FlascDataFrame to self.
-        
+
         Args:
             other (FlascDataFrame): DataFrame to copy metadata from.
         """
@@ -190,10 +192,9 @@ def convert_time_to_datetime(self, inplace=False):
             FlascDataFrame: FlascDataFrame with time column as datetime object if inplace is False,
             None otherwise
         """
-
         if "time" not in self.columns:
             raise KeyError("Column 'time' must be present in the DataFrame")
-        
+
         if inplace:
             self["time"] = pd.to_datetime(self["time"])
         else:

diff --git a/tests/flasc_dataframe_test.py b/tests/flasc_dataframe_test.py
@@ -107,12 +107,13 @@ def test_printout():
     # print("\n")
 
 
-def test_time_required():
-    # Check that the time column is present
-    with pytest.raises(ValueError):
-        FlascDataFrame(
-            {"pow_000": [0, 100, 200], "ws_000": [8, 8, 8]}, channel_name_map=test_channel_name_map
-        )
+# def test_time_required():
+#     # Check that the time column is present
+#     with pytest.raises(ValueError):
+#         FlascDataFrame(
+#             {"pow_000": [0, 100, 200], "ws_000": [8, 8, 8]},
+#             channel_name_map=test_channel_name_map
+#         )
 
 
 def test_check_flasc_format():