fix: linting /cleaning

andoludo · Aug 28, 2024 · fbc40da · fbc40da
1 parent e8181ef
commit fbc40da
Show file tree

Hide file tree

Showing 61 changed files with 311 additions and 904 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -44,6 +44,7 @@ types-beautifulsoup4 = "^4.12.0.20240229"
 pytest-mongo = "^3.1.0"
 networkx-stubs = "^0.0.1"
 pytest-ordering = "^0.6"
+types-pyyaml = "^6.0.12.20240808"
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/tests/data/buildings_free_float_single_zone.mo b/tests/data/buildings_free_float_single_zone.mo
@@ -412,7 +412,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_1, occSch2.occupied);
  end OccupancyOccupancy_0;
- 
+
         model DataServer
 replaceable package Medium = Modelica.Media.Interfaces.PartialMedium;
 Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor[1]
@@ -436,7 +436,7 @@ connect(port_a[1], TRoo1[1].port);
 connect(dataBus.TZonSpace_1, TRoo[1].T);
 connect(dataBus.ppmCO2Space_1, TRoo1[1].ppm);
 end DataServer;
-      
+
 
 
       partial model PartialBoilerControl
@@ -2153,11 +2153,11 @@ model building
         tauIR=0.0,
         absIR_a=0.84,
         absIR_b=0.84)
