GridCalEngine 5.3.49__tar.gz → 5.3.51__tar.gz

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/Devices/Branches/line.py

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MPL-2.0
 
 import numpy as np
+import pandas as pd
 from typing import Union, List
 
 from GridCalEngine.basic_structures import Logger
@@ -556,7 +557,7 @@ class Line(BranchParent):
 
         return errors
 
-    def get_equivalent_transformer(self) -> Transformer2W:
+    def get_equivalent_transformer(self, index:  pd.DatetimeIndex | None = None) -> Transformer2W:
         """
         Convert this line into a transformer
         This is necessary if the buses' voltage differ too much
@@ -566,6 +567,7 @@ class Line(BranchParent):
         V2 = max(self.bus_to.Vnom, self.bus_from.Vnom)
         elm = Transformer2W(bus_from=self.bus_from,
                             bus_to=self.bus_to,
+                            idtag=self.idtag,
                             name=self.name,
                             code=self.code,
                             active=self.active,
@@ -575,9 +577,16 @@ class Line(BranchParent):
                             r=self.R,
                             x=self.X,
                             b=self.B)
-        elm.active_prof = self.active_prof
-        elm.rate_prof = self.rate_prof
-        elm.temperature_prof = self.temp_oper_prof
+
+        if index is not None:
+            elm.ensure_profiles_exist(index=index)
+            elm.active_prof = self.active_prof
+            elm.rate_prof = self.rate_prof
+            elm.contingency_factor_prof = self.contingency_factor_prof
+            elm.protection_rating_factor_prof = self.protection_rating_factor_prof
+            elm.temperature_prof = self.temp_oper_prof
+            elm.Cost_prof = self.Cost_prof
+
         return elm
 
     def fill_design_properties(self, r_ohm: float, x_ohm: float, c_nf: float, length: float,

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/Devices/Parents/branch_parent.py

@@ -642,3 +642,10 @@ class BranchParent(PhysicalDevice):
                 return f, t, True
 
             return handle_error("Isolated branch!")
+
+    def get_weight(self) -> float:
+        """
+        Get a weight of this line for graph purposes
+        :return: weight value
+        """
+        return 1.0

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

@@ -600,7 +600,7 @@ class Assets:
         :param logger: Logger to record events
         """
         if obj.should_this_be_a_transformer(branch_connection_voltage_tolerance=0.1, logger=logger):
-            tr = obj.get_equivalent_transformer()
+            tr = obj.get_equivalent_transformer(index=self.time_profile)
             self.add_transformer2w(tr)
         else:
             if self.time_profile is not None:
@@ -1285,7 +1285,7 @@ class Assets:
         """
 
         # delete associated Branches in reverse order
-        for branch_list in self.get_branch_lists():
+        for branch_list in self.get_branch_lists(add_vsc=True, add_hvdc=True, add_switch=True):
             for i in range(len(branch_list) - 1, -1, -1):
                 if branch_list[i].bus_from == obj:
                     if delete_associated:
@@ -4647,7 +4647,7 @@ class Assets:
         elif obj.device_type == DeviceType.BranchDevice:
 
             if obj.should_this_be_a_transformer():
-                self.add_transformer2w(obj.get_equivalent_transformer())
+                self.add_transformer2w(obj.get_equivalent_transformer(index=self.time_profile))
             else:
                 self.add_line(obj.get_equivalent_line())
         else:
@@ -4661,7 +4661,7 @@ class Assets:
 
             **obj** (:ref:`Branch<branch>`): :ref:`Branch<branch>` object
         """
-        for branch_list in self.get_branch_lists():
+        for branch_list in self.get_branch_lists(add_vsc=True, add_hvdc=True, add_switch=True):
             try:
                 branch_list.remove(obj)
                 self.delete_groupings_with_object(obj=obj)
@@ -4698,8 +4698,8 @@ class Assets:
 
         return lst
 
