Use declared type for enumeration parameters (#42)

Author: t-sommer

modelica_fmi/src/modelica_fmi/_lib.py

@@ -164,16 +164,6 @@ def modifiers(variable: ModelVariable, start: bool = False):
     return ""
 
 
-def choices(variable: ModelVariable) -> str:
-    if variable.type == "Enumeration":
-        choices = [
-            f'choice={item.value} "{item.name}"' for item in variable.declaredType.items
-        ]
-        return " annotation(choices(" + ", ".join(choices) + "))"
-    else:
-        return ""
-
-
 def dependencies(
     model_description: ModelDescription, variable: ModelVariable, type, nValues=False
 ):

modelica_fmi/src/modelica_fmi/import_fmu_to_modelica.py

@@ -8,7 +8,6 @@
     fmi2_type,
     fmi3_type,
     modifiers,
-    choices,
     dependencies,
     dependencies2,
     dependencies3,
@@ -189,7 +188,6 @@ def import_fmu_to_modelica(
             "modelica_type": modelica_type,
             "fmi_type": fmi2_type if fmiMajorVersion == 2 else fmi3_type,
             "modifiers": modifiers,
-            "choices": choices,
             "name": name,
             "dependencies": lambda *args, **kwargs: dependencies(
                 model_description, *args, **kwargs

modelica_fmi/src/modelica_fmi/templates/FMI3_CS.mo

@@ -100,9 +100,9 @@ initial algorithm
     startTime := time;
 @@ for variable in parameters @@
 @@ if not variable.dimensions @@
-    FMI3Set@=fmi_type(variable)=@(instance, valueReferences={@=variable.valueReference=@}, values={@=name(variable)=@});
+    FMI3Set@=fmi_type(variable)=@(instance, valueReferences={@=variable.valueReference=@}, values=@@ if variable.type == 'Enumeration' @@Types.@= variable.declaredType.name =@ToInt64(@@ endif @@{@=name(variable)=@}@@ if variable.type == 'Enumeration' @@)@@ endif @@);
 @@ elif variable.dimensions|length == 1 @@
-    FMI3Set@=fmi_type(variable)=@(instance, valueReferences={@=variable.valueReference=@}, values=@=name(variable)=@);
+    FMI3Set@=fmi_type(variable)=@(instance, valueReferences={@=variable.valueReference=@}, values=@@ if variable.type == 'Enumeration' @@Types.@= variable.declaredType.name =@ToInt64(@@ endif @@@=name(variable)=@@@ if variable.type == 'Enumeration' @@)@@ endif @@);
 @@ else @@
     FMI3Set@=fmi_type(variable)=@Matrix(instance, valueReferences={@=variable.valueReference=@}, values=@=name(variable)=@, nValues=@=numel(variable)=@);
 @@ endif @@

modelica_fmi/src/modelica_fmi/templates/FMU.mo

@@ -85,7 +85,7 @@ block @=modelName=@
   parameter Modelica.Units.SI.Time communicationStepSize = @=communicationStepSize=@ annotation(Dialog(tab="FMI", group="Parameters"));
 @@ for variable in parameters @@
 
-  parameter @=fmi_type(variable, prefix=True)=@ @=name(variable)=@@@ if variable.dimensions @@@=subscripts(variable)=@@@ endif @@@=modifiers(variable)=@ = @=start_value(variable)=@@@ if variable.description @@ "@=variable.description=@"@@ endif @@@=choices(variable)=@;
+  parameter @=fmi_type(variable, prefix=True, declared=True)=@ @=name(variable)=@@@ if variable.dimensions @@@=subscripts(variable)=@@@ endif @@@=modifiers(variable)=@ = @=start_value(variable)=@@@ if variable.description @@ "@=variable.description=@"@@ endif @@;
 @@ endfor @@
 @@ block inputs @@
 @@ endblock @@