fix windows component path (#1544)

* check parameters has mappingEntry

Author: arun3688

src/OMSimulatorPython/component.py

@@ -10,7 +10,7 @@ class Component:
   def __init__(self, name: CRef, fmuPath: Path | str, connectors=None, unitDefinitions=None, enumerationDefinitions=None):
     from OMSimulator.ssm import SSM
     self.name = CRef(name)
-    self.fmuPath = Path(fmuPath)
+    self.fmuPath = Path(fmuPath).as_posix()
     self.connectors = connectors or list()
     self.unitDefinitions = unitDefinitions or list()
     self.enumerationDefinitions = enumerationDefinitions or list()
@@ -40,6 +40,9 @@ def addSSVReference(self, resource1: str, resource2: str | None = None):
   def mapParameter(self, source: str, target: str):
     self.parameterMapping.mapParameter(source, target)
 
+  def hasMappingEntry(self, source: str) -> bool:
+    return str(source) in self.parameterMapping.mappingEntry
+
   def swapSSVReference(self, resource1: str, resource2: str):
     self.removeSSVReference(resource1)
     self.addSSVReference(resource2)

src/OMSimulatorPython/ssp.py

@@ -254,11 +254,15 @@ def setValue(self, cref: CRef, value, unit = None, description = None):
       raise ValueError("No active variant set in the SSP.")
 
     ## look up in the resource and get the component path
-    resource = self._getComponentResourcePath(cref)
-
+    (resource, component) = self._getComponentResourcePath(cref)
     # Check if the resource exists and validate the variable
-    fmu_inst = self.resources.get(resource)
-    if fmu_inst and not fmu_inst.varExist(cref.last()):
+    fmu_inst = self.resources.get(str(resource))
+
+    # Skip FMU variable validation if the component has a mapping entry
+    if component and component.hasMappingEntry(cref.last()):
+      pass
+    else:
+      if fmu_inst and not fmu_inst.varExist(cref.last()):
         raise KeyError(f"Variable '{cref.last()}' does not exist in the variables list of component '{resource}'")
 
     self.activeVariant.setValue(cref, value, unit, description)
@@ -268,11 +272,15 @@ def getValue(self, cref: CRef):
       raise ValueError("No active variant set in the SSP.")
 
     ## look up in the resource and get the component path
-    resource = self._getComponentResourcePath(cref)
-
+    (resource, component) = self._getComponentResourcePath(cref)
     # Check if the resource exists and validate the variable
-    fmu_inst = self.resources.get(resource)
-    if fmu_inst and not fmu_inst.varExist(cref.last()):
+    fmu_inst = self.resources.get(str(resource))
+
+    # Skip FMU variable validation if the component has a mapping entry
+    if component and component.hasMappingEntry(cref.last()):
+      pass
+    else:
+      if fmu_inst and not fmu_inst.varExist(cref.last()):
         raise KeyError(f"Variable '{cref.last()}' does not exist in the variables list of component '{resource}'")
 
     self.activeVariant.getValue(cref)

src/OMSimulatorPython/system.py

@@ -491,14 +491,14 @@ def _getComponentResourcePath(self, cref):
     ## check if element is a top level system connectors
     ## or allow non existing connectors to support parameter mapping throgh SSM inline or ssm file by checking if cref
     if self._connectorExists(cref) or cref.is_root():
-      return
+      return (None, None)
 
     if element is None:
       raise ValueError(f"Element '{element_name}' not found in System '{self.name}'")
 
     match element:
       case Component():
-        return element.fmuPath
+        return (element.fmuPath, element)
       case System():
         return element._getComponentResourcePath(cref.pop_first())
       case _:

testsuite/api/setMappingSSM3.py

@@ -22,34 +22,37 @@
 model.activeVariant.system.addConnector(Connector('input1', Causality.input, SignalType.Real))
 model.activeVariant.system.addConnector(Connector('input2', Causality.input, SignalType.Real))
 
-model.setValue(CRef('default','connector_param'), 2.0)
-model.setValue(CRef('default','connector_input'), 3.0)
-
 # map top level parameters
 model.mapParameter(CRef('default'), 'connector_param', 'param1')
 model.mapParameter(CRef('default'), 'connector_param', 'param2')
 model.mapParameter(CRef('default'), 'connector_param', 'param3')
 model.mapParameter(CRef('default'), 'connector_input', 'input1')
 model.mapParameter(CRef('default'), 'connector_input', 'input2')
 
+model.setValue(CRef('default','connector_param'), 2.0)
+model.setValue(CRef('default','connector_input'), 3.0)
+
 model.addSystem(CRef('default', 'sub-system'))
 ## add top level sub-system connector
 model.activeVariant.system.elements[CRef('sub-system')].addConnector(Connector('param2', Causality.parameter, SignalType.Real))
 model.activeVariant.system.elements[CRef('sub-system')].addConnector(Connector('input2', Causality.input, SignalType.Real))
 
-model.setValue(CRef('default', 'sub-system', 'connector_param'), 20.0)
-model.setValue(CRef('default', 'sub-system', 'connector_input'), 30.0)
 ## map sub-system parameters
 model.mapParameter(CRef('default', 'sub-system'), 'connector_param', 'param2')
 model.mapParameter(CRef('default', 'sub-system'), 'connector_input', 'input2')
 
+model.setValue(CRef('default', 'sub-system', 'connector_param'), 20.0)
+model.setValue(CRef('default', 'sub-system', 'connector_input'), 30.0)
+
 model.addResource('../resources/Modelica.Blocks.Math.Add.fmu', new_name='resources/Add.fmu')
 component1 = model.addComponent(CRef('default', 'Add1'), 'resources/Add.fmu')
-model.setValue(CRef("default", "Add1", "connector_param"), 40.0)
+
 ## map component parameters
 model.mapParameter(CRef('default', 'Add1'), 'connector_param', 'k1')
 model.mapParameter(CRef('default', 'Add1'), 'connector_param', 'k2')
 
+model.setValue(CRef("default", "Add1", "connector_param"), 40.0)
+
 model.export('setMappingSSM3.ssp')
 
 model2 = SSP('setMappingSSM3.ssp')

testsuite/simulation/SimpleSimulation14.py

@@ -35,20 +35,19 @@
 model.setSolver(CRef('default', 'sub-system', 'Gain2'), 'solver2')
 
 
-model.setValue(CRef('default','mapped_param1'), 200.0)
-model.setValue(CRef('default','mapped_input1'), 300.0)
-model.setValue(CRef('default','Gain1','mapped_Gain_k'), 2.0)
-model.setValue(CRef('default','sub-system','mapped_sub_system_input'), 400.0)
-model.setValue(CRef('default','sub-system','Gain2','mapped_sub_system_Gain2_k'), 500.0)
-
-
 # map parameters at heirarchy level
 model.mapParameter(CRef('default'), 'mapped_param1', 'param1')
 model.mapParameter(CRef('default'), 'mapped_input1', 'input1')
 model.mapParameter(CRef('default', 'Gain1'), 'mapped_Gain_k', 'k')
 model.mapParameter(CRef('default', 'sub-system'), 'mapped_sub_system_input', 'input')
 model.mapParameter(CRef('default', 'sub-system', 'Gain2'), 'mapped_sub_system_Gain2_k', 'k')
 
+model.setValue(CRef('default','mapped_param1'), 200.0)
+model.setValue(CRef('default','mapped_input1'), 300.0)
+model.setValue(CRef('default','Gain1','mapped_Gain_k'), 2.0)
+model.setValue(CRef('default','sub-system','mapped_sub_system_input'), 400.0)
+model.setValue(CRef('default','sub-system','Gain2','mapped_sub_system_Gain2_k'), 500.0)
+
 ## System.Input to Element.Input
 model.addConnection(CRef('default', 'input1'), CRef('default', 'Gain1', 'u'))
 model.addConnection(CRef('default', 'Gain1', 'y'), CRef('default', 'Add1', 'u1'))