Some bug fixes and added more test FMUs

INTO-CPS-Association · Jan 17, 2024 · c4c2a9b · c4c2a9b
1 parent 109e104
commit c4c2a9b
Show file tree

Hide file tree

Showing 6 changed files with 2,752 additions and 6 deletions.
diff --git a/fmi2/rule-model/Common.vdmsl b/fmi2/rule-model/Common.vdmsl
@@ -101,7 +101,7 @@ functions
 		elseif is_(v, Integer) or is_(v, IntegerType) then <Integer>
 		elseif is_(v, Boolean) or is_(v, BooleanType) then <Boolean>
 		elseif is_(v, String)  or is_(v, StringType)  then <String>
-		elseif is_(v, Enumeration) or is_(v, EnumerationType) then <Integer>	-- NOTE!!
+		elseif is_(v, Enumeration) or is_(v, EnumerationType) then <Enumeration>
 		else undefined;
 
 	/**

diff --git a/fmi2/rule-model/FMIModelDescription.vdmsl b/fmi2/rule-model/FMIModelDescription.vdmsl
@@ -60,6 +60,7 @@ types
 			-- The rules are defined in FmiModelDescription.adoc
 			validMinMax(fmd, evs),
 			validStart(fmd, evs),
+			validAliasNames(evs),
 			validMultipleSets(fmd, evs),
 			validVariableUnits(fmd, evs),
 			validOutputs(fmd, evs),

diff --git a/fmi2/rule-model/ModelVariables.vdmsl b/fmi2/rule-model/ModelVariables.vdmsl
@@ -32,6 +32,5 @@ types
 	([
 		-- Rules are defined in ModelVariables.adoc
 		validModelVariables(mvs),
-		validAliasNames(mvs),
 		validIndependentVariable(mvs)
 	]);