Ruff.

NREL · May 7, 2024 · 5d58a19 · 5d58a19
1 parent b173cf1
commit 5d58a19
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/examples/simple_hybrid_plant/hercules_runscript_windsolarstorage.py b/examples/simple_hybrid_plant/hercules_runscript_windsolarstorage.py
@@ -18,10 +18,10 @@
 from hercules.py_sims import PySims
 from hercules.utilities import load_yaml
 from whoc.controllers import (
+    BatteryPassthroughController,
     HybridSupervisoryControllerSkeleton,
+    SolarPassthroughController,
     WindFarmPowerTrackingController,
-    BatteryPassthroughController,
-    SolarPassthroughController
 )
 from whoc.interfaces.hercules_hybrid_actuator_disk_interface import HerculesHybridADInterface
 

diff --git a/tests/interface_library_test.py b/tests/interface_library_test.py
@@ -13,10 +13,7 @@
 # See https://nrel.github.io/wind-hybrid-open-controller for documentation
 
 import pytest
-from whoc.interfaces import (
-    HerculesADInterface,
-    HerculesWindBatteryInterface,
-)
+from whoc.interfaces import HerculesADInterface, HerculesWindBatteryInterface
 
 test_hercules_dict = {
     "dt": 1,

diff --git a/whoc/controllers/__init__.py b/whoc/controllers/__init__.py
@@ -1,10 +1,10 @@
+from whoc.controllers.battery_passthrough_controller import BatteryPassthroughController
 from whoc.controllers.hybrid_supervisory_controller import HybridSupervisoryControllerSkeleton
 from whoc.controllers.lookup_based_wake_steering_controller import LookupBasedWakeSteeringController
+from whoc.controllers.solar_passthrough_controller import SolarPassthroughController
 from whoc.controllers.wake_steering_rosco_standin import WakeSteeringROSCOStandin
 from whoc.controllers.wind_battery_controller import WindBatteryController
 from whoc.controllers.wind_farm_power_tracking_controller import (
     WindFarmPowerDistributingController,
     WindFarmPowerTrackingController,
 )
-from whoc.controllers.battery_passthrough_controller import BatteryPassthroughController
-from whoc.controllers.solar_passthrough_controller import SolarPassthroughController
diff --git a/whoc/controllers/battery_passthrough_controller.py b/whoc/controllers/battery_passthrough_controller.py
@@ -12,7 +12,6 @@
 
 # See https://nrel.github.io/wind-hybrid-open-controller for documentation
 
-import numpy as np
 
 from whoc.controllers.controller_base import ControllerBase
 

diff --git a/whoc/controllers/hybrid_supervisory_controller.py b/whoc/controllers/hybrid_supervisory_controller.py
@@ -15,7 +15,7 @@
 import numpy as np
 
 from whoc.controllers.controller_base import ControllerBase
-from whoc.controllers.wind_farm_power_tracking_controller import WindFarmPowerTrackingController
+
 
 class HybridSupervisoryControllerSkeleton(ControllerBase):
     def __init__(

diff --git a/whoc/controllers/solar_passthrough_controller.py b/whoc/controllers/solar_passthrough_controller.py
@@ -12,7 +12,6 @@
 
 # See https://nrel.github.io/wind-hybrid-open-controller for documentation
 
-import numpy as np
 
 from whoc.controllers.controller_base import ControllerBase
 

diff --git a/whoc/interfaces/hercules_hybrid_actuator_disk_interface.py b/whoc/interfaces/hercules_hybrid_actuator_disk_interface.py
@@ -33,7 +33,9 @@ def __init__(self, hercules_dict):
         self.battery_name = [ps for ps in py_sims if "battery" in ps][0]
 
     def get_measurements(self, hercules_dict):
-        turbine_powers = hercules_dict["hercules_comms"]["amr_wind"][self.wind_name]["turbine_powers"]
+        turbine_powers = (
+            hercules_dict["hercules_comms"]["amr_wind"][self.wind_name]["turbine_powers"]
+        )
         time = hercules_dict["time"]
 
         if ("external_signals" in hercules_dict
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,7 +12,6 @@

		# See https://nrel.github.io/wind-hybrid-open-controller for documentation

		import numpy as np

		from whoc.controllers.controller_base import ControllerBase

Expand Down