GridCalEngine 5.1.41__tar.gz → 5.1.42__tar.gz

{GridCalEngine-5.1.41 → GridCalEngine-5.1.42}/GridCalEngine/Compilers/circuit_to_newton_pa.py

@@ -1257,11 +1257,11 @@ def get_newton_pa_linear_opf_options(opf_opt: OptimalPowerFlowOptions,
     opt.use_ramp_constraints = False
     opt.lodf_threshold = opf_opt.lodf_tolerance
 
-    if opf_opt.aggregations_from is not None:
-        opt.areas_from = [area_dict[e] for e in opf_opt.aggregations_from]
-
-    if opf_opt.aggregations_to is not None:
-        opt.areas_to = [area_dict[e] for e in opf_opt.aggregations_to]
+    # if opf_opt.aggregations_from is not None:
+    #     opt.areas_from = [area_dict[e] for e in opf_opt.aggregations_from]
+    #
+    # if opf_opt.aggregations_to is not None:
+    #     opt.areas_to = [area_dict[e] for e in opf_opt.aggregations_to]
 
     return opt
 

{GridCalEngine-5.1.41 → GridCalEngine-5.1.42}/GridCalEngine/IO/gridcal/remote.py

@@ -206,7 +206,7 @@ def gather_model_as_jsons_for_communication(circuit: MultiCircuit,
     return data
 
 
-def send_json_data(json_data: Dict[str, Union[str, Dict[str, Dict[str, str]]]],
+async def send_json_data(json_data: Dict[str, Union[str, Dict[str, Dict[str, str]]]],
                    endpoint_url: str,
                    certificate: str) -> Any:
     """
@@ -217,13 +217,11 @@ def send_json_data(json_data: Dict[str, Union[str, Dict[str, Dict[str, str]]]],
     :return service response
     """
 
-    response = asyncio.get_event_loop().run_until_complete(
-        requests.post(
-            url=endpoint_url,
-            json=json_data,
-            stream=True,
-            verify=certificate
-        )
+    response = requests.post(
+        url=endpoint_url,
+        json=json_data,
+        stream=True,
+        verify=certificate
     )
 
     # return server response

{GridCalEngine-5.1.41 → GridCalEngine-5.1.42}/GridCalEngine/Simulations/LinearFactors/linear_analysis_ts_driver.py

@@ -103,13 +103,10 @@ class LinearAnalysisTimeSeriesDriver(TimeSeriesDriverTemplate):
 
             driver_.run()
 
-            # Sf = driver_.get_flows(Sbus=Pbus[time_indices_, :])
-
-            self.results.S[it, :] = nc.Sbus
-            self.results.Sf[it, :] = driver_.get_flows(Sbus=nc.Sbus)
+            self.results.S[it, :] = nc.Sbus * nc.Sbase
+            self.results.Sf[it, :] = driver_.get_flows(Sbus=nc.Sbus) * nc.Sbase
 
         rates = self.grid.get_branch_rates_wo_hvdc()
         self.results.loading = self.results.Sf / (rates + 1e-9)
-        # self.results.S = Pbus[self.time_indices, :]
 
         self.toc()

{GridCalEngine-5.1.41 → GridCalEngine-5.1.42}/GridCalEngine/Simulations/LinearFactors/linear_analysis_ts_results.py

@@ -135,10 +135,17 @@ class LinearAnalysisTimeSeriesResults(ResultsTemplate):
             )
 
         elif result_type == ResultTypes.BranchActivePowerFrom:
-            labels = self.branch_names
-            data = self.Sf.real
-            y_label = '(MW)'
-            title = 'Branch power '
+
+            return ResultsTable(
+                data=self.Sf.real,
+                index=self.time_array,
+                idx_device_type=DeviceType.TimeDevice,
+                columns=self.branch_names,
+                cols_device_type=DeviceType.BranchDevice,
+                title=result_type.value,
+                ylabel='(MW)',
+                units='(MW)'
+            )
 
         elif result_type == ResultTypes.BranchLoading:
 

{GridCalEngine-5.1.41 → GridCalEngine-5.1.42}/GridCalEngine/Simulations/OPF/opf_ts_results.py

@@ -106,7 +106,7 @@ class OptimalPowerFlowTimeSeriesResults(ResultsTemplate):
 
                                                     ResultTypes.LoadResults: [ResultTypes.LoadShedding],
 
-                                                    ResultTypes.BranchResults: [ResultTypes.BranchPower,
+                                                    ResultTypes.BranchResults: [ResultTypes.BranchActivePowerFrom,
                                                                                 ResultTypes.BranchLoading,
                                                                                 ResultTypes.BranchOverloads,
                                                                                 ResultTypes.BranchTapAngle],
@@ -363,7 +363,7 @@ class OptimalPowerFlowTimeSeriesResults(ResultsTemplate):
                                 xlabel='',
                                 units='(MW)')
 
-        elif result_type == ResultTypes.BranchPower:
+        elif result_type == ResultTypes.BranchActivePowerFrom:
 
             return ResultsTable(data=self.Sf.real,
                                 index=pd.to_datetime(self.time_array),

{GridCalEngine-5.1.41 → GridCalEngine-5.1.42}/GridCalEngine/Utils/MIP/ortools_interface.py

@@ -42,7 +42,7 @@ def get_available_mip_solvers() -> List[str]:
     Get a list of candidate solvers
     :return:
     """
-    candidates = ['SCIP', 'CBC', 'CPLEX', 'GUROBI', 'XPRESS', 'HIGHS', 'GLOP']
+    candidates = ['SCIP', 'CBC', 'CPLEX', 'GUROBI', 'XPRESS', 'HIGHS', 'GLOP', 'PDLP']
     res = list()
     for c in candidates:
         solver = ort.Solver.CreateSolver(c)

{GridCalEngine-5.1.41 → GridCalEngine-5.1.42}/GridCalEngine/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.1.41"
+__GridCalEngine_VERSION__ = "5.1.42"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.1.41 → GridCalEngine-5.1.42}/GridCalEngine/enumerations.py

@@ -444,6 +444,7 @@ class MIPSolvers(Enum):
     CPLEX = 'CPLEX'
     GUROBI = 'GUROBI'
     XPRESS = 'XPRESS'
+    PDLP = 'PDLP'
 
     def __str__(self):
         return self.value

{GridCalEngine-5.1.41 → GridCalEngine-5.1.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.1.41
+Version: 5.1.42
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.