GridCalEngine 5.1.32__tar.gz → 5.1.33__tar.gz

{GridCalEngine-5.1.32 → GridCalEngine-5.1.33}/GridCalEngine/Devices/Branches/line.py

@@ -16,7 +16,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import numpy as np
-from typing import Union, Tuple
+from typing import Union, Tuple, List
 from GridCalEngine.basic_structures import Logger
 from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices.Substation.connectivity_node import ConnectivityNode
@@ -314,7 +314,7 @@ class Line(BranchParent):
                                 X0=self.X0 / self.length,
                                 B0=self.B0 / self.length)
 
-    def get_save_data(self):
+    def get_save_data(self) -> List[str]:
         """
         Return the data that matches the edit_headers
         :return:
@@ -338,11 +338,11 @@ class Line(BranchParent):
                 data.append(obj)
         return data
 
-    def fix_inconsistencies(self, logger: Logger):
+    def fix_inconsistencies(self, logger: Logger) -> bool:
         """
         Fix the inconsistencies
         :param logger:
-        :return:
+        :return: any error
         """
         errors = False
 
@@ -355,9 +355,9 @@ class Line(BranchParent):
 
     def should_this_be_a_transformer(self, branch_connection_voltage_tolerance: float = 0.1) -> bool:
         """
-
+        Check if ths should be a transformer
         :param branch_connection_voltage_tolerance:
-        :return:
+        :return: should it be a transformer?
         """
         if self.bus_to is not None and self.bus_from is not None:
             V1 = min(self.bus_to.Vnom, self.bus_from.Vnom)
@@ -428,11 +428,8 @@ class Line(BranchParent):
         The virtual taps generate when a line nominal voltage ate the two connection buses differ
 
         Returns:
-
             **tap_f** (float, 1.0): Virtual tap at the *from* side
-
             **tap_t** (float, 1.0): Virtual tap at the *to* side
-
         """
         # resolve how the transformer is actually connected and set the virtual taps
         bus_f_v = self.bus_from.Vnom
@@ -446,47 +443,47 @@ class Line(BranchParent):
             else:
                 return 1.0, 1.0
 
-    def set_data_from(self, second_Line: "Line"):
-        """
-        Set the data from another line
-        :param second_Line:
-        :return:
-        """
-        self.copy()
-        self.bus_from = second_Line.bus_from
-        self.bus_to = second_Line.bus_to
-        self.cn_from = second_Line.cn_from
-        self.cn_to = second_Line.cn_to
-        self.name = second_Line.name
-        self.idtag = second_Line.idtag
-        self.code = second_Line.code
-        self.R = second_Line.R
-        self.X = second_Line.X
-        self.B = second_Line.B
-        self.rate = second_Line.rate
-        self.active = second_Line.active
-        self.tolerance = second_Line.tolerance
-        self.Cost = second_Line.Cost
-        self.mttf = second_Line.mttf
-        self.mttr = second_Line.mttr
-        self.r_fault = second_Line.r_fault
-        self.x_fault = second_Line.x_fault
-        self.fault_pos = second_Line.fault_pos
-        self.length = second_Line.length
-        self.temp_base = second_Line.temp_base
-        self.temp_oper = second_Line.temp_oper
-        self.alpha = second_Line.alpha
-        self.template = second_Line.template
-        self.contingency_factor = second_Line.contingency_factor
-        self.protection_rating_factor = second_Line.protection_rating_factor
-        self.contingency_enabled = second_Line.contingency_enabled
-        self.monitor_loading = second_Line.monitor_loading
-        self.R0 = second_Line.R0
-        self.X0 = second_Line.X0
-        self.B0 = second_Line.B0
-        self.R2 = second_Line.R2
-        self.X2 = second_Line.X2
-        self.B2 = second_Line.B2
-        self.capex = second_Line.capex
-        self.opex = second_Line.opex
-        self.build_status = second_Line.build_status
+    # def set_data_from(self, second_Line: "Line"):
+    #     """
+    #     Set the data from another line
+    #     :param second_Line:
+    #     :return:
+    #     """
+    #     self.copy()
+    #     self.bus_from = second_Line.bus_from
+    #     self.bus_to = second_Line.bus_to
+    #     self.cn_from = second_Line.cn_from
+    #     self.cn_to = second_Line.cn_to
+    #     self.name = second_Line.name
+    #     self.idtag = second_Line.idtag
+    #     self.code = second_Line.code
+    #     self.R = second_Line.R
+    #     self.X = second_Line.X
+    #     self.B = second_Line.B
+    #     self.rate = second_Line.rate
+    #     self.active = second_Line.active
+    #     self.tolerance = second_Line.tolerance
+    #     self.Cost = second_Line.Cost
+    #     self.mttf = second_Line.mttf
+    #     self.mttr = second_Line.mttr
+    #     self.r_fault = second_Line.r_fault
+    #     self.x_fault = second_Line.x_fault
+    #     self.fault_pos = second_Line.fault_pos
+    #     self.length = second_Line.length
+    #     self.temp_base = second_Line.temp_base
+    #     self.temp_oper = second_Line.temp_oper
+    #     self.alpha = second_Line.alpha
+    #     self.template = second_Line.template
+    #     self.contingency_factor = second_Line.contingency_factor
+    #     self.protection_rating_factor = second_Line.protection_rating_factor
+    #     self.contingency_enabled = second_Line.contingency_enabled
+    #     self.monitor_loading = second_Line.monitor_loading
+    #     self.R0 = second_Line.R0
+    #     self.X0 = second_Line.X0
+    #     self.B0 = second_Line.B0
+    #     self.R2 = second_Line.R2
+    #     self.X2 = second_Line.X2
+    #     self.B2 = second_Line.B2
+    #     self.capex = second_Line.capex
+    #     self.opex = second_Line.opex
+    #     self.build_status = second_Line.build_status

