Fixes #693 plug the function into model construction

Open-Systems-Pharmacology · Feb 15, 2023 · 1608e63 · 1608e63
1 parent ebf90b4
commit 1608e63
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 52 deletions.
diff --git a/src/OSPSuite.Core/Domain/ObjectPathKeywords.cs b/src/OSPSuite.Core/Domain/ObjectPathKeywords.cs
@@ -8,7 +8,7 @@ namespace OSPSuite.Core.Domain
    public static class ObjectPathKeywords
    {
       //list of all keywords defined
-      private static readonly IList<string> _allKeywords = new List<string>();
+      private static readonly List<string> _allKeywords = new List<string>();
 
       /// <summary>
       ///    String representing a reference to local Molecule
@@ -73,6 +73,6 @@ private static string addKeyword(string keyword)
          return keyword;
       }
 
-      public static IEnumerable<string> All => _allKeywords;
+      public static IReadOnlyList<string> All => _allKeywords;
    }
 }
diff --git a/src/OSPSuite.Core/Domain/Services/ModelConstructor.cs b/src/OSPSuite.Core/Domain/Services/ModelConstructor.cs
@@ -90,6 +90,9 @@ public CreationResult CreateModelFrom(IBuildConfiguration buildConfiguration, st
             //replace all keywords define in the model structure once all build processes have been executed
             _keywordReplacerTask.ReplaceIn(model.Root);
 
+            //This needs to be done before we validate the model to ensure that all references can be found
+            _formulaTask.ExpandNeighborhoodReferencesIn(model);
+
             creationResult.Add(validateModel(model, buildConfiguration));
 
             if (creationResult.State == ValidationState.Invalid)