-    def get_branches(self, add_vsc: bool = True, add_hvdc: bool = True,
-                     add_switch: bool = False) -> List[BRANCH_TYPES]:
+    def get_branches(self, add_vsc: bool = False, add_hvdc: bool = False,
+                     add_switch: bool = True) -> List[BRANCH_TYPES]:
         """
         Return all the branch objects
         :param add_vsc: Include the list of VSC?
@@ -4727,9 +4727,9 @@ class Assets:
             for elm in lst:
                 yield elm
 
-    def get_branch_number(self, add_vsc: bool = True,
-                          add_hvdc: bool = True,
-                          add_switch: bool = False) -> int:
+    def get_branch_number(self, add_vsc: bool = False,
+                          add_hvdc: bool = False,
+                          add_switch: bool = True) -> int:
         """
         return the number of Branches (of all types)
         :param add_vsc: Include the list of VSC?
@@ -4846,98 +4846,6 @@ class Assets:
             T[i] = bus_dict[elm.bus_to]
         return F, T
 
-    def get_branches_wo_hvdc(self) -> list[BRANCH_TYPES]:
-        """
-        Return all the real branch objects.
-        :return: lines + transformers 2w
-        """
-        return self.get_branches(add_vsc=True, add_hvdc=False, add_switch=False)
-
-    def get_branches_wo_vsc_hvdc(self) -> list[BRANCH_TYPES]:
-        """
-        Return all the real branch objects.
-        :return: lines + transformers 2w
-        """
-        return self.get_branches(add_vsc=False, add_hvdc=False, add_switch=False)
-
-    def get_branch_names_wo_hvdc(self) -> StrVec:
-        """
-        Get all branch names without HVDC devices
-        :return: StrVec
-        """
-        return self.get_branch_names(add_vsc=True, add_hvdc=False, add_switch=False)
-
-    def get_branch_names_wo_hvdc_w_switch(self) -> StrVec:
-        """
-        Get all branch names without HVDC devices
-        :return: StrVec
-        """
-        return self.get_branch_names(add_vsc=True, add_hvdc=False, add_switch=True)
-
-    def get_branch_names_wo_vsc_hvdc(self) -> StrVec:
-        """
-        Get all branch names without VSC nor HVDC devices
-        :return: StrVec
-        """
-        return self.get_branch_names(add_vsc=False, add_hvdc=False, add_switch=False)
-
-    def get_branch_number_wo_hvdc(self) -> int:
-        """
-        return the number of Branches (of all types)
-        :return: number
-        """
-        return self.get_branch_number(add_vsc=True, add_hvdc=False, add_switch=False)
-
-    def get_branch_number_wo_vsc_hvdc(self) -> int:
-        """
-        return the number of Branches (of all types)
-        :return: number
-        """
-        return self.get_branch_number(add_vsc=False, add_hvdc=False, add_switch=False)
-
-    def get_branch_number_wo_hvdc_w_switch(self) -> int:
-        """
-        return the number of Branches (with no HVDC)
-        :return: number
-        """
-        return self.get_branch_number(add_vsc=True, add_hvdc=False, add_switch=True)
-
-    def get_branches_wo_hvdc_iter(self) -> Generator[BRANCH_TYPES, None, None]:
-        """
-        Iterator all the real branch objects.
-        :return: lines + transformers 2w + hvdc
-        """
-        return self.get_branches_iter(add_vsc=True, add_hvdc=False, add_switch=False)
-
-    def get_branches_wo_vsc_hvdc_iter(self) -> Generator[BRANCH_TYPES, None, None]:
-        """
-        Iterator all the real branch objects.
-        :return: lines + transformers 2w + hvdc + vsc
-        """
-        return self.get_branches_iter(add_vsc=False, add_hvdc=False, add_switch=False)
-
-    def get_branches_wo_hvdc_index_dict(self) -> Dict[BRANCH_TYPES, int]:
-        """
-        Get the branch to index dictionary
-        :return:
-        """
-        return self.get_branches_index_dict(add_vsc=True, add_hvdc=False, add_switch=False)
-
-    def get_branches_wo_hvdc_dict(self) -> Dict[str, int]:
-        """
-        Get dictionary of branches (excluding HVDC)
-        the key is the idtag, the value is the branch position
-        :return: Dict[str, int]
-        """
-        return self.get_branches_dict(add_vsc=True, add_hvdc=False, add_switch=False)
-
-    def get_branch_number_wo_hvdc_FT(self) -> Tuple[IntVec, IntVec]:
-        """
-        get the from and to arrays of indices
-        :return: IntVec, IntVec
-        """
-        return self.get_branch_FT(add_vsc=True, add_hvdc=False, add_switch=False)
-
     def delete_groupings_with_object(self, obj: BRANCH_TYPES, delete_groups: bool = True):
         """
         Delete the dependencies that may come with a branch
@@ -5391,7 +5299,7 @@ class Assets:
             return self.get_load_like_devices()
 
         elif device_type == DeviceType.BranchDevice:
-            return self.get_branches_wo_hvdc()
+            return self.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)
 
         elif device_type == DeviceType.ShuntLikeDevice:
             return self.get_shunt_like_devices()

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/Devices/multi_circuit.py

@@ -267,8 +267,9 @@ class MultiCircuit(Assets):
         Get branch active matrix
         :return: array with branch active status
         """
