pre-commit run --all-files

src/ospx/__init__.py

@@ -1,4 +1,5 @@
-"""ospx package"""
+"""ospx package."""
+
 from ospx.simulation import Simulation as Simulation
 from ospx.connector import Connector as Connector
 from ospx.connection import (

src/ospx/cli/importSystemStructure.py

@@ -96,8 +96,7 @@ def main() -> None:
         return
 
     logger.info(
-        f"Start importSystemStructure.py with following arguments:\n"
-        f"\t system_structure_file: \t{system_structure_file}"
+        f"Start importSystemStructure.py with following arguments:\n\t system_structure_file: \t{system_structure_file}"
     )
 
     # Invoke API

src/ospx/graph.py

@@ -144,22 +144,22 @@ def generate_dependency_graph(case: OspSimulationCase) -> None:
                 style = "dashed"
                 color = "#003399"
                 fontcolor = "#003399"
-                penwidth = ("%i" % 1,)
-                weight = ("%i" % 1,)
+                penwidth = (f"{1:d}",)
+                weight = (f"{1:d}",)
 
             elif re.search(basic_op_names, from_key, re.IGNORECASE):
                 style = "filled"
                 color = "#995566"
                 fontcolor = "#663344"
-                penwidth = ("%i" % 3,)
+                penwidth = (f"{3:d}",)
                 weight = (f"{0.66:.2f}",)
 
             else:
                 style = "bold"
                 color = "black"
                 fontcolor = "black"
-                penwidth = ("%i" % int(round((2) ** 1.5, 0)),)
-                weight = ("%i" % int(round((2) ** 1.5, 0)),)
+                penwidth = (f"{int(round((2) ** 1.5, 0))}",)
+                weight = (f"{int(round((2) ** 1.5, 0))}",)
 
             callgraph.edge(
                 from_key,

src/ospx/ospSimulationCase.py

@@ -527,13 +527,13 @@ def _inspect(self) -> None:
         delim = "\t" * 3
 
         log_string = (
-            f"Components and related FMUs as defined in {self.case_dict.name}\n" f"\tcomponent{delim}fmu{delim}\n\n"
+            f"Components and related FMUs as defined in {self.case_dict.name}\n\tcomponent{delim}fmu{delim}\n\n"
         )
         for component_name, component in self.system_structure.components.items():
             log_string += f"\t{component_name}{delim}{component.fmu.file.name}\n"
         logger.info(log_string + "\n")
 
-        log_string = f"FMU attributes defined in the fmu's modelDescription.xml\n" f"\tfmu{delim}attributes{delim}"
+        log_string = f"FMU attributes defined in the fmu's modelDescription.xml\n\tfmu{delim}attributes{delim}"
         for fmu_name, fmu in self.system_structure.fmus.items():
             log_string += f"\n\n\t{fmu_name}\n"
             fmu_attributes = "\n".join(
@@ -562,9 +562,7 @@ def _inspect(self) -> None:
             log_string += unit_definitions
         logger.info(log_string + "\n")
 
-        log_string = (
-            f"Variables defined in the fmu's modelDescription.xml\n" f"\tfmu{delim}variable{delim}type{delim}unit"
-        )
+        log_string = f"Variables defined in the fmu's modelDescription.xml\n\tfmu{delim}variable{delim}type{delim}unit"
         logger.info(log_string + "\n")
         for fmu_name, fmu in self.system_structure.fmus.items():
             log_string = f"\t{fmu_name}\n"

src/ospx/utils/zip.py

@@ -128,7 +128,7 @@ def substitute_text_in_zip(
                     temp = zip_read.read(item.filename)
                     source = (re.findall(subst[0], str(temp)))[0]
                     if not str(source):
-                        logger.warning(f'substitution source is empty:\'{" ".join(source)}\'')
+                        logger.warning(f"substitution source is empty:'{' '.join(source)}'")
                     temp = temp.replace(bytes(source, "utf-8"), bytes(subst[1], "utf-8"))
                     zip_write.writestr(item, temp)
 

tests/gunnerus-dp/config/control-system/OspSystemStructure.xml

@@ -17,7 +17,7 @@
             <VariableGroup simulator="box_reference" name="position_setpoint"/>
             <VariableGroup simulator="reference_model" name="position_setpoint"/>
         </VariableGroupConnection>
-        
+
        <VariableGroupConnection>
             <VariableGroup simulator="reference_model" name="desired_position"/>
             <VariableGroup simulator="dp_controller" name="position_setpoint"/>
@@ -37,7 +37,7 @@
             <VariableGroup simulator="dp_controller" name="thrust_command"/>
             <VariableGroup simulator="simulator_communication" name="thrust_command"/>
         </VariableGroupConnection>
-        
+
        <VariableGroupConnection>
             <VariableGroup simulator="simulator_communication" name="position_3dof"/>
             <VariableGroup simulator="dp_controller" name="position_3dof"/>

tests/gunnerus-dp/config/control-system/PlotConfig.json

@@ -11,7 +11,7 @@
           {
             "simulator": "simulator_communication",
             "variable": "Measured_Position[1]"
-          }, 
+          },
           {
             "simulator": "reference_model",
             "variable": "Position_Setpoint[2]"

tests/gunnerus-dp/config/simulator/OspSystemStructure.xml

@@ -17,7 +17,7 @@
             <VariableGroup simulator="thruster_dynamics" name="thrust"/>
             <VariableGroup simulator="vessel_model" name="thrust"/>
         </VariableGroupConnection>
-        
+
        <VariableGroupConnection>
             <VariableGroup simulator="current_model" name="current_velocity"/>
             <VariableGroup simulator="vessel_model" name="current_velocity"/>
@@ -27,7 +27,7 @@
             <VariableGroup simulator="vessel_model" name="position_3dof"/>
             <VariableGroup simulator="control_system_communication" name="position_3dof"/>
         </VariableGroupConnection>
-        
+
        <VariableGroupConnection>
             <VariableGroup simulator="vessel_model" name="velocity"/>
             <VariableGroup simulator="control_system_communication" name="velocity"/>
@@ -42,6 +42,6 @@
             <VariableGroup simulator="control_system_communication" name="thrust_command"/>
             <VariableGroup simulator="thruster_dynamics" name="thrust_command"/>
         </VariableGroupConnection>
-        
+
     </Connections>
 </OspSystemStructure>

tests/gunnerus-dp/config/simulator/PlotConfig.json

@@ -11,7 +11,7 @@
           {
             "simulator": "vessel_model",
             "variable": "Vessel_Position[1]"
-          } 
+          }
         ]
       },
       {

tests/gunnerus-dp/config/single-system/OspSystemStructure.xml

@@ -19,7 +19,7 @@
             <VariableGroup simulator="box_reference" name="position_setpoint"/>
             <VariableGroup simulator="reference_model" name="position_setpoint"/>
         </VariableGroupConnection>
-        
+
        <VariableGroupConnection>
             <VariableGroup simulator="reference_model" name="desired_position"/>
             <VariableGroup simulator="dp_controller" name="position_setpoint"/>
@@ -39,7 +39,7 @@
             <VariableGroup simulator="dp_controller" name="thrust_command"/>
             <VariableGroup simulator="thruster_dynamics" name="thrust_command"/>
         </VariableGroupConnection>
-        
+
        <VariableGroupConnection>
             <VariableGroup simulator="vessel_model" name="position_3dof"/>
             <VariableGroup simulator="dp_controller" name="position_3dof"/>
@@ -54,11 +54,11 @@
             <VariableGroup simulator="thruster_dynamics" name="thrust"/>
             <VariableGroup simulator="vessel_model" name="thrust"/>
         </VariableGroupConnection>
-        
+
        <VariableGroupConnection>
             <VariableGroup simulator="current_model" name="current_velocity"/>
             <VariableGroup simulator="vessel_model" name="current_velocity"/>
         </VariableGroupConnection>
-             
+
     </Connections>
 </OspSystemStructure>

tests/gunnerus-dp/config/single-system/PlotConfig.json

@@ -11,7 +11,7 @@
           {
             "simulator": "vessel_model",
             "variable": "Vessel_Position[1]"
-          }, 
+          },
           {
             "simulator": "reference_model",
             "variable": "Position_Setpoint[2]"

tests/gunnerus-dp/fmus/BoxReference_OspModelDescription.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <OspModelDescription xmlns="https://open-simulation-platform.com/OspModelDescription/1.0.0" version="1.0">
-    
+
     <UnitDefinitions>
         <Unit name="m">
             <BaseUnit kg="0" m="1" s="0" A="0" K="0" mol="0" cd="0" rad="0" factor="1.0" offset="0.0"/>
@@ -9,9 +9,9 @@
             <BaseUnit kg="0" m="0" s="0" A="0" K="0" mol="0" cd="0" rad="1" factor="1.0" offset="0.0"/>
         </Unit>
     </UnitDefinitions>
-    
+
     <VariableGroups>
-        
+
         <Generic name="position_setpoint">
             <LinearDisplacement name="linear_setpoint">
                 <Variable ref="Position_Setpoint[1]" unit="m"/>
@@ -21,6 +21,6 @@
                 <Variable ref="Position_Setpoint[3]" unit="rad"/>
             </AngularDisplacement>
         </Generic>
-        
+
     </VariableGroups>
 </OspModelDescription>

tests/gunnerus-dp/fmus/ControlSystemCommunication_OspModelDescription.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <OspModelDescription xmlns="https://open-simulation-platform.com/OspModelDescription/1.0.0" version="1.0">
-    
+
     <UnitDefinitions>
         <Unit name="m">
             <BaseUnit kg="0" m="1" s="0" A="0" K="0" mol="0" cd="0" rad="0" factor="1.0" offset="0.0"/>
@@ -21,9 +21,9 @@
             <BaseUnit kg="1" m="2" s="-2" A="0" K="0" mol="0" cd="0" rad="0" factor="1.0" offset="0.0"/>
         </Unit>
     </UnitDefinitions>
-    
+
     <VariableGroups>
-        
+
         <Generic name="position_3dof">
             <LinearDisplacement name="linear_vessel_position">
                 <Variable ref="Measured_Position[1]" unit="m"/>
@@ -45,15 +45,15 @@
         </Generic>
 
         <Generic name="acceleration_3dof">
-            <LinearAcceleration name="linear_vessel_acceleration">    
+            <LinearAcceleration name="linear_vessel_acceleration">
                 <Variable ref="Measured_Acceleration[1]"/>
                 <Variable ref="Measured_Acceleration[2]"/>
             </LinearAcceleration>
             <AngularAcceleration name="angular_vessel_acceleration">
                 <Variable ref="Measured_Acceleration[3]"/>
             </AngularAcceleration>
         </Generic>
-        
+
         <Generic name="wind_measurements">
             <LinearVelocity name="linear_wind_velocity">
                 <Variable ref="Measured_Wind[1]" unit="m/s"/>
@@ -63,7 +63,7 @@
                 <Variable ref="Measured_Wind[3]" unit="rad/s"/>
             </AngularVelocity>
         </Generic>
-        
+
         <Generic name="thrust_command">
             <Force name="linear_force_command">
                 <Variable ref="Commanded_Thrust[1]" unit="N"/>

tests/gunnerus-dp/fmus/CurrentModel_OspModelDescription.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <OspModelDescription xmlns="https://open-simulation-platform.com/OspModelDescription/1.0.0" version="1.0">
-        
+
     <UnitDefinitions>
         <Unit name="m/s">
             <BaseUnit kg="0" m="1" s="-1" A="0" K="0" mol="0" cd="0" rad="0" factor="1.0" offset="0.0"/>
@@ -9,7 +9,7 @@
             <BaseUnit kg="0" m="0" s="-1" A="0" K="0" mol="0" cd="0" rad="1" factor="1.0" offset="0.0"/>
         </Unit>
     </UnitDefinitions>
-    
+
     <VariableGroups>
         <Generic name="current_velocity">
             <LinearVelocity name="linear_current_velocity">

tests/gunnerus-dp/fmus/DPController_OspModelDescription.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <OspModelDescription xmlns="https://open-simulation-platform.com/OspModelDescription/1.0.0" version="1.0">
-    
+
     <UnitDefinitions>
         <Unit name="m">
             <BaseUnit kg="0" m="1" s="0" A="0" K="0" mol="0" cd="0" rad="0" factor="1.0" offset="0.0"/>
@@ -21,7 +21,7 @@
             <BaseUnit kg="1" m="2" s="-2" A="0" K="0" mol="0" cd="0" rad="0" factor="1.0" offset="0.0"/>
         </Unit>
     </UnitDefinitions>
-    
+
     <VariableGroups>
         <Generic name="position_3dof">
             <LinearDisplacement name="linear_vessel_position">
@@ -62,7 +62,7 @@
                 <Variable ref="Velocity_Setpoint[3]" unit="rad/s"/>
             </AngularVelocity>
         </Generic>
-        
+
         <Generic name="acceleration_setpoint">
             <LinearAcceleration name="linear_acceleration_setpoint">
                 <Variable ref="Acceleration_Setpoint[1]"/>
@@ -82,6 +82,6 @@
                 <Variable ref="Commanded_Thrust[3]" unit="N.m"/>
             </Torque>
         </Generic>
-        
+
     </VariableGroups>
 </OspModelDescription>

tests/gunnerus-dp/fmus/ReferenceModel_OspModelDescription.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <OspModelDescription xmlns="https://open-simulation-platform.com/OspModelDescription/1.0.0" version="1.0">
-    
+
     <UnitDefinitions>
         <Unit name="m">
             <BaseUnit kg="0" m="1" s="0" A="0" K="0" mol="0" cd="0" rad="0" factor="1.0" offset="0.0"/>
@@ -15,9 +15,9 @@
             <BaseUnit kg="0" m="0" s="-1" A="0" K="0" mol="0" cd="0" rad="1" factor="1.0" offset="0.0"/>
         </Unit>
     </UnitDefinitions>
-    
+
     <VariableGroups>
-        
+
         <Generic name="position_setpoint">
             <LinearDisplacement name="linear_position_setpoint">
                 <Variable ref="Position_Setpoint[1]" unit="m"/>
@@ -37,7 +37,7 @@
                 <Variable ref="Desired_Position[3]" unit="rad"/>
             </AngularDisplacement>
         </Generic>
-        
+
         <Generic name="desired_velocity">
             <LinearVelocity name="linear_desired_velocity">
                 <Variable ref="Desired_Velocity[1]" unit="m/s"/>
@@ -47,7 +47,7 @@
                 <Variable ref="Desired_Velocity[3]" unit="rad/s"/>
             </AngularVelocity>
         </Generic>
-        
+
         <Generic name="desired_acceleration">
             <LinearAcceleration name="linear_desired_acceleration">
                 <Variable ref="Desired_Acceleration[1]"/>
@@ -57,6 +57,6 @@
                 <Variable ref="Desired_Acceleration[3]"/>
             </AngularAcceleration>
         </Generic>
-        
+
     </VariableGroups>
 </OspModelDescription>