{GridCalEngine-5.1.32 → GridCalEngine-5.1.33}/GridCalEngine/Devices/multi_circuit.py

@@ -767,6 +767,13 @@ class MultiCircuit(Assets):
 
         self.snapshot_time = self.time_profile[t]
 
+    def get_snapshot_time_str(self) -> str:
+        """
+        Get the snapshot datetime as a string
+        :return: snapshot datetime string
+        """
+        return self.snapshot_time.strftime("%Y-%m-%d %H:%M:%S")
+
     def get_bus_branch_connectivity_matrix(self) -> Tuple[csc_matrix, csc_matrix, csc_matrix]:
         """
         Get the branch-bus connectivity

{GridCalEngine-5.1.32 → GridCalEngine-5.1.33}/GridCalEngine/IO/gridcal/pack_unpack.py

@@ -1128,7 +1128,6 @@ def parse_object_type_from_json(template_elm: ALL_DEV_TYPES,
                                                               gc_prop=gc_prop,
                                                               elm=elm,
                                                               property_value=val)
-                                print()
 
                             elif gc_prop.tpe == int:
                                 # set the value directly

{GridCalEngine-5.1.32 → GridCalEngine-5.1.33}/GridCalEngine/Simulations/InputsAnalysis/inputs_analysis_driver.py

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, Union, List
 import numpy as np
 import pandas as pd
 from GridCalEngine.Simulations.driver_template import DriverTemplate
@@ -23,6 +23,7 @@ from GridCalEngine.Simulations.results_template import ResultsTemplate
 from GridCalEngine.Simulations.results_table import ResultsTable
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
 from GridCalEngine.enumerations import StudyResultsType, ResultTypes, DeviceType, SimulationTypes
+from GridCalEngine.basic_structures import IntVec
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCalEngine.Simulations.OPF.opf_results import OptimalPowerFlowResults
@@ -87,7 +88,7 @@ class InputsAnalysisResults(ResultsTemplate):
         self.bus_zone_indices = self.get_bus_zone_indices()
         self.bus_country_indices = self.get_bus_country_indices()
 
-    def get_generators_df(self):
+    def get_generators_df(self) -> pd.DataFrame:
         """
 
         :return:
