SKA-1004: handle Collection type (#189)

Author: KyllianAubry

FmuImporter/FmiBridge/FmiModel/Internal/ModelDescription.cs

@@ -79,7 +79,7 @@ public ModelDescription(Fmi3.fmiModelDescription input, Action<LogSeverity, stri
     CoSimulation = new CoSimulation(input.CoSimulation);
 
     DefaultExperiment = new DefaultExperiment(input.DefaultExperiment);
-    if (input.UnitDefinitions != null)
+    if (input.UnitDefinitions.Count > 0)
     {
       InitUnitMap(input.UnitDefinitions);
     }
@@ -123,25 +123,25 @@ public ModelDescription(Fmi2.fmiModelDescription input, Action<LogSeverity, stri
         : VariableNamingConventions.Flat;
 
     // Node init
-    if (input.CoSimulation == null || input.CoSimulation.Count < 1)
+    if (input.CoSimulation.Count < 1)
     {
       throw new ModelDescriptionException("The model description does not provide a CoSimulation description.");
     }
 
     CoSimulation = new CoSimulation(input.CoSimulation[0]);
     DefaultExperiment = new DefaultExperiment(input.DefaultExperiment);
 
-    if (input.UnitDefinitions != null)
+    if (input.UnitDefinitions.Count > 0)
     {
       InitUnitMap(input.UnitDefinitions);
     }
 
-    if (input.TypeDefinitions != null)
+    if (input.TypeDefinitions.Count > 0)
     {
       InitTypeDefMap(input.TypeDefinitions);
     }
 
-    if (input.ModelVariables != null)
+    if (input.ModelVariables.Count > 0)
     {
       InitVariableMap(input.ModelVariables, logCallback);
     }
@@ -322,7 +322,7 @@ private void InitVariableMap(Fmi3.fmiModelDescriptionModelVariables input, Actio
   {
     void Process<T>(System.Collections.ObjectModel.Collection<T> vars) where T : Fmi3.fmi3AbstractVariable
     {
-      if (vars == null)
+      if (vars.Count == 0)
       {
         return;
       }

FmuImporter/FmiBridge/FmiModel/Internal/ModelStructure.cs

@@ -20,7 +20,7 @@ public ModelStructure(
     ValidateDependencies(fmiModelDescriptionModelStructure.InitialUnknowns);
 
     InitialUnknowns = new HashSet<uint>();
-    if (fmiModelDescriptionModelStructure.InitialUnknowns != null)
+    if (fmiModelDescriptionModelStructure.InitialUnknowns.Count > 0)
     {
       // convert to 0-based index
       var initialUnknownIndices =
@@ -41,7 +41,7 @@ public ModelStructure(Fmi3.fmiModelDescriptionModelStructure input)
     ValidateDependencies(input.InitialUnknown);
     ValidateDependencies(input.EventIndicator);
 
-    if (input.InitialUnknown == null)
+    if (input.InitialUnknown.Count == 0)
     {
       InitialUnknowns = new HashSet<uint>();
     }

FmuImporter/FmiBridge/FmiModel/Internal/Terminal.cs

@@ -81,7 +81,7 @@ public Terminal(Fmi3.fmi3Terminal input, ModelDescription modelDescription, Acti
       }
     }
 
-    if (input.Terminal != null)
+    if (input.Terminal.Count > 0)
     {
       foreach (var nestedTerminal in input.Terminal)
       {       
@@ -97,7 +97,7 @@ public Terminal(Fmi3.fmi3Terminal input, ModelDescription modelDescription, Acti
       logCallback.Invoke(LogSeverity.Warning, "TerminalGraphicalRepresentation found in TerminalsAndIcons.xml. This is currently not supported by the SIL Kit FMU Importer.");
     }
 
-    if (input.TerminalStreamMemberVariable != null)
+    if (input.TerminalStreamMemberVariable.Count > 0)
     {
       logCallback.Invoke(LogSeverity.Warning, "TerminalStreamMemberVariable found in TerminalsAndIcons.xml. This is currently not supported by the SIL Kit FMU Importer.");
     }

FmuImporter/FmiBridge/FmiModel/Internal/Variable.cs

@@ -76,7 +76,7 @@ public Variable(
     ValueReference = input.valueReference;
     Description = input.description;
 
-    Clocks = (input.clocks != null && input.clocks.Any())
+    Clocks = (input.clocks.Count > 0)
     ? input.clocks.ToArray()
     : null;