GridCalEngine 5.3.43__tar.gz → 5.3.45__tar.gz

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Compilers/circuit_to_bentayga.py

@@ -678,7 +678,7 @@ def translate_bentayga_pf_results(grid: MultiCircuit, res) -> PowerFlowResults:
     :return:
     """
     results = PowerFlowResults(n=grid.get_bus_number(),
-                               m=grid.get_branch_number_wo_hvdc(),
+                               m=grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
                                n_hvdc=grid.get_hvdc_number(),
                                n_vsc=grid.get_vsc_number(),
                                n_gen=grid.get_generators_number(),

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Compilers/circuit_to_newton_pa.py

@@ -1488,7 +1488,7 @@ def translate_newton_pa_pf_results(grid: MultiCircuit, res: "npa.PowerFlowResult
     :return: PowerFlowResults instance
     """
     results = PowerFlowResults(n=grid.get_bus_number(),
-                               m=grid.get_branch_number_wo_hvdc(),
+                               m=grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
                                n_hvdc=grid.get_hvdc_number(),
                                n_vsc=grid.get_vsc_number(),
                                n_gen=grid.get_generators_number(),
@@ -1554,6 +1554,7 @@ def translate_newton_pa_opf_results(grid: MultiCircuit, res: "npa.NonlinearOpfRe
                                       generator_names=res.generator_names,
                                       battery_names=res.battery_names,
                                       hvdc_names=res.hvdc_names,
+                                      vsc_names=grid.get_vsc_names(),
                                       bus_types=convert_bus_types(res.bus_types[0]),
                                       area_names=[a.name for a in grid.areas],
                                       F=res.F,
@@ -1631,9 +1632,11 @@ def translate_newton_pa_contingencies(grid: MultiCircuit,
 
     # declare the results
     results = ContingencyAnalysisResults(ncon=len(grid.get_contingency_groups()),
-                                         nbr=grid.get_branch_number_wo_hvdc(),
+                                         nbr=grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
                                          nbus=grid.get_bus_number(),
-                                         branch_names=grid.get_branch_names_wo_hvdc(),
+                                         branch_names=grid.get_branch_names(add_hvdc=False,
+                                                                            add_vsc=False,
+                                                                            add_switch=True),
                                          bus_names=grid.get_bus_names(),
                                          bus_types=grid.get_bus_default_types(),
                                          con_names=grid.get_contingency_group_names())

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/DataStructures/numerical_circuit.py

@@ -1134,9 +1134,9 @@ class NumericalCircuit:
             )
 
         elif structure_type == 'Yseries':
-            adm = self.get_admittance_matrices()
+            adms = self.get_series_admittance_matrices()
             df = pd.DataFrame(
-                data=adm.Yseries.toarray(),
+                data=adms.Yseries.toarray(),
                 columns=self.bus_data.names,
                 index=self.bus_data.names,
             )

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Devices/Parents/editable_device.py

@@ -48,7 +48,8 @@ GCPROP_TYPES = Union[
     Type[SubstationTypes],
     Type[ContingencyOperationTypes],
     Type[BranchGroupTypes],
-    Type[ConverterControlType]
+    Type[ConverterControlType],
+    Type[DeviceType]
 ]
 
 

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Devices/Parents/pointer_device_parent.py

@@ -71,3 +71,11 @@ class PointerDeviceParent(EditableDevice):
             self._tpe = val
         else:
             raise ValueError(f"tpe must be a string not {val}")
+
+    def set_device(self, elm: EditableDevice):
+        """
+        Set the device
+        :param elm: Device to be pointed
+        """
+        self._tpe = elm.device_type
+        self._device_idtag = elm.idtag

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Devices/assets.py

@@ -3847,7 +3847,7 @@ class Assets:
 
         return res
 
-    def get_investmenst_by_groups_index_dict(self) -> Dict[int, List[dev.Investment]]:
+    def get_investment_by_groups_index_dict(self) -> Dict[int, List[dev.Investment]]:
         """
         Get a dictionary of investments goups and their
         :return: Dict[investment group index] = list of investments
@@ -3865,6 +3865,22 @@ class Assets:
 
         return res
 
+    def get_capex_by_investment_group(self) -> Vec:
+        """
+        Get array of CAPEX costs per investment group
+        :return:
+        """
+        capex = np.zeros(len(self.investments_groups))
+
+        # pre-compute the capex of each investment group
+        d = self.get_investment_by_groups_index_dict()
+
+        for i, investments in d.items():
+            for investment in investments:
+                capex[i] += investment.CAPEX
+
+        return capex
+
     # ------------------------------------------------------------------------------------------------------------------
     # Technology
     # ------------------------------------------------------------------------------------------------------------------
@@ -4632,7 +4648,7 @@ class Assets:
         :param add_switch: Include the list of Switch?
         :return: list of branch devices lists
         """
-        lst = [
+        lst: List[List[BRANCH_TYPES]] = [
             self._lines,
             self._dc_lines,
             self._transformers2w,
@@ -6367,3 +6383,27 @@ class Assets:
         """
         for elm in self.get_all_elements_iter():
             elm.replace_objects(old_object=old_object, new_obj=new_obj, logger=logger)
+
+    def refine_pointer_objects(self, logger: Logger):
+        """
+        Find the device types of pointer objects
+        :param logger:
+        :return:
+        """
+        d, ok = self.get_all_elements_dict(logger=logger)
+        objects_to_remove = list()
+
+        for lst in [self.investments, self.remedial_actions, self.contingencies]:
+            for elm in lst:
+                pointed = d.get(elm.device_idtag, None)
+                if pointed is None:
+                    logger.add_error("Reference not found, element deleted",
+                                     device_class=elm.device_type.value,
+                                     value=elm.device_idtag)
+                    objects_to_remove.append(elm)
+                else:
+                    elm.set_device(pointed)
+
+        # Delete the elements that don't point to the right element
+        for elm in objects_to_remove:
+            self.delete_element(obj=elm)

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Devices/multi_circuit.py

@@ -9,7 +9,7 @@ import cmath
 import copy
 import numpy as np
 import pandas as pd
-from typing import List, Dict, Tuple, Union, Set
+from typing import List, Dict, Tuple, Union, Set, TYPE_CHECKING
 from uuid import getnode as get_mac, uuid4
 import networkx as nx
 from matplotlib import pyplot as plt
@@ -25,6 +25,10 @@ from GridCalEngine.basic_structures import Logger
 import GridCalEngine.Topology.topology as tp
 from GridCalEngine.enumerations import DeviceType, ActionType, SubObjectType
 
+if TYPE_CHECKING:
+    from GridCalEngine.Simulations.OPF.opf_ts_results import OptimalPowerFlowTimeSeriesResults
+    from GridCalEngine.Simulations.OPF.opf_results import OptimalPowerFlowResults
+
 
 def get_system_user() -> str:
     """
@@ -263,7 +267,7 @@ class MultiCircuit(Assets):
         Get branch active matrix
         :return: array with branch active status
         """
-        active = np.empty((self.get_time_number(), self.get_branch_number_wo_hvdc()), dtype=int)
+        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[:, i] = b.active_prof.toarray()
         return active
@@ -678,7 +682,7 @@ class MultiCircuit(Assets):
             df_bus, df_branch = power_flow_results.export_all()
 
             df_bus.index = self.get_bus_names()
-            df_branch.index = self.get_branch_names_wo_hvdc()
+            df_branch.index = self.get_branch_names(add_hvdc=False, add_vsc=False, add_switch=True)
 
             with pd.ExcelWriter(file_name) as writer:  # pylint: disable=abstract-class-instantiated
                 df_bus.to_excel(writer, 'Bus results')
@@ -1697,7 +1701,7 @@ class MultiCircuit(Assets):
         Get the complex bus power Injections
         :return: (ntime, nbr) [MVA]
         """
-        val = np.zeros((self.get_time_number(), self.get_branch_number_wo_hvdc()))
+        val = np.zeros((self.get_time_number(), self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True)))
 
         for i, branch in enumerate(self.get_branches_wo_hvdc()):
             val[:, i] = branch.rate_prof.toarray()
@@ -1709,7 +1713,7 @@ class MultiCircuit(Assets):
         Get the complex bus power Injections
         :return: (nbr) [MVA]
         """
-        val = np.zeros(self.get_branch_number_wo_hvdc())
+        val = np.zeros(self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True))
 
         for i, branch in enumerate(self.get_branches_wo_hvdc()):
             val[i] = branch.rate
@@ -1721,7 +1725,7 @@ class MultiCircuit(Assets):
         Get the complex bus power Injections
         :return: (ntime, nbr) [MVA]
         """
-        val = np.zeros((self.get_time_number(), self.get_branch_number_wo_hvdc()))
+        val = np.zeros((self.get_time_number(), self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True)))
 
         for i, branch in enumerate(self.get_branches_wo_hvdc()):
             val[:, i] = branch.rate_prof.toarray() * branch.contingency_factor_prof.toarray()
@@ -1733,7 +1737,7 @@ class MultiCircuit(Assets):
         Get the complex bus power Injections
         :return: (nbr) [MVA]
         """
-        val = np.zeros(self.get_branch_number_wo_hvdc())
+        val = np.zeros(self.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True))
 
         for i, branch in enumerate(self.get_branches_wo_hvdc()):
             val[i] = branch.rate_prof.toarray() * branch.contingency_factor.toarray()
@@ -2758,10 +2762,10 @@ class MultiCircuit(Assets):
         self.wire_types += data.wire_types
         self.sequence_line_types += data.sequence_line_types
 
-    def set_opf_ts_results(self, results):
+    def set_opf_ts_results(self, results: OptimalPowerFlowTimeSeriesResults):
         """
-
-        :param results:
+        Assign OptimalPowerFlowTimeSeriesResults to the objects
+        :param results: OptimalPowerFlowTimeSeriesResults
         :return:
         """
         for i, elm in enumerate(self.get_generators()):
@@ -2772,3 +2776,18 @@ class MultiCircuit(Assets):
 
         for i, elm in enumerate(self.get_loads()):
             elm.P_prof.set(results.load_power[:, i])
+
+    def set_opf_snapshot_results(self, results: OptimalPowerFlowResults):
+        """
+        Assign OptimalPowerFlowResults to the objects
+        :param results:OptimalPowerFlowResults
+        :return:
+        """
+        for i, elm in enumerate(self.get_generators()):
+            elm.P = results.generator_power[i]
+
+        for i, elm in enumerate(self.get_batteries()):
+            elm.P = results.battery_power[i]
+
+        # for i, elm in enumerate(self.get_loads()):
+        #     elm.P = results.load_power[i]

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Devices/profile.py

@@ -227,7 +227,16 @@ class Profile:
         :param map_data: map with the data
         """
         self._is_sparse = True
-        self._sparse_array = SparseArray(data_type=self.dtype, default_value=default_value)
+
+        try:
+            # try casting the default value, if failing use a proper one
+            if default_value is not None:
+                a = self.dtype(default_value)
+            self._sparse_array = SparseArray(data_type=self.dtype, default_value=default_value)
+        except ValueError:
+            self._sparse_array = SparseArray(data_type=self.dtype, default_value=self._sparse_array.default_value)
+
+
         if map_data is None:
             self._sparse_array.create(size=size, default_value=default_value)
         else:

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/IO/gridcal/pack_unpack.py

@@ -1537,6 +1537,10 @@ def parse_gridcal_data(data: GRIDCAL_FILE_TYPE,
     if text_func is not None:
         text_func("Done!")
 
+    # search contingencies, investments and remedial actions pointed devices
+    # and remove those that point nowhere
+    circuit.refine_pointer_objects(logger=logger)
+
     if circuit.has_time_series:
         circuit.ensure_profiles_exist()
 

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/ATC/available_transfer_capacity_driver.py

@@ -407,7 +407,9 @@ class AvailableTransferCapacityDriver(DriverTemplate):
 
         # OPF results
         rates = self.grid.get_branch_rates_wo_hvdc()
-        self.results = AvailableTransferCapacityResults(br_names=self.grid.get_branch_names_wo_hvdc(),
+        self.results = AvailableTransferCapacityResults(br_names=self.grid.get_branch_names(add_hvdc=False,
+                                                                                            add_vsc=False,
+                                                                                            add_switch=True),
                                                         bus_names=self.grid.get_bus_names(),
                                                         rates=rates,
                                                         contingency_rates=rates,
@@ -431,7 +433,7 @@ class AvailableTransferCapacityDriver(DriverTemplate):
 
         # declare the linear analysis
         linear = LinearAnalysis(
-            numerical_circuit=nc,
+            nc=nc,
             distributed_slack=self.options.distributed_slack,
             correct_values=self.options.correct_values,
         )

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/ATC/available_transfer_capacity_ts_driver.py

@@ -217,7 +217,7 @@ class AvailableTransferCapacityTimeSeriesDriver(TimeSeriesDriverTemplate):
 
         # OPF results
         self.results = AvailableTransferCapacityTimeSeriesResults(
-            br_names=self.grid.get_branch_names_wo_hvdc(),
+            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(),
@@ -275,7 +275,7 @@ class AvailableTransferCapacityTimeSeriesDriver(TimeSeriesDriverTemplate):
             nc = compile_numerical_circuit_at(circuit=self.grid, t_idx=t)
 
             linear_analysis = LinearAnalysis(
-                numerical_circuit=nc,
+                nc=nc,
                 distributed_slack=True,
                 correct_values=False,
             )

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/ContingencyAnalysis/Methods/linear_contingency_analysis.py

@@ -53,7 +53,7 @@ def linear_contingency_analysis(grid: MultiCircuit,
                                          bus_types=nc.bus_data.bus_types,
                                          con_names=linear_multiple_contingencies.get_contingency_group_names())
 
-    linear_analysis = LinearAnalysis(numerical_circuit=nc,
+    linear_analysis = LinearAnalysis(nc=nc,
                                      distributed_slack=options.lin_options.distribute_slack,
                                      correct_values=options.lin_options.correct_values)
 

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/ContingencyAnalysis/Methods/nonlinear_contingency_analysis.py

@@ -70,7 +70,7 @@ def nonlinear_contingency_analysis(grid: MultiCircuit,
     if options.use_srap:
 
         # we need the PTDF for this
-        linear_analysis = LinearAnalysis(numerical_circuit=nc,
+        linear_analysis = LinearAnalysis(nc=nc,
                                          distributed_slack=options.lin_options.distribute_slack,
                                          correct_values=options.lin_options.correct_values)
 

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/ContingencyAnalysis/Methods/optimal_linear_contingency_analysis.py

@@ -60,7 +60,7 @@ def optimal_linear_contingency_analysis(grid: MultiCircuit,
                                          bus_types=nc.bus_data.bus_types,
                                          con_names=linear_multiple_contingencies.get_contingency_group_names())
 
-    linear_analysis = LinearAnalysis(numerical_circuit=nc,
+    linear_analysis = LinearAnalysis(nc=nc,
                                      distributed_slack=options.lin_options.distribute_slack,
                                      correct_values=options.lin_options.correct_values)
 

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/ContingencyAnalysis/contingency_analysis_driver.py

@@ -73,9 +73,9 @@ class ContingencyAnalysisDriver(DriverTemplate):
         self.results = ContingencyAnalysisResults(
             ncon=self.grid.get_contingency_groups_number(),
             nbus=self.grid.get_bus_number(),
-            nbr=self.grid.get_branch_number_wo_hvdc(),
+            nbr=self.grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
             bus_names=self.grid.get_bus_names(),
-            branch_names=self.grid.get_branch_names_wo_hvdc(),
+            branch_names=self.grid.get_branch_names(add_hvdc=False, add_vsc=False, add_switch=True),
             bus_types=np.ones(self.grid.get_bus_number(), dtype=int),
             con_names=np.array(self.grid.get_contingency_group_names())
         )
@@ -176,9 +176,9 @@ class ContingencyAnalysisDriver(DriverTemplate):
             self.results = ContingencyAnalysisResults(
                 ncon=self.grid.get_contingency_groups_number(),
                 nbus=self.grid.get_bus_number(),
-                nbr=self.grid.get_branch_number_wo_hvdc(),
+                nbr=self.grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
                 bus_names=self.grid.get_bus_names(),
-                branch_names=self.grid.get_branch_names_wo_hvdc(),
+                branch_names=self.grid.get_branch_names(add_hvdc=False, add_vsc=False, add_switch=True),
                 bus_types=np.ones(self.grid.get_bus_number(), dtype=int),
                 con_names=np.array(self.grid.get_contingency_group_names())
             )

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/ContingencyAnalysis/contingency_analysis_ts_driver.py

@@ -58,16 +58,18 @@ class ContingencyAnalysisTimeSeriesDriver(TimeSeriesDriverTemplate):
         # N-K results
         self.results: ContingencyAnalysisTimeSeriesResults = ContingencyAnalysisTimeSeriesResults(
             n=self.grid.get_bus_number(),
-            nbr=self.grid.get_branch_number_wo_hvdc(),
+            nbr=self.grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
             time_array=self.grid.time_profile[self.time_indices],
             bus_names=self.grid.get_bus_names(),
-            branch_names=self.grid.get_branch_names_wo_hvdc(),
+            branch_names=self.grid.get_branch_names(add_hvdc=False, add_vsc=False, add_switch=True),
             bus_types=np.ones(self.grid.get_bus_number(), dtype=int),
             con_names=self.grid.get_contingency_group_names(),
             clustering_results=clustering_results
         )
 
-        self.branch_names: StrVec = np.empty(shape=grid.get_branch_number_wo_hvdc(), dtype=str)
+        self.branch_names: StrVec = np.empty(shape=grid.get_branch_number(add_hvdc=False,
+                                                                          add_vsc=False,
+                                                                          add_switch=True), dtype=str)
 
     def run_contingency_analysis(self) -> ContingencyAnalysisTimeSeriesResults:
         """
@@ -88,9 +90,9 @@ class ContingencyAnalysisTimeSeriesDriver(TimeSeriesDriverTemplate):
 
         results = ContingencyAnalysisTimeSeriesResults(
             n=nb,
-            nbr=self.grid.get_branch_number_wo_hvdc(),
+            nbr=self.grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
             time_array=time_array,
-            branch_names=self.grid.get_branch_names_wo_hvdc(),
+            branch_names=self.grid.get_branch_names(add_hvdc=False, add_vsc=False, add_switch=True),
             bus_names=self.grid.get_bus_names(),
             bus_types=np.ones(nb, dtype=int),
             con_names=con_names,
@@ -174,9 +176,9 @@ class ContingencyAnalysisTimeSeriesDriver(TimeSeriesDriverTemplate):
         nb = self.grid.get_bus_number()
         results = ContingencyAnalysisTimeSeriesResults(
             n=nb,
-            nbr=self.grid.get_branch_number_wo_hvdc(),
+            nbr=self.grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
             time_array=time_array,
-            branch_names=self.grid.get_branch_names_wo_hvdc(),
+            branch_names=self.grid.get_branch_names(add_hvdc=False, add_vsc=False, add_switch=True),
             bus_names=self.grid.get_bus_names(),
             bus_types=np.ones(nb, dtype=int),
             con_names=self.grid.get_contingency_group_names(),
@@ -206,9 +208,9 @@ class ContingencyAnalysisTimeSeriesDriver(TimeSeriesDriverTemplate):
         nb = self.grid.get_bus_number()
         results = ContingencyAnalysisTimeSeriesResults(
             n=nb,
-            nbr=self.grid.get_branch_number_wo_hvdc(),
+            nbr=self.grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
             time_array=time_array,
-            branch_names=self.grid.get_branch_names_wo_hvdc(),
+            branch_names=self.grid.get_branch_names(add_hvdc=False, add_vsc=False, add_switch=True),
             bus_names=self.grid.get_bus_names(),
             bus_types=np.ones(nb, dtype=int),
             con_names=self.grid.get_contingency_group_names(),

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/ContinuationPowerFlow/continuation_power_flow_driver.py

@@ -48,9 +48,11 @@ class ContinuationPowerFlowDriver(DriverTemplate):
 
         self.results = ContinuationPowerFlowResults(nval=0,
                                                     nbus=self.grid.get_bus_number(),
-                                                    nbr=self.grid.get_branch_number_wo_hvdc(),
+                                                    nbr=self.grid.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True),
                                                     bus_names=self.grid.get_bus_names(),
-                                                    branch_names=self.grid.get_branch_names_wo_hvdc(),
+                                                    branch_names=self.grid.get_branch_names(add_hvdc=False,
+                                                                                            add_vsc=False,
+                                                                                            add_switch=True),
                                                     bus_types=np.ones(self.grid.get_bus_number()))
 
     def get_steps(self):

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/InvestmentsEvaluation/Methods/NSGA_3.py

@@ -9,10 +9,28 @@ from pymoo.optimize import minimize
 from pymoo.algorithms.moo.nsga3 import NSGA3
 from pymoo.operators.crossover.sbx import SBX
 from pymoo.operators.repair.rounding import RoundingRepair
+from pymoo.core.mixed import MixedVariableSampling
 from pymoo.core.sampling import Sampling
+from pymoo.operators.sampling.rnd import IntegerRandomSampling
 from pymoo.core.mutation import Mutation
+from GridCalEngine.basic_structures import Vec, IntVec
 
 
+class IntegerRandomSamplingGridCal(Sampling):
+    def _do(self, problem, n_samples, **kwargs):
+        xl = np.asarray(problem.xl, dtype=int)
+        xu = np.asarray(problem.xu, dtype=int)
+
+        n_var = len(xl)
+        X = np.zeros((n_samples, n_var), dtype=int)
+
+        for j in range(n_var):
+            values = np.arange(xl[j], xu[j] + 1)
+            for i in range(n_samples):
+                X[i, j] = np.random.choice(values)
+
+        return X
+
 class UniformBinarySampling(Sampling):
     """
     UniformBinarySampling
@@ -94,7 +112,7 @@ class GridNsga(ElementwiseProblem):
     Problem formulation packaging to use the pymoo library
     """
 
-    def __init__(self, obj_func, n_var, n_obj):
+    def __init__(self, obj_func, n_var, n_obj, lb: Vec | IntVec, ub: Vec | IntVec):
         """
 
         :param obj_func:
@@ -104,8 +122,8 @@ class GridNsga(ElementwiseProblem):
         super().__init__(n_var=n_var,
                          n_obj=n_obj,
                          n_ieq_constr=0,
-                         xl=np.zeros(n_var),
-                         xu=np.ones(n_var),
+                         xl=lb,
+                         xu=ub,
                          vtype=int)
         self.obj_func = obj_func
 
@@ -122,9 +140,9 @@ class GridNsga(ElementwiseProblem):
 
 
 def NSGA_3(obj_func,
+           n_var: int, lb: Vec | IntVec, ub: Vec | IntVec,
+           n_obj: int,
            n_partitions: int = 100,
-           n_var: int = 1,
-           n_obj: int = 2,
            max_evals: int = 30,
            pop_size: int = 1,
            crossover_prob: float = 0.05,
@@ -135,6 +153,8 @@ def NSGA_3(obj_func,
     :param obj_func: Objective function pointer [f(x)]
     :param n_partitions: Number of partitions
     :param n_var: Number of variables
+    :param lb: Array of x lower boundaries
+    :param ub: Array of x upper boundaries
     :param n_obj: Number of objectives
     :param max_evals: Maximum number of evaluations
     :param pop_size: Population size
@@ -143,14 +163,19 @@ def NSGA_3(obj_func,
     :param eta: eta parameter for the SBX crossover
     :return: X, f
     """
-    problem = GridNsga(obj_func, n_var, n_obj)
+    problem = GridNsga(obj_func, n_var, n_obj, lb=lb, ub=ub)
 
     ref_dirs = get_reference_directions("reduction", n_obj, n_partitions, seed=1)
 
     algorithm = NSGA3(pop_size=pop_size,
-                      sampling=SkewedBinarySampling(),
-                      crossover=SBX(prob=crossover_prob, eta=eta, vtype=float, repair=RoundingRepair()),
-                      mutation=BitflipMutation(prob=mutation_probability, prob_var=0.4, repair=RoundingRepair()),
+                      sampling=IntegerRandomSamplingGridCal(), # MixedVariableSampling(), # SkewedBinarySampling(),
+                      crossover=SBX(prob=crossover_prob,
+                                    eta=eta,
+                                    vtype=float,
+                                    repair=RoundingRepair()),
+                      mutation=BitflipMutation(prob=mutation_probability,
+                                               prob_var=0.4,
+                                               repair=RoundingRepair()),
                       eliminate_duplicates=True,
                       ref_dirs=ref_dirs)
 
@@ -161,7 +186,7 @@ def NSGA_3(obj_func,
                    verbose=True,
                    save_history=False)
 
-    import pandas as pd
-    dff = pd.DataFrame(res.F)
-    dff.to_excel('nsga.xlsx')
+    # import pandas as pd
+    # dff = pd.DataFrame(res.F)
+    # dff.to_excel('nsga.xlsx')
     return res.X, res.F

{gridcalengine-5.3.43 → gridcalengine-5.3.45}/GridCalEngine/Simulations/InvestmentsEvaluation/Methods/random_eval.py

@@ -3,10 +3,12 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 import numpy as np
+from GridCalEngine.basic_structures import Vec, IntVec
 
 
 def random_trial(obj_func,
-                 n_var: int = 1,
+                 n_var: int,
+                 lb: Vec | IntVec, ub: Vec | IntVec,
                  n_obj: int = 2,
                  max_evals: int = 3000):
     """

gridcalengine-5.3.45/GridCalEngine/Simulations/InvestmentsEvaluation/Problems/__init__.py

@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+
+from GridCalEngine.Simulations.InvestmentsEvaluation.Problems.power_flow_problem import PowerFlowInvestmentProblem
+from GridCalEngine.Simulations.InvestmentsEvaluation.Problems.power_flow_ts_problem import (
+    TimeSeriesPowerFlowInvestmentProblem)
+from GridCalEngine.Simulations.InvestmentsEvaluation.Problems.adequacy_problem import AdequacyInvestmentProblem