-        
+
     },
     final gas={
             Buildings.HeatTransfer.Data.Gases.Air(x=0.0127)
-            
+
     },
     UFra=1.4)
     annotation (
@@ -2275,4 +2275,4 @@ smooth=Smooth.None));annotation (Diagram(coordinateSystem(extent={{-249.65839091
 end building;
 
 
-end buildings_free_float_single_zone;
+end buildings_free_float_single_zone;
diff --git a/tests/data/buildings_free_float_single_zone_with_data.mo b/tests/data/buildings_free_float_single_zone_with_data.mo
@@ -412,7 +412,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_1, occSch2.occupied);
  end OccupancyOccupancy_0;
- 
+
         model DataServer
 replaceable package Medium = Modelica.Media.Interfaces.PartialMedium;
 Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor[1]
@@ -443,7 +443,7 @@ connect(port_a[1], TRoo1[1].port);
 connect(dataBus.TZonSpace_1, TRoo[1].T);
 connect(dataBus.ppmCO2Space_1, TRoo1[1].ppm);
 end DataServer;
-      
+
 
 
       partial model PartialBoilerControl
@@ -2160,11 +2160,11 @@ model building
         tauIR=0.0,
         absIR_a=0.84,
         absIR_b=0.84)
-        
+
     },
     final gas={
             Buildings.HeatTransfer.Data.Gases.Air(x=0.0127)
-            
+
     },
     UFra=1.4)
     annotation (
@@ -2282,4 +2282,4 @@ smooth=Smooth.None));annotation (Diagram(coordinateSystem(extent={{-250.0,-233.4
 end building;
 
 
-end buildings_free_float_single_zone_with_data;
+end buildings_free_float_single_zone_with_data;
diff --git a/tests/data/buildings_free_float_three_zones.mo b/tests/data/buildings_free_float_three_zones.mo
@@ -412,7 +412,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_1, occSch2.occupied);
  end OccupancyOccupancy_0;
- 
+
         model OccupancyOccupancy_1
 extends buildings_free_float_three_zones.Common.Occupancy.SimpleOccupancy ;
 Controls.BaseClasses.DataBus dataBus
@@ -421,7 +421,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_2, occSch2.occupied);
  end OccupancyOccupancy_1;
- 
+
         model OccupancyOccupancy_2
 extends buildings_free_float_three_zones.Common.Occupancy.SimpleOccupancy ;
 Controls.BaseClasses.DataBus dataBus
@@ -430,7 +430,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_3, occSch2.occupied);
  end OccupancyOccupancy_2;
- 
+
         model DataServer
 replaceable package Medium = Modelica.Media.Interfaces.PartialMedium;
 Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor[3]
@@ -462,7 +462,7 @@ connect(dataBus.ppmCO2Space_1, TRoo1[1].ppm);
 connect(dataBus.ppmCO2Space_2, TRoo1[2].ppm);
 connect(dataBus.ppmCO2Space_3, TRoo1[3].ppm);
 end DataServer;
-      
+
 
 
       partial model PartialBoilerControl
@@ -2179,11 +2179,11 @@ model building
         tauIR=0.0,
         absIR_a=0.84,
         absIR_b=0.84)
-        
+
     },
     final gas={
             Buildings.HeatTransfer.Data.Gases.Air(x=0.0127)
-            
+
     },
     UFra=1.4)
     annotation (
@@ -2509,4 +2509,4 @@ smooth=Smooth.None));annotation (Diagram(coordinateSystem(extent={{-249.56655301
 end building;
 
 
-end buildings_free_float_three_zones;
+end buildings_free_float_three_zones;
diff --git a/tests/data/buildings_free_float_two_zones.mo b/tests/data/buildings_free_float_two_zones.mo
@@ -412,7 +412,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_1, occSch2.occupied);
  end OccupancyOccupancy_0;
- 
+
         model OccupancyOccupancy_1
 extends buildings_free_float_two_zones.Common.Occupancy.SimpleOccupancy ;
 Controls.BaseClasses.DataBus dataBus
@@ -421,7 +421,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_2, occSch2.occupied);
  end OccupancyOccupancy_1;
- 
+
         model DataServer
 replaceable package Medium = Modelica.Media.Interfaces.PartialMedium;
 Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor[2]
@@ -449,7 +449,7 @@ connect(dataBus.TZonSpace_2, TRoo[2].T);
 connect(dataBus.ppmCO2Space_1, TRoo1[1].ppm);
 connect(dataBus.ppmCO2Space_2, TRoo1[2].ppm);
 end DataServer;
-      
+
 
 
       partial model PartialBoilerControl
@@ -2166,11 +2166,11 @@ model building
         tauIR=0.0,
         absIR_a=0.84,
         absIR_b=0.84)
-        
+
     },
     final gas={
             Buildings.HeatTransfer.Data.Gases.Air(x=0.0127)
-            
+
     },
     UFra=1.4)
     annotation (
@@ -2382,4 +2382,4 @@ smooth=Smooth.None));annotation (Diagram(coordinateSystem(extent={{-229.66501508
 end building;
 
 
-end buildings_free_float_two_zones;
+end buildings_free_float_two_zones;
diff --git a/tests/data/buildings_simple_hydronic.mo b/tests/data/buildings_simple_hydronic.mo
@@ -467,7 +467,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_1, occSch2.occupied);
  end OccupancyOccupancy_0;
- 
+
         model ThreeWayValveControlThree_way_valve_control
   Buildings.Controls.OBC.CDL.Reals.PIDWithReset
                                       conVal(
@@ -505,7 +505,7 @@ connect(dataBus.TAirOutBoiler, lesThrTOut.u);
 connect(dataBus.yBoiConBoiler, booToReaBoi.y);
 connect(dataBus.yPumBoiBoiler, booToReaPum.y);
      end BoilerControlBoiler_control;
-     
+
         model CollectorControlPump_control
 Buildings.Controls.OBC.CDL.Reals.PIDWithReset
 conPum(    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
@@ -586,7 +586,7 @@ TAirOutBoiler_control.y);
 connect(dataBus.triggerThree_way_valve_control,
 triggerThree_way_valve_control.y);
 end DataServer;
-      
+
 
 
       partial model PartialBoilerControl
@@ -1018,7 +1018,7 @@ connect(dataBus.yPumBoiBoiler, pumBoi.y);
 connect(dataBus.TStoTopBoiler, tanTemTop.T);
 connect(dataBus.TStoBotBoiler, tanTemBot.T);
      end BoilerWithStorageBoiler;
-     
+
 
   end Boilers;
 
@@ -2214,7 +2214,7 @@ connect(dataBus.yPump, pumRad.y);
 connect(dataBus.y_gainPump, gain.y);
 connect(dataBus.TPump_control, temSup.T);
  end PumpPump;
- 
+
 
     end Ventilation;
   end Fluid;
@@ -2326,11 +2326,11 @@ model building
         tauIR=0.0,
         absIR_a=0.84,
         absIR_b=0.84)
-        
+
     },
     final gas={
             Buildings.HeatTransfer.Data.Gases.Air(x=0.0127)
-            
+
     },
     UFra=1.4)
     annotation (
@@ -2709,4 +2709,4 @@ smooth=Smooth.None));annotation (Diagram(coordinateSystem(extent={{-400.0,-425.0
 end building;
 
 
-end buildings_simple_hydronic;
+end buildings_simple_hydronic;
diff --git a/tests/data/buildings_simple_hydronic_three_zones.mo b/tests/data/buildings_simple_hydronic_three_zones.mo
@@ -467,7 +467,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_1, occSch2.occupied);
  end OccupancyOccupancy_0;
- 
+
         model EmissionControlEmission_valve_control_2
   parameter Real schedule[:]=3600*{7,19};
 
@@ -531,7 +531,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_2, occSch2.occupied);
  end OccupancyOccupancy_1;
- 
+
         model EmissionControlEmission_valve_control_3
   parameter Real schedule[:]=3600*{7,19};
 
@@ -595,7 +595,7 @@ Controls.BaseClasses.DataBus dataBus
 equation
 connect(dataBus.OccupiedSpace_3, occSch2.occupied);
  end OccupancyOccupancy_2;
- 
+
         model ThreeWayValveControlThree_way_valve_control
   Buildings.Controls.OBC.CDL.Reals.PIDWithReset
                                       conVal(
@@ -658,7 +658,7 @@ connect(dataBus.TAirOutBoiler, lesThrTOut.u);
 connect(dataBus.yBoiConBoiler, booToReaBoi.y);
 connect(dataBus.yPumBoiBoiler, booToReaPum.y);
      end BoilerControlBoiler_control;
-     
+
         model CollectorControlPump_control
 Buildings.Controls.OBC.CDL.Reals.PIDWithReset
 conPum(    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
@@ -769,7 +769,7 @@ triggerThree_way_valve_control_2.y);
 connect(dataBus.triggerThree_way_valve_control,
 triggerThree_way_valve_control.y);
 end DataServer;
-      
+
 
 
       partial model PartialBoilerControl
@@ -1201,7 +1201,7 @@ connect(dataBus.yPumBoiBoiler, pumBoi.y);
 connect(dataBus.TStoTopBoiler, tanTemTop.T);
 connect(dataBus.TStoBotBoiler, tanTemBot.T);
      end BoilerWithStorageBoiler;
-     
+
 
   end Boilers;
 
@@ -2397,7 +2397,7 @@ connect(dataBus.yPump, pumRad.y);
 connect(dataBus.y_gainPump, gain.y);
 connect(dataBus.TPump_control, temSup.T);
  end PumpPump;
- 
+
 
     end Ventilation;
   end Fluid;
@@ -2509,11 +2509,11 @@ model building
         tauIR=0.0,
         absIR_a=0.84,
         absIR_b=0.84)
-        
+
     },
     final gas={
             Buildings.HeatTransfer.Data.Gases.Air(x=0.0127)
-            
+
     },
     UFra=1.4)
     annotation (
@@ -3334,4 +3334,4 @@ smooth=Smooth.None));annotation (Diagram(coordinateSystem(extent={{-400.0,-425.0
 end building;
 
 
-end buildings_simple_hydronic_three_zones;
+end buildings_simple_hydronic_three_zones;