-        active = np.empty((self.get_time_number(), self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True)), dtype=int)
-        for i, b in enumerate(self.get_branches_wo_hvdc()):
+        active = np.empty((self.get_time_number(),
+                           self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True)), dtype=int)
+        for i, b in enumerate(self.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)):
             active[:, i] = b.active_prof.toarray()
         return active
 
@@ -365,7 +366,7 @@ class MultiCircuit(Assets):
             bus_dictionary[bus.idtag] = i
 
         tuples = list()
-        for branch_list in self.get_branch_lists():
+        for branch_list in self.get_branch_lists(add_vsc=True, add_hvdc=True, add_switch=True):
             for branch in branch_list:
                 f = bus_dictionary[branch.bus_from.idtag]
                 t = bus_dictionary[branch.bus_to.idtag]
@@ -403,7 +404,7 @@ class MultiCircuit(Assets):
         bus_dictionary = self.get_elements_dict_by_type(element_type=DeviceType.BusDevice,
                                                         use_secondary_key=False)
 
-        for branch_list in self.get_branch_lists():
+        for branch_list in self.get_branch_lists(add_vsc=True, add_hvdc=True, add_switch=True):
             for direction, branch in zip(current_flow_direction, branch_list):
                 f = bus_dictionary[branch.bus_from.idtag]
                 t = bus_dictionary[branch.bus_to.idtag]
@@ -796,7 +797,7 @@ class MultiCircuit(Assets):
         bus_dict = {bus: i for i, bus in enumerate(self.buses)}
 
         k = 0
-        for branch_list in self.get_branch_lists():
+        for branch_list in self.get_branch_lists(add_vsc=True, add_hvdc=True, add_switch=True):
             for br in branch_list:
                 i = bus_dict[br.bus_from]  # store the row indices
                 j = bus_dict[br.bus_to]  # store the row indices
@@ -1104,7 +1105,7 @@ class MultiCircuit(Assets):
         :return: List of (branch index, branch object, flow sense w.r.t the area exchange)
         """
         lst: List[Tuple[int, object, float]] = list()
-        for k, branch in enumerate(self.get_branches_wo_hvdc()):
+        for k, branch in enumerate(self.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)):
             if branch.bus_from.area in a1 and branch.bus_to.area in a2:
                 lst.append((k, branch, 1.0))
             elif branch.bus_from.area in a2 and branch.bus_to.area in a1:
@@ -1121,7 +1122,7 @@ class MultiCircuit(Assets):
         :return: List of (branch index, branch object, flow sense w.r.t the area exchange)
         """
         lst: List[Tuple[int, object, float]] = list()
-        for k, branch in enumerate(self.get_branches_wo_hvdc()):
+        for k, branch in enumerate(self.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)):
             if branch.bus_from in a1 and branch.bus_to in a2:
                 lst.append((k, branch, 1.0))
             elif branch.bus_from in a2 and branch.bus_to in a1:
@@ -1217,7 +1218,7 @@ class MultiCircuit(Assets):
         area_names = [a.name for a in self.get_areas()]
         bus_area_indices = np.array([area_dict.get(b.area, 0) for b in self.get_buses()])
 
