more lint fixes

Author: amzhao16

pygridsim/core.py

@@ -13,7 +13,7 @@ def __init__(self):
 
         Instantiate an OpenDSS circuit that user can build circuit components on.
         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.
@@ -29,12 +29,15 @@ def __init__(self):
         altdss.ClearAll()
         altdss('new circuit.MyCircuit')
 
-    def add_load_nodes(self, load_type: str = "house", params: dict[str, int] = None, num: int = 1):
+    def add_load_nodes(self,
+                       load_type: str = "house",
+                       params: dict[str, int] = None,
+                       num: int = 1):
         """Adds Load Node(s) to circuit.
         
         Allows the user to add num load nodes, either with customized parameters or using a default load_type.
 
-        Args: 
+        Args:
             load_type (str, optional):
                 Load type as a string, one of "house", "commercial", "industrial". Defaults to "house".
             params (dict[str, int], optional):
@@ -75,7 +78,10 @@ def update_source(self, source_type: str = "turbine", params: dict[str, int] = N
         params = params or dict()
         return _make_source_node(params, source_type)
 
-    def add_PVSystem(self, load_nodes: list[str], params: dict[str, int] = None, num_panels: int = 1):
+    def add_PVSystem(self,
+                     load_nodes: list[str],
+                     params: dict[str, int] = None,
+                     num_panels: int = 1):
         """Adds a photovoltaic (PV) system to the specified load nodes.
 
         Adds PV system with num_panels to each of the listed load nodes.