@@ -117,7 +118,7 @@ class InputsAnalysisResults(ResultsTemplate):
                 'Zone', 'Area', 'Substation', 'Country']
         return pd.DataFrame(data=dta, columns=cols)
 
-    def get_batteries_df(self):
+    def get_batteries_df(self) -> pd.DataFrame:
         """
 
         :return:
@@ -141,7 +142,7 @@ class InputsAnalysisResults(ResultsTemplate):
                 'Zone', 'Area', 'Substation', 'Country']
         return pd.DataFrame(data=dta, columns=cols)
 
-    def get_loads_df(self):
+    def get_loads_df(self) -> pd.DataFrame:
         """
 
         :return:
@@ -159,7 +160,7 @@ class InputsAnalysisResults(ResultsTemplate):
                 'Zone', 'Area', 'Substation', 'Country']
         return pd.DataFrame(data=dta, columns=cols)
 
-    def get_static_generators_df(self):
+    def get_static_generators_df(self) -> pd.DataFrame:
         """
 
         :return:
@@ -222,7 +223,7 @@ class InputsAnalysisResults(ResultsTemplate):
 
         return df
 
-    def get_bus_zone_indices(self):
+    def get_bus_zone_indices(self) -> IntVec:
         """
 
         :return:
@@ -230,7 +231,7 @@ class InputsAnalysisResults(ResultsTemplate):
         d = {elm: i for i, elm in enumerate(self.grid.zones)}
         return np.array([d.get(bus.zone, "") for bus in self.grid.buses])
 
-    def get_bus_area_indices(self):
+    def get_bus_area_indices(self) -> IntVec:
         """
 
         :return:
@@ -238,7 +239,7 @@ class InputsAnalysisResults(ResultsTemplate):
         d = {elm: i for i, elm in enumerate(self.grid.areas)}
         return np.array([d.get(bus.area, "") for bus in self.grid.buses])
 
-    def get_bus_country_indices(self):
+    def get_bus_country_indices(self) -> IntVec:
         """
 
         :return:
@@ -246,7 +247,7 @@ class InputsAnalysisResults(ResultsTemplate):
         d = {elm: i for i, elm in enumerate(self.grid.countries)}
         return np.array([d.get(bus.country, "") for bus in self.grid.buses])
 
-    def get_bus_substation_indices(self):
+    def get_bus_substation_indices(self) -> IntVec:
         """
 
         :return:
@@ -291,11 +292,13 @@ class InputsAnalysisResults(ResultsTemplate):
         for elm in elms:
             i = self.bus_dict[elm.bus]
             i2 = d2[i]
-            x[:, i2] += elm.get_profile(magnitude=magnitude).toarray()
+            if i2 != "":
+                i3 = int(i2)
+                x[:, i3] += elm.get_profile(magnitude=magnitude).toarray()
 
         return x, headers
 
-    def mdl(self, result_type) -> "ResultsTable":
+    def mdl(self, result_type: ResultTypes) -> "ResultsTable":
         """
         Plot the results
         :param result_type: type of results (string)
@@ -464,14 +467,14 @@ class InputsAnalysisDriver(DriverTemplate):
         self.results = InputsAnalysisResults(grid=grid)
         self.toc()
 
-    def get_steps(self):
+    def get_steps(self) -> List[int]:
         """
 
         :return:
         """
         return list()
 
-    def run(self):
+    def run(self) -> None:
         """
         Pack run_pf for the QThread
         :return:

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

{GridCalEngine-5.1.32 → GridCalEngine-5.1.33}/GridCalEngine/enumerations.py

@@ -1711,6 +1711,7 @@ class SimulationTypes(Enum):
     """
     Enumeration of simulation types
     """
+    DesignView = 'Design View'
     TemplateDriver = 'Template'
     PowerFlow_run = 'Power flow'
     ShortCircuit_run = 'Short circuit'

{GridCalEngine-5.1.32 → GridCalEngine-5.1.33}/PKG-INFO

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