GridCalEngine 5.1.23__tar.gz → 5.1.24__tar.gz

{GridCalEngine-5.1.23 → GridCalEngine-5.1.24}/GridCalEngine/Simulations/InvestmentsEvaluation/investments_evaluation_driver.py

@@ -675,6 +675,9 @@ class InvestmentsEvaluationDriver(TimeSeriesDriverTemplate):
         elif self.options.solver == InvestmentEvaluationMethod.MixedVariableGA:
             self.optimized_evaluation_mixed_nsga2()
 
+        elif self.options.solver == InvestmentEvaluationMethod.FromPlugin:
+            self.options.plugin_fcn_ptr(self)
+
         else:
             raise Exception('Unsupported method')
 
@@ -684,6 +687,7 @@ class InvestmentsEvaluationDriver(TimeSeriesDriverTemplate):
             self.logger.add_info(msg=f"Best combination", device=inv.idtag, value=inv.name)
 
         # this stores the pareto indices in the solution object for later usage
-        self.results.get_pareto_indices()
+        if self.results.current_evaluation > 0:
+            self.results.get_pareto_indices()
 
         self.toc()

{GridCalEngine-5.1.23 → GridCalEngine-5.1.24}/GridCalEngine/Simulations/InvestmentsEvaluation/investments_evaluation_options.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from typing import Callable
 from GridCalEngine.enumerations import InvestmentsEvaluationObjectives, InvestmentEvaluationMethod, DeviceType
 from GridCalEngine.Simulations.PowerFlow.power_flow_options import PowerFlowOptions
 from GridCalEngine.Simulations.options_template import OptionsTemplate
@@ -27,7 +28,8 @@ class InvestmentsEvaluationOptions(OptionsTemplate):
     def __init__(self, max_eval: int,
                  pf_options: PowerFlowOptions,
                  solver: InvestmentEvaluationMethod = InvestmentEvaluationMethod.NSGA3,
-                 objf_tpe: InvestmentsEvaluationObjectives = InvestmentsEvaluationObjectives.PowerFlow):
+                 objf_tpe: InvestmentsEvaluationObjectives = InvestmentsEvaluationObjectives.PowerFlow,
+                 plugin_fcn_ptr: Callable = None,):
         """
 
         :param max_eval: Maximum number of evaluations
@@ -45,6 +47,8 @@ class InvestmentsEvaluationOptions(OptionsTemplate):
 
         self.objf_tpe = objf_tpe
 
+        self.plugin_fcn_ptr = plugin_fcn_ptr
+
         self.register(key="max_eval", tpe=int)
         self.register(key="pf_options", tpe=DeviceType.SimulationOptionsDevice)
         self.register(key="solver", tpe=InvestmentEvaluationMethod)

{GridCalEngine-5.1.23 → GridCalEngine-5.1.24}/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.23"
+__GridCalEngine_VERSION__ = "5.1.24"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.1.23 → GridCalEngine-5.1.24}/GridCalEngine/enumerations.py

@@ -122,6 +122,7 @@ class InvestmentEvaluationMethod(Enum):
     NSGA3 = "NSGA3"
     Random = "Random"
     MixedVariableGA = "Mixed Variable NSGA2"
+    FromPlugin = "From plugin"
 
     def __str__(self):
         return self.value
@@ -1274,6 +1275,7 @@ class InvestmentsEvaluationObjectives(Enum):
     TimeSeriesPowerFlow = 'TimeSeriesPowerFlow'
     OptimalPowerFlow = 'OptimalPowerFlow'
     TimeSeriesOptimalPowerFlow = 'TimeSeriesOptimalPowerFlow'
+    FromPlugin = 'From Plugin'
 
     def __str__(self):
         return str(self.value)

{GridCalEngine-5.1.23 → GridCalEngine-5.1.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.1.23
+Version: 5.1.24
 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.