Changeset 17481 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs

Timestamp:

03/17/20 17:03:24 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored json item validation process -> every method now returns a ValidationResult containing bool Success (true if validation is successful) and IEnumerable<string> Errors (error messages)
  • this design allows to specify error messages directly in json items

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (4 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs

@@ -14 +14 @@
 
 namespace HeuristicLab.JsonInterface {
-  public struct InstantiatorResult {
-    public IOptimizer Optimizer { get; set; }
-    public IEnumerable<IResultJsonItem> ConfiguredResultItems { get; set; }
+  public readonly struct InstantiatorResult {
+    public InstantiatorResult(IOptimizer optimizer, IEnumerable<IResultJsonItem> configuredResultItems) {
+      Optimizer = optimizer;
+      ConfiguredResultItems = configuredResultItems;
+    }
+
+    public IOptimizer Optimizer { get; }
+    public IEnumerable<IResultJsonItem> ConfiguredResultItems { get; }
   }
 
@@ -44 +49 @@
     #region Helper
     private InstantiatorResult ExecuteInstantiaton(string templateFile, string configFile = null) {
-      InstantiatorResult result = new InstantiatorResult();
 
       #region Parse Files
@@ -58 +62 @@
       ProtoBufSerializer serializer = new ProtoBufSerializer();
       IOptimizer optimizer = (IOptimizer)serializer.Deserialize(hLFileLocation);
-      result.Optimizer = optimizer;
       #endregion
 
@@ -73 +76 @@
       JsonItemConverter.Inject(optimizer, rootItem);
 
-      result.ConfiguredResultItems = CollectResults();
-
-      return result;
+      return new InstantiatorResult(optimizer, CollectResults());
     }