multiple sources tests, strip spaces on string input

Author: amzhao16

pygridsim/__pycache__/__init__.cpython-310.pyc

@@ -22,7 +22,7 @@ def __init__(self):
 		altdss.ClearAll()
 		altdss('new circuit.MyCircuit')
 
-	def add_load_nodes(self, params = {}, load_type: str = "house", num = 1):
+	def add_load_nodes(self, load_type: str = "house", params = {}, num = 1):
 		"""
 		When the user wants to manually add nodes, or make nodes with varying parameters.
 
@@ -40,7 +40,7 @@ def add_load_nodes(self, params = {}, load_type: str = "house", num = 1):
 			self.num_loads += 1
 		return load_nodes
 
-	def update_source(self, params = {}, source_type: str = "turbine"):
+	def update_source(self, source_type: str = "turbine", params = {}):
 		"""
 		Adds a main voltage source if it doesn't exist, otherwise edits it
 
@@ -74,7 +74,7 @@ def add_PVSystem(self, load_nodes, params = {}, num_panels = 1):
 			self.num_pv += 1
 		return PV_nodes
 
-	def add_generator(self, num, params = {}, gen_type: GeneratorType = GeneratorType.SMALL):
+	def add_generator(self, num, gen_type: GeneratorType = GeneratorType.SMALL, params = {}):
 		"""
 		Specify parameters for a generator to add to the circuit
 

pygridsim/__pycache__/core.cpython-310.pyc

@@ -6,6 +6,19 @@
 from pygridsim.parameters import get_param, random_param, check_valid_params, get_enum_obj
 from dss.enums import LineUnits
 
+def get_kv(node_name):
+    """
+    Given a string of a node that exists, fetch its kV or raise error if doesn't exist
+    """
+    if node_name == "source":
+        return altdss.Vsource[node_name].BasekV
+    elif "load" in node_name:
+        return altdss.Load[node_name].kV
+    elif "generator" in node_name:
+        return altdss.Generator[node_name].kV
+    else:
+        raise KeyError("Invalid src or dst name")
+
 def make_line(src, dst, line_type, count, params = {}, transformer = True):
     """
     Add a line between src and dst
@@ -39,9 +52,7 @@ def make_line(src, dst, line_type, count, params = {}, transformer = True):
     transformer.XHL = get_param(params, "XHL", defaults.XHL) 
     transformer.Buses = [src, dst]
     transformer.Conns = get_param(params, "Conns", [defaults.PRIMARY_CONN, defaults.SECONDARY_CONN])
-    # TOOD: edit this for clarity
-    if src == "source":
-        transformer.kVs = [altdss.Vsource[src].BasekV, altdss.Load[dst].kV] 
-    else:
-        transformer.kVs = [altdss.Generator[src].kV, altdss.Load[dst].kV] 
+
+    transformer.kVs = [get_kv(src), get_kv(dst)]
+
     transformer.end_edit()

pygridsim/__pycache__/core.cpython-312.pyc

@@ -11,7 +11,7 @@
 def get_enum_obj(enum_class, enum_val):
     enum_obj = None
     for enum_type in enum_class:
-        if (enum_type.value == enum_val.lower()):
+        if (enum_type.value == enum_val.lower().replace(" ", "")):
             enum_obj = enum_type
     if not enum_obj:
         raise KeyError("invalid enum input")

pygridsim/__pycache__/lines.cpython-312.pyc

@@ -1,10 +1,10 @@
 {
     "Voltages": {
-        "source": 1689.9694678157916,
-        "load0": 213.88830907538258
+        "source": 2922.164017017074,
+        "load0": 130.76382218128552
     },
     "Losses": {
-        "Active Power Loss": 138083.11472325015,
-        "Reactive Power Loss": 287047.4734936169
+        "Active Power Loss": 742550.0603061075,
+        "Reactive Power Loss": 1543879.3995447825
     }
 }