-        branches = self.get_branches_wo_hvdc()
+        branches = self.get_branches(add_vsc=False, add_hvdc=False, add_switch=True)
         F = np.zeros(len(branches), dtype=int)
         T = np.zeros(len(branches), dtype=int)
         for k, elm in enumerate(branches):
@@ -1292,7 +1293,7 @@ class MultiCircuit(Assets):
         Sbase_old = self.Sbase
 
         # get all the Branches with impedance
-        elms = self.get_branches_wo_hvdc()
+        elms = self.get_branches(add_vsc=False, add_hvdc=False, add_switch=True)
 
         # change the base at each element
         for elm in elms:
@@ -1696,50 +1697,52 @@ class MultiCircuit(Assets):
 
         return ratio
 
-    def get_branch_rates_prof_wo_hvdc(self) -> Mat:
+    def get_branch_rates_prof(self, add_hvdc=False, add_vsc=False, add_switch=True) -> Mat:
         """
         Get the complex bus power Injections
         :return: (ntime, nbr) [MVA]
         """
-        val = np.zeros((self.get_time_number(), self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True)))
+        val = np.zeros((self.get_time_number(),
+                        self.get_branch_number(add_hvdc=add_hvdc, add_vsc=add_vsc, add_switch=add_switch)))
 
-        for i, branch in enumerate(self.get_branches_wo_hvdc()):
+        for i, branch in enumerate(self.get_branches(add_hvdc=add_hvdc, add_vsc=add_vsc, add_switch=add_switch)):
             val[:, i] = branch.rate_prof.toarray()
 
         return val
 
-    def get_branch_rates_wo_hvdc(self) -> Vec:
+    def get_branch_rates(self, add_hvdc=False, add_vsc=False, add_switch=True) -> Vec:
         """
         Get the complex bus power Injections
         :return: (nbr) [MVA]
         """
-        val = np.zeros(self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True))
+        val = np.zeros(self.get_branch_number(add_hvdc=add_hvdc, add_vsc=add_vsc, add_switch=add_switch))
 
-        for i, branch in enumerate(self.get_branches_wo_hvdc()):
+        for i, branch in enumerate(self.get_branches(add_hvdc=add_hvdc, add_vsc=add_vsc, add_switch=add_switch)):
             val[i] = branch.rate
 
         return val
 
-    def get_branch_contingency_rates_prof_wo_hvdc(self) -> Mat:
+    def get_branch_contingency_rates_prof(self, add_hvdc=False, add_vsc=False, add_switch=True) -> Mat:
         """
         Get the complex bus power Injections
         :return: (ntime, nbr) [MVA]
         """
-        val = np.zeros((self.get_time_number(), self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True)))
+        val = np.zeros((self.get_time_number(),
+                        self.get_branch_number(add_hvdc=add_hvdc, add_vsc=add_vsc, add_switch=add_switch)))
 
-        for i, branch in enumerate(self.get_branches_wo_hvdc()):
+        for i, branch in enumerate(self.get_branches(add_hvdc=add_hvdc, add_vsc=add_vsc, add_switch=add_switch)):
             val[:, i] = branch.rate_prof.toarray() * branch.contingency_factor_prof.toarray()
 
         return val
 
-    def get_branch_contingency_rates_wo_hvdc(self) -> Vec:
+    def get_branch_contingency_rates(self, add_hvdc=False, add_vsc=False, add_switch=True) -> Vec:
         """
         Get the complex bus power Injections
         :return: (nbr) [MVA]
         """
-        val = np.zeros(self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True))
+        val = np.zeros(self.get_branch_number(add_hvdc=add_hvdc, add_vsc=add_vsc, add_switch=add_switch))
 
-        for i, branch in enumerate(self.get_branches_wo_hvdc()):
+        for i, branch in enumerate(self.get_branches(add_hvdc=add_hvdc, add_vsc=add_vsc, add_switch=add_switch)):
             val[i] = branch.rate_prof.toarray() * branch.contingency_factor.toarray()
 
         return val
