GridCalEngine 5.3.47__tar.gz → 5.3.49__tar.gz

{gridcalengine-5.3.47 → gridcalengine-5.3.49}/GridCalEngine/Devices/assets.py

@@ -793,6 +793,20 @@ class Assets:
         except ValueError:
             pass
 
+    def get_hvdc_dict(self) -> Dict[str, dev.HvdcLine]:
+        """
+        Get dictionary of HVDC lines
+        :return: idtag -> HvdcLine
+        """
+        return {elm.idtag: elm for elm in self.hvdc_lines}
+
+    def get_hvdc_index_dict(self) -> Dict[str, int]:
+        """
+        Get dictionary of HVDC lines
+        :return: idtag -> HvdcLine
+        """
+        return {elm.idtag: i for i, elm in enumerate(self.hvdc_lines)}
+
     # ------------------------------------------------------------------------------------------------------------------
     # VSC
     # ------------------------------------------------------------------------------------------------------------------
@@ -860,6 +874,20 @@ class Assets:
         except ValueError:
             pass
 
+    def get_vsc_dict(self) -> Dict[str, dev.VSC]:
+        """
+        Get dictionary of VSC converters
+        :return: idtag -> VSC
+        """
+        return {elm.idtag: elm for elm in self.vsc_devices}
+
+    def get_vsc_index_dict(self) -> Dict[str, int]:
+        """
+        Get index dictionary of VSC lines
+        :return: idtag -> i
+        """
+        return {elm.idtag: i for i, elm in enumerate(self.vsc_devices)}
+
     # ------------------------------------------------------------------------------------------------------------------
     # UPFC
     # ------------------------------------------------------------------------------------------------------------------
@@ -3872,7 +3900,7 @@ class Assets:
         """
 
         # we initialize with the capex of the group, then we add the capex of the individual investments
-        capex = np.array(elm.CAPEX for elm in self.investments_groups)
+        capex = np.array([elm.CAPEX for elm in self.investments_groups])
 
         # pre-compute the capex of each investment group
         d = self.get_investment_by_groups_index_dict()
@@ -4764,12 +4792,26 @@ class Assets:
         :param add_vsc: Include the list of VSC?
         :param add_hvdc: Include the list of HvdcLine?
         :param add_switch: Include the list of Switch?
-        :return:
+        :return: Branch object to index
         """
         return {b: i for i, b in enumerate(self.get_branches_iter(add_vsc=add_vsc,
                                                                   add_hvdc=add_hvdc,
                                                                   add_switch=add_switch))}
 
+    def get_branches_index_dict2(self, add_vsc: bool = True,
+                                add_hvdc: bool = True,
+                                add_switch: bool = False) -> Dict[str, int]:
+        """
+        Get the branch to index dictionary
+        :param add_vsc: Include the list of VSC?
+        :param add_hvdc: Include the list of HvdcLine?
+        :param add_switch: Include the list of Switch?
+        :return: Branch idtag to index
+        """
+        return {b.idtag: i for i, b in enumerate(self.get_branches_iter(add_vsc=add_vsc,
+                                                                  add_hvdc=add_hvdc,
+                                                                  add_switch=add_switch))}
+
     def get_branches_dict(self, add_vsc: bool = True,
                           add_hvdc: bool = True,
                           add_switch: bool = False) -> Dict[str, int]:

{gridcalengine-5.3.47 → gridcalengine-5.3.49}/GridCalEngine/Simulations/ContingencyAnalysis/Methods/linear_contingency_analysis.py

@@ -57,8 +57,7 @@ def linear_contingency_analysis(grid: MultiCircuit,
                                      distributed_slack=options.lin_options.distribute_slack,
                                      correct_values=options.lin_options.correct_values)
 
-    linear_multiple_contingencies.compute(lodf=linear_analysis.LODF,
-                                          ptdf=linear_analysis.PTDF,
+    linear_multiple_contingencies.compute(lin=linear_analysis,
                                           ptdf_threshold=options.lin_options.ptdf_threshold,
                                           lodf_threshold=options.lin_options.lodf_threshold)
 
@@ -94,7 +93,7 @@ def linear_contingency_analysis(grid: MultiCircuit,
         else:
             injections = None
 
-        c_flow = multi_contingency.get_contingency_flows(base_flow=flows_n, injections=injections)
+        c_flow = multi_contingency.get_contingency_flows(base_branches_flow=flows_n, injections=injections)
         c_loading = c_flow / (nc.passive_branch_data.rates + 1e-9)
 
         results.Sf[ic, :] = c_flow  # already in MW

{gridcalengine-5.3.47 → gridcalengine-5.3.49}/GridCalEngine/Simulations/ContingencyAnalysis/Methods/nonlinear_contingency_analysis.py

@@ -74,8 +74,7 @@ def nonlinear_contingency_analysis(grid: MultiCircuit,
                                          distributed_slack=options.lin_options.distribute_slack,
                                          correct_values=options.lin_options.correct_values)
 
-        linear_multiple_contingencies.compute(lodf=linear_analysis.LODF,
-                                              ptdf=linear_analysis.PTDF,
+        linear_multiple_contingencies.compute(lin=linear_analysis,
                                               ptdf_threshold=options.lin_options.ptdf_threshold,
                                               lodf_threshold=options.lin_options.lodf_threshold)
 

{gridcalengine-5.3.47 → gridcalengine-5.3.49}/GridCalEngine/Simulations/ContingencyAnalysis/Methods/optimal_linear_contingency_analysis.py

@@ -64,8 +64,7 @@ def optimal_linear_contingency_analysis(grid: MultiCircuit,
                                      distributed_slack=options.lin_options.distribute_slack,
                                      correct_values=options.lin_options.correct_values)
 
-    linear_multiple_contingencies.compute(lodf=linear_analysis.LODF,
-                                          ptdf=linear_analysis.PTDF,
+    linear_multiple_contingencies.compute(lin=linear_analysis,
                                           ptdf_threshold=options.lin_options.ptdf_threshold,
                                           lodf_threshold=options.lin_options.lodf_threshold)
 
@@ -121,7 +120,7 @@ def optimal_linear_contingency_analysis(grid: MultiCircuit,
         else:
             injections = None
 
-        c_flow = multi_contingency.get_contingency_flows(base_flow=flows_n, injections=injections)
+        c_flow = multi_contingency.get_contingency_flows(base_branches_flow=flows_n, injections=injections)
         c_loading = c_flow / (nc.passive_branch_data.rates + 1e-9)
 
         results.Sf[ic, :] = c_flow  # already in MW

{gridcalengine-5.3.47 → gridcalengine-5.3.49}/GridCalEngine/Simulations/InvestmentsEvaluation/Problems/adequacy_problem.py

@@ -254,6 +254,7 @@ class AdequacyInvestmentProblem(BlackBoxProblemTemplate):
                 batt_energy_max=self.greedy_dispatch_inputs.batt_energy_max,
                 batt_eff_charge=self.greedy_dispatch_inputs.batt_eff_charge,
                 batt_eff_discharge=self.greedy_dispatch_inputs.batt_eff_discharge,
+                batt_cost=self.greedy_dispatch_inputs.batt_cost,
                 batt_soc0=self.greedy_dispatch_inputs.batt_soc0,
                 batt_soc_min=self.greedy_dispatch_inputs.batt_soc_min,
                 dt=self.greedy_dispatch_inputs.dt,