adjusted package and tests

dos-group · May 26, 2024 · e5ba7c5 · e5ba7c5
1 parent efaf37b
commit e5ba7c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/tests/test_consumer.py b/tests/test_consumer.py
@@ -10,9 +10,9 @@ def computing_system(self) -> vs.ComputingSystem:
         return vs.ComputingSystem(
             name="test_comp",
             step_size=60,
-            power_meters=[
-                vs.MockPowerMeter(name="test1", p=5.0),
-                vs.MockPowerMeter(name="test2", p=7.0),
+            nodes=[
+                vs.MockPowerConsumer(name="test1", p=5.0),
+                vs.MockPowerConsumer(name="test2", p=7.0),
             ],
             pue=1.5,
         )
@@ -23,5 +23,5 @@ def test_p(self, computing_system):
     def test_state(self, computing_system):
         assert computing_system.state(datetime.now()) == {
             "p": -18.0,
-            "power_meters": {"test1": -5.0, "test2": -7.0},
+            "nodes": {"test1": -5.0, "test2": -7.0},
         }
diff --git a/vessim/__init__.py b/vessim/__init__.py
@@ -1,24 +1,21 @@
 """A simulator for carbon-aware applications and systems."""
-from vessim.actor import Actor, ComputingSystem, Generator
+from vessim.actor import Actor, ComputingSystem
 from vessim.controller import Controller, Monitor
 from vessim.cosim import Microgrid, Environment
 from vessim.policy import MicrogridPolicy, DefaultMicrogridPolicy
-from vessim.power_meter import PowerMeter, MockPowerMeter
-from vessim.signal import Signal, HistoricalSignal
+from vessim.signal import Signal, HistoricalSignal, MockPowerConsumer
 from vessim.storage import Storage, SimpleBattery
 
 __all__ = [
     "Actor",
     "ComputingSystem",
-    "Generator",
     "Controller",
     "Monitor",
     "Microgrid",
     "Environment",
     "MicrogridPolicy",
     "DefaultMicrogridPolicy",
-    "PowerMeter",
-    "MockPowerMeter",
+    "MockPowerConsumer",
     "Signal",
     "HistoricalSignal",
     "Storage",