@@ -2185,7 +2188,7 @@ class MultiCircuit(Assets):
         :param logger: Logger
         """
         elements_to_delete = list()
-        for lst in self.get_branch_lists():
+        for lst in self.get_branch_lists(add_vsc=True, add_hvdc=True, add_switch=True):
             for elm in lst:
                 if elm.bus_from is not None:
                     if elm.bus_from not in bus_set:

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/IO/cim/cgmes/gridcal_to_cgmes.py

@@ -1659,7 +1659,8 @@ def get_cgmes_sv_tap_step(multi_circuit: MultiCircuit,
                           cgmes_model: CgmesCircuit,
                           pf_results: PowerFlowResults,
                           logger: DataLogger) -> None:
-    branch_objects = multi_circuit.get_branches_wo_hvdc()
+
+    branch_objects = multi_circuit.get_branches(add_vsc=False, add_hvdc=False, add_switch=True)
 
     tap_modules = pf_results.tap_module
 

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/IO/gridcal/json_parser.py

@@ -2114,7 +2114,7 @@ def save_json_file_v3(file_path: str, circuit: MultiCircuit, simulation_drivers:
                                                'va': np.angle(driver.results.voltage[i])}
 
                     branch_data = dict()
-                    for i, elm in enumerate(circuit.get_branches_wo_hvdc()):
+                    for i, elm in enumerate(circuit.get_branches(add_vsc=False, add_hvdc=False, add_switch=True)):
                         branch_data[elm.idtag] = {'p': driver.results.Sf[i].real,
                                                   'q': driver.results.Sf[i].imag,
                                                   'losses': driver.results.losses[i].real}
@@ -2135,7 +2135,7 @@ def save_json_file_v3(file_path: str, circuit: MultiCircuit, simulation_drivers:
                                                'va': np.angle(driver.results.voltage[:, i]).tolist()}
 
                     branch_data = dict()
-                    for i, elm in enumerate(circuit.get_branches_wo_hvdc()):
+                    for i, elm in enumerate(circuit.get_branches(add_vsc=False, add_hvdc=False, add_switch=True)):
                         branch_data[elm.idtag] = {'p': driver.results.Sf[:, i].real.tolist(),
                                                   'q': driver.results.Sf[:, i].imag.tolist(),
                                                   'losses': driver.results.losses[:, i].real.tolist()}

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/IO/matpower/legacy/matpower_parser.py

@@ -947,7 +947,7 @@ def get_branches(circuit: MultiCircuit, bus_dict: Dict[dev.Bus, int]) -> List[Di
     """
     data = list()
 
-    elm_list = circuit.get_branches_wo_hvdc()
+    elm_list = circuit.get_branches(add_vsc=False, add_hvdc=False, add_switch=True)
 
     for k, elm in enumerate(elm_list):
         f = bus_dict[elm.bus_from]  # already accounts for the +1 of Matlab

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/IO/raw/raw_to_gridcal.py

