change init parameters to dictionary, get_load_types

Author: amzhao16

pygridsim/core.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from altdss import altdss
 
+from pygridsim.configs import LOAD_CONFIGURATIONS
+from pygridsim.enums import LoadType
 from pygridsim.lines import _make_line
 from pygridsim.parameters import _make_generator, _make_load_node, _make_pv, _make_source_node
 from pygridsim.results import _export_results, _query_solution
@@ -16,17 +18,12 @@ def __init__(self):
         Stores numbers of circuit components to ensure unique naming of repeat circuit components.
 
         Attributes:
-            num_loads (int): Number of loads in circuit so far.
-            num_lines (int): Number of lines in circuit so far.
-            num_transformers (int): Number of transformers in circuit so far.
-            num_pv (int): Number of PV systems in circuit so far.
-            num_generators (int): Number generators in circuit so far.
+            counts (dict[str, int]): Map of each type to the number seen of that type so far
         """
-        self.num_loads = 0
-        self.num_lines = 0
-        self.num_transformers = 0
-        self.num_pv = 0
-        self.num_generators = 0
+        self.counts = {}
+        for count_type in ["loads", "lines", "transformers", "pv", "generators"]:
+            self.counts[count_type] = 0
+
         altdss.ClearAll()
         altdss('new circuit.MyCircuit')
 
@@ -52,11 +49,12 @@ def add_load_nodes(self,
             list[OpenDSS object]:
                 A list of OpenDSS objects representing the load nodes created.
         """
+
         params = params or dict()
         load_nodes = []
         for _ in range(num):
-            _make_load_node(params, load_type, self.num_loads)
-            self.num_loads += 1
+            _make_load_node(params, load_type, self.counts["loads"])
+            self.counts["loads"] += 1
 
         return load_nodes
 
@@ -108,8 +106,8 @@ def add_PVSystem(self,
 
         PV_nodes = []
         for load in load_nodes:
-            PV_nodes.append(_make_pv(load, params, num_panels, self.num_pv))
-            self.num_pv += 1
+            PV_nodes.append(_make_pv(load, params, num_panels, self.counts["pv"]))
+            self.counts["pv"] += 1
 
         return PV_nodes
 
@@ -131,8 +129,8 @@ def add_generator(self, num: int = 1, gen_type: str = "small", params: dict[str,
         params = params or dict()
         generators = []
         for _ in range(num):
-            generators.append(_make_generator(params, gen_type, count=self.num_generators))
-            self.num_generators += 1
+            generators.append(_make_generator(params, gen_type, count=self.counts["generators"]))
+            self.counts["generators"] += 1
 
         return generators
 
@@ -161,8 +159,8 @@ def add_lines(self,
         """
         params = params or dict()
         for src, dst in connections:
-            _make_line(src, dst, line_type, self.num_lines, params, transformer)
-            self.num_lines += 1
+            _make_line(src, dst, line_type, self.counts["lines"], params, transformer)
+            self.counts["lines"] += 1
 
     def solve(self):
         """Solves the OpenDSS circuit.
@@ -206,6 +204,27 @@ def clear(self):
             None
         """
         altdss.ClearAll()
-        self.num_loads = 0
-        self.num_lines = 0
-        self.num_transformers = 0
+        for key in self.counts:
+            self.counts[key] = 0
+
+    def get_load_types(self, show_ranges: bool = False):
+        """Provides list of all supported Load Types
+    
+        Args:
+            show_ranges (bool, optional):
+                Whether to show all configuration ranges in output.
+
+        Returns:
+            list:
+                A list containing all load types, if show_ranges False.
+                A list of tuples showing all load types and configurations, if show_ranges True.
+        """
+        if not show_ranges:
+            return [load_type.value for load_type in LoadType]
+
+        load_types = []
+        for load_type in LoadType:
+            config_dict = LOAD_CONFIGURATIONS[load_type]
+            load_types.append((load_type.value, config_dict))
+
+        return load_types

sim.json

@@ -0,0 +1,10 @@
+{
+    "Voltages": {
+        "source": 1795.8120400680568,
+        "load0": 140.73274057854667
+    },
+    "Losses": {
+        "Active Power Loss": 242995.00938751808,
+        "Reactive Power Loss": 505212.2611395146
+    }
+}

tests/test_circuit.py

@@ -243,3 +243,18 @@ def test_104_non_int_parameters(self):
         circuit = PyGridSim()
         with self.assertRaises(TypeError):
             circuit.add_load_nodes(params={"kV": "stringInput"})
+
+
+class TestTypeQueryFunctions(unittest.TestCase):
+
+    def setUp(self):
+        """Set up test fixtures, if any."""
+        print("\nTest", self._testMethodName)
+
+    def tearDown(self):
+        """Tear down test fixtures, if any."""
+
+    def test_200_type_queries(self):
+        circuit = PyGridSim()
+        print(circuit.get_load_types())
+        print(circuit.get_load_types(show_ranges=True))