Merge branch 'main' into line_by_line_monitoring

dos-group · Jun 21, 2024 · 92863fc · 92863fc
2 parents 48c8d87 + 3497395
commit 92863fc
Show file tree

Hide file tree

Showing 15 changed files with 829 additions and 1,037 deletions.
diff --git a/README.md b/README.md
@@ -30,8 +30,8 @@ environment = vs.Environment(sim_start="15-06-2022")
 monitor = vs.Monitor()
 environment.add_microgrid(
     actors=[
-        vs.ComputingSystem(power_meters=[vs.MockPowerMeter(p=400)]),
-        vs.Generator(signal=vs.HistoricalSignal.from_dataset("solcast2022_global"), column="Berlin"),
+        vs.ComputingSystem(nodes=[vs.MockSignal(p=400)]),
+        vs.Actor(signal=vs.HistoricalSignal.load("solcast2022_global", column="Berlin")),
     ],
     controllers=[monitor],
     storage=vs.SimpleBattery(capacity=100),

diff --git a/examples/basic_example.ipynb b/examples/basic_example.ipynb
diff --git a/examples/controller_example.ipynb b/examples/controller_example.ipynb
diff --git a/examples/signal_example.ipynb b/examples/signal_example.ipynb
@@ -67,7 +67,7 @@
     }
    ],
    "source": [
-    "signal.at(\"2020-01-01T00:00:00\", column=\"solar\")"
+    "signal.now(at=\"2020-01-01T00:00:00\", column=\"solar\")"
    ]
   },
   {
@@ -156,8 +156,8 @@
     }
    ],
    "source": [
-    "dataset_signal = vs.HistoricalSignal.from_dataset(\"solcast2022_global\", params={\"scale\": 2.0, \"start_time\":\"2020-06-12T00:00:00\"})\n",
-    "dataset_signal.at(\"2020-06-27T13:46:53\", column=\"Berlin\")"
+    "dataset_signal = vs.HistoricalSignal.load(\"solcast2022_global\", params={\"scale\": 2.0, \"start_time\":\"2020-06-12T00:00:00\"})\n",
+    "dataset_signal.now(at=\"2020-06-27T13:46:53\", column=\"Berlin\")"
    ]
   },
   {
@@ -184,7 +184,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.2"
+   "version": "3.8.19"
   }
  },
  "nbformat": 4,