@@ -1110,7 +1110,7 @@ def psse_to_gridcal(psse_circuit: PsseCircuit,
         # detect if this branch is actually a transformer
         if branch.should_this_be_a_transformer(branch_connection_voltage_tolerance, logger=logger):
 
-            transformer = branch.get_equivalent_transformer()
+            transformer = branch.get_equivalent_transformer(index=None)
 
             # Add to the circuit
             circuit.add_transformer2w(transformer)

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/Simulations/ATC/available_transfer_capacity_driver.py

@@ -406,7 +406,7 @@ class AvailableTransferCapacityDriver(DriverTemplate):
         self.options = options
 
         # OPF results
-        rates = self.grid.get_branch_rates_wo_hvdc()
+        rates = self.grid.get_branch_rates()
         self.results = AvailableTransferCapacityResults(br_names=self.grid.get_branch_names(add_hvdc=False,
                                                                                             add_vsc=False,
                                                                                             add_switch=True),
@@ -444,10 +444,10 @@ class AvailableTransferCapacityDriver(DriverTemplate):
 
         # declare the results
         self.results = AvailableTransferCapacityResults(
-            br_names=linear.numerical_circuit.passive_branch_data.names,
-            bus_names=linear.numerical_circuit.bus_data.names,
-            rates=nc.Rates,
-            contingency_rates=nc.ContingencyRates,
+            br_names=nc.passive_branch_data.names,
+            bus_names=nc.bus_data.names,
+            rates=nc.passive_branch_data.rates,
+            contingency_rates=nc.passive_branch_data.contingency_rates,
             clustering_results=None
         )
 
@@ -464,9 +464,11 @@ class AvailableTransferCapacityDriver(DriverTemplate):
                       AvailableTransferMode.Load: 2,
                       AvailableTransferMode.GenerationAndLoad: 3}
 
+        Sbus = nc.get_power_injections_pu()
+
         alpha = compute_alpha(ptdf=linear.PTDF,
-                              P0=nc.Sbus.real,
-                              Pinstalled=nc.bus_installed_power,
+                              P0=Sbus.real,
+                              Pinstalled=nc.bus_data.installed_power,
                               Pgen=nc.generator_data.get_injections_per_bus().real,
                               Pload=nc.load_data.get_injections_per_bus().real,
                               bus_a1_idx=idx1b,
@@ -486,7 +488,7 @@ class AvailableTransferCapacityDriver(DriverTemplate):
             (Shvdc, Losses_hvdc, Pf_hvdc, Pt_hvdc,
              loading_hvdc, n_free) = nc.hvdc_data.get_power(Sbase=nc.Sbase, theta=np.zeros(nc.nbus))
 
-            flows = linear.get_flows(nc.Sbus + Shvdc)
+            flows = linear.get_flows(Sbus + Shvdc)
 
         # base exchange
         base_exchange = (self.options.inter_area_branch_sense * flows[self.options.inter_area_branch_idx]).sum()
@@ -503,8 +505,8 @@ class AvailableTransferCapacityDriver(DriverTemplate):
                                   lodf=linear.LODF,
                                   alpha=alpha,
                                   flows=flows,
-                                  rates=nc.Rates,
-                                  contingency_rates=nc.ContingencyRates,
+                                  rates=nc.passive_branch_data.rates,
+                                  contingency_rates=nc.passive_branch_data.contingency_rates,
                                   base_exchange=base_exchange,
                                   time_idx=0,
                                   threshold=self.options.threshold)

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/Simulations/ATC/available_transfer_capacity_ts_driver.py

@@ -219,8 +219,8 @@ class AvailableTransferCapacityTimeSeriesDriver(TimeSeriesDriverTemplate):
         self.results = AvailableTransferCapacityTimeSeriesResults(
             br_names=self.grid.get_branch_names(add_hvdc=False, add_vsc=False, add_switch=True),
             bus_names=self.grid.get_bus_names(),
-            rates=self.grid.get_branch_rates_prof_wo_hvdc(),
-            contingency_rates=self.grid.get_branch_contingency_rates_prof_wo_hvdc(),
+            rates=self.grid.get_branch_rates_prof(),
+            contingency_rates=self.grid.get_branch_contingency_rates_prof(),
             time_array=self.grid.time_profile[self.time_indices],
             clustering_results=clustering_results
         )

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/Simulations/ContingencyAnalysis/Methods/helm_contingency_analysis.py

@@ -51,8 +51,8 @@ def helm_contingency_analysis(grid: MultiCircuit,
     # get contingency groups dictionary
     cg_dict = grid.get_contingency_group_dict()
 
-    branches_dict = grid.get_branches_wo_hvdc_dict()
-    calc_branches = grid.get_branches_wo_hvdc()
+    branches_dict = grid.get_branches_dict(add_vsc=False, add_hvdc=False, add_switch=True)
+    calc_branches = grid.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)
     mon_idx = numerical_circuit.passive_branch_data.get_monitor_enabled_indices()
 
     # keep the original states

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

@@ -44,7 +44,7 @@ def optimal_linear_contingency_analysis(grid: MultiCircuit,
     # set the numerical circuit
     nc = compile_numerical_circuit_at(grid, t_idx=t)
 
-    calc_branches = grid.get_branches_wo_hvdc()
+    calc_branches = grid.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)
 
     area_names, bus_area_indices, F, T, hvdc_F, hvdc_T = grid.get_branch_areas_info()
 

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/Simulations/ContingencyAnalysis/contingency_plan.py

@@ -229,7 +229,7 @@ def generate_automatic_contingency_plan(
 
     # add branch contingencies
     if consider_branches:
-        branches = grid.get_branches_wo_hvdc()
+        branches = grid.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)
 
         if k == 1:
             contingencies1, groups1 = add_n1_contingencies(branches=branches,

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

@@ -68,13 +68,15 @@ class AdequacyInvestmentProblem(BlackBoxProblemTemplate):
                  grid: MultiCircuit,
                  n_monte_carlo_sim=10000,
                  use_monte_carlo: bool = True,
-                 save_file: bool = True):
+                 save_file: bool = True,
+                 time_indices: IntVec | None = None):
         """
 
         :param grid:
         :param n_monte_carlo_sim:
         :param use_monte_carlo:
         :param save_file:
+        :param time_indices: array of time indices to use, if None all are used
         """
         super().__init__(grid=grid,
                          x_dim=len(grid.investments_groups),
@@ -84,6 +86,7 @@ class AdequacyInvestmentProblem(BlackBoxProblemTemplate):
         self.n_monte_carlo_sim = n_monte_carlo_sim
         self.use_monte_carlo = use_monte_carlo
         self.save_file = save_file
+        self.time_indices = time_indices
 
         if self.save_file:
             self.output_f = open("adequacy_output.csv", "w")
@@ -95,7 +98,7 @@ class AdequacyInvestmentProblem(BlackBoxProblemTemplate):
         # --------------------------------------------------------------------------------------------------------------
 
         self.greedy_dispatch_inputs = GreedyDispatchInputs(grid=self.grid,
-                                                           time_indices=None,
+                                                           time_indices=self.time_indices,
                                                            logger=self.logger)
 
         self.years_starts_indices = determine_starting_index_of_every_year(index=self.grid.time_profile)
@@ -144,7 +147,9 @@ class AdequacyInvestmentProblem(BlackBoxProblemTemplate):
         self.inv_gen_idx = np.array(self.inv_gen_idx)
         self.inv_batt_idx = np.array(self.inv_batt_idx)
 
-        self.branches_cost = np.array([e.Cost for e in grid.get_branches_wo_hvdc()], dtype=float)
+        self.branches_cost = np.array([e.Cost for e in
+                                       grid.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)],
+                                      dtype=float)
 
     def n_objectives(self) -> int:
         """
@@ -229,6 +234,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,

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/Simulations/InvestmentsEvaluation/Problems/power_flow_problem.py

@@ -92,7 +92,9 @@ class PowerFlowInvestmentProblem(BlackBoxProblemTemplate):
         self.va_max = np.array([e.angle_max for e in grid.get_buses()], dtype=float)
         self.va_min = np.array([e.angle_min for e in grid.get_buses()], dtype=float)
 
-        self.branches_cost = np.array([e.Cost for e in grid.get_branches_wo_hvdc()], dtype=float)
+        self.branches_cost = np.array([e.Cost for e in
+                                       grid.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)],
+                                      dtype=float)
 
     def n_objectives(self) -> int:
         """

{gridcalengine-5.3.49 → gridcalengine-5.3.51}/GridCalEngine/Simulations/InvestmentsEvaluation/Problems/power_flow_ts_problem.py

@@ -121,7 +121,9 @@ class TimeSeriesPowerFlowInvestmentProblem(BlackBoxProblemTemplate):
         self.va_max = np.array([e.angle_max for e in grid.get_buses()], dtype=float)
         self.va_min = np.array([e.angle_min for e in grid.get_buses()], dtype=float)
 
-        self.branches_cost = np.array([e.Cost for e in grid.get_branches_wo_hvdc()], dtype=float)
+        self.branches_cost = np.array([e.Cost for e in
+                                       grid.get_branches(add_hvdc=False, add_vsc=False, add_switch=True)],
+                                      dtype=float)
 
     def n_objectives(self) -> int:
         """