@@ -103,10 +109,10 @@ def add_PVSystem(self, load_nodes: list[str], params: dict[str, int] = None, num
             self.num_pv += 1
 
         return PV_nodes
-    
+
     def add_generator(self, num: int = 1, gen_type: str = "small", params: dict[str, int] = None):
         """Adds generator(s) to the system.
-    
+
         Args:
             num (int, optional):
                 The number of generator units to add. Defaults to 1.
@@ -126,9 +132,12 @@ def add_generator(self, num: int = 1, gen_type: str = "small", params: dict[str,
             self.num_generators += 1
 
         return generators
-    
 
-    def add_lines(self, connections: list[tuple], line_type: str = "lv", params: dict[str, int] = None, transformer: bool = True):
+    def add_lines(self,
+                  connections: list[tuple],
+                  line_type: str = "lv",
+                  params: dict[str, int] = None,
+                  transformer: bool = True):
         """Adds lines to the system.
 
         Adds electrical lines according to the given connections.
@@ -155,18 +164,18 @@ def add_lines(self, connections: list[tuple], line_type: str = "lv", params: dic
     def solve(self):
         """Solves the OpenDSS circuit.
 
-        Initializes "solve" mode in OpenDSS, which then allows the user to query results on the circuit.
+        Initializes "solve" mode in OpenDSS, which allows user to query results on the circuit.
 
         Returns:
             None
         """
         altdss.Solution.Solve()
 
-    def results(self, queries: list[str], export_path = ""):
+    def results(self, queries: list[str], export_path=""):
         """Gets simulation results based on specified queries.
-    
+
         Allows the user to query for many results at once by providing a list of desired queries.
-        
+
         Args:
             queries (list[str]):
                 A list of queries to the circuit ("Voltages", "Losses", "TotalPower")
@@ -185,7 +194,7 @@ def results(self, queries: list[str], export_path = ""):
             _export_results(results, export_path)
 
         return results
-    
+
     def clear(self):
         """Clears the OpenDSS circuit.
 

pygridsim/defaults.py

@@ -37,7 +37,7 @@
 HV_SUBSTATION_BASE_KV = [66, 500]
 SHV_SUBSTATION_BASE_KV = [500, 1000]
 
-SOLAR_PANEL_BASE_KV = [0.2, 0.4] #per solar panel
+SOLAR_PANEL_BASE_KV = [0.2, 0.4]  # per solar panel
 """
 Generator default values (small, large, industrial)
 """

pygridsim/lines.py

@@ -39,7 +39,7 @@ def _make_line(src, dst, line_type, count, params={}, transformer=True):
     transformer: Transformer = altdss.Transformer.new('transformer' + str(count))
     transformer.Phases = defaults.PHASES
     transformer.Windings = defaults.NUM_WINDINGS
-    transformer.XHL = _get_param(params, "XHL", defaults.XHL) 
+    transformer.XHL = _get_param(params, "XHL", defaults.XHL)
     transformer.Buses = [src, dst]
     transformer.Conns = _get_param(params, "Conns",
                                    [defaults.PRIMARY_CONN, defaults.SECONDARY_CONN])

pygridsim/parameters.py

@@ -91,7 +91,7 @@ def _make_generator(params, gen_type, count):
     _check_valid_params(params, defaults.VALID_GENERATOR_PARAMS)
     gen_type_obj = _get_enum_obj(GeneratorType, gen_type)
 
-    generator : Generator = altdss.Generator.new('generator' + str(count))
+    generator: Generator = altdss.Generator.new('generator' + str(count))
     generator.Bus1 = 'generator' + str(count)
     generator.Phases = _get_param(params, "phases", defaults.PHASES)
     for attr in ["kV", "kW"]:

tests/test_circuit.py

@@ -111,7 +111,7 @@ def test_009_generator(self):
         circuit.add_lines([("source", "load0"), ("generator0", "load0")])
         circuit.solve()
         print(circuit.results(["Voltages", "Losses"]))
-    
+
     def test_010_many_sources(self):
         circuit = PyGridSim()
         circuit.update_source(source_type="powerplant")
@@ -137,7 +137,7 @@ def test_011_configs(self):
         # don't want loadtype input, just string
         with self.assertRaises(Exception):
             circuit.add_load_nodes(num=2, load_type=LoadType.HOUSE)
-        
+
         # LINE CONFIG
         # works, because not case sensitive
         circuit.add_lines([("source", "load0")], line_type="HV")
@@ -178,19 +178,20 @@ def tearDown(self):
     def test_100_one_source_one_load(self):
         circuit = PyGridSim()
         circuit.update_source(params={"kV": 100, "R0": 0.1, "R1": 0.2, "X0": 0.3, "X1": 0.4})
-        circuit.add_load_nodes(num=1, params={"kV": 10, "kW": 20, "kvar":1})
+        circuit.add_load_nodes(num=1, params={"kV": 10, "kW": 20, "kvar": 1})
         circuit.add_lines([("source", "load0")], params={"length": 20})
         circuit.solve()
         print(circuit.results(["Voltages", "Losses"]))
         circuit.clear()
 
     def test_100_one_source_multi_load(self):
         """
-        Creates 10 loads, some of which are connected to source. All loads and lines here have the same params.
+        Creates 10 loads, some of which are connected to source.
+        All loads and lines here have the same params.
         """
         circuit = PyGridSim()
         circuit.update_source(params={"kV": 100})
-        circuit.add_load_nodes(num=10, params={"kV": 10, "kW": 20, "kvar":1})
+        circuit.add_load_nodes(num=10, params={"kV": 10, "kW": 20, "kvar": 1})
         circuit.add_lines([("source", "load0"), ("source", "load4"), ("source", "load6")],
                           params={"length": 20})
         circuit.solve()
@@ -207,7 +208,7 @@ def test_101_bad_parameter(self):
         with self.assertRaises(KeyError):
             circuit.add_load_nodes(num=4, params={"badParam": 100})
         # add load nodes so we can test pv system erroring
-        circuit.add_load_nodes(num=2, params={"kV": 10, "kW": 20, "kvar":1})
+        circuit.add_load_nodes(num=2, params={"kV": 10, "kW": 20, "kvar": 1})
         with self.assertRaises(KeyError):
             circuit.add_generator(num=4, params={"badParam": 100})
         with self.assertRaises(KeyError):