Merge remote-tracking branch 'origin/devel_refactor2023' into devel_r…

…efactor2023 # Conflicts: # .idea/workspace.xml
SanPen · Jun 23, 2023 · 741305e · 741305e
2 parents a9ff823 + a48fecc
commit 741305e
Show file tree

Hide file tree

Showing 16 changed files with 494 additions and 353 deletions.
diff --git a/examples/ac_linear_opf_ts_run.py b/examples/ac_linear_opf_ts_run.py
@@ -24,10 +24,10 @@
 
 # create the OPF time series instance
 # if non_sequential:
-optimal_power_flow_time_series = OptimalPowerFlowTimeSeries(grid=main_circuit,
-                                                            options=options,
-                                                            start_=start,
-                                                            end_=end)
+optimal_power_flow_time_series = OptimalPowerFlowTimeSeriesDriver(grid=main_circuit,
+                                                                  options=options,
+                                                                  start_=start,
+                                                                  end_=end)
 
 optimal_power_flow_time_series.run()
 

diff --git a/examples/dc_linear_opf_ts.py b/examples/dc_linear_opf_ts.py
@@ -24,10 +24,10 @@
 
 # create the OPF time series instance
 # if non_sequential:
-optimal_power_flow_time_series = OptimalPowerFlowTimeSeries(grid=main_circuit,
-                                                            options=options,
-                                                            start_=start,
-                                                            end_=end)
+optimal_power_flow_time_series = OptimalPowerFlowTimeSeriesDriver(grid=main_circuit,
+                                                                  options=options,
+                                                                  start_=start,
+                                                                  end_=end)
 
 optimal_power_flow_time_series.run()
 

diff --git a/examples/newton_pf_run.py b/examples/newton_pf_run.py
@@ -7,7 +7,7 @@
 
 # _newton_grid = to_newton_pa(circuit=_grid, time_series=False)
 _options = PowerFlowOptions()
-_res = newton_pa_pf(circuit=_grid, opt=_options, time_series=True)
+_res = newton_pa_pf(circuit=_grid, pf_opt=_options, time_series=True)
 
 _res2 = translate_newton_pa_pf_results(_grid, _res)
 

diff --git a/examples/simple_dispatch_run.py b/examples/simple_dispatch_run.py
@@ -22,10 +22,10 @@
 
 # create the OPF time series instance
 # if non_sequential:
-optimal_power_flow_time_series = OptimalPowerFlowTimeSeries(grid=main_circuit,
-                                                            options=options,
-                                                            start_=start,
-                                                            end_=end)
+optimal_power_flow_time_series = OptimalPowerFlowTimeSeriesDriver(grid=main_circuit,
+                                                                  options=options,
+                                                                  start_=start,
+                                                                  end_=end)
 
 optimal_power_flow_time_series.run()