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

Timestamp:

02/17/20 17:29:52 (5 years ago)

Author:

dpiringe

Message:

#3026:

• added new CLI argument StringArgument
• removed unnecessary check in StartArgument
• changed output format from simple .txt to .json in HeuristicLab.JsonInterface.App.Runner
• user has to enter output path now when executing JsonInterface on console

File:

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

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

@@ -25 +25 @@
     }
 
+    public static IOptimizer Instantiate(string templateFile) =>
+      Instantiate(templateFile, null, out IEnumerable<string> allowedResultNames);
+
+
+    public static IOptimizer Instantiate(string templateFile, out IEnumerable<string> allowedResultNames) =>
+      Instantiate(templateFile, null, out allowedResultNames);
+
+   
+
     /// <summary>
     /// Instantiate an IAlgorithm object with a template and config.
@@ -31 +40 @@
     /// <param name="configFile">Config file (json) for the template.</param>
     /// <returns>confugrated IOptimizer object</returns>
-    public static IOptimizer Instantiate(string templateFile, string configFile = "") {
+    public static IOptimizer Instantiate(string templateFile, string configFile, out IEnumerable<string> allowedResultNames) {
       InstData instData = new InstData() {
         Objects = new Dictionary<string, IJsonItem>()
@@ -63 +72 @@
       JsonItemConverter.Inject(optimizer, optimizerData);
 
+      allowedResultNames = CollectResults(instData);
+
       return optimizer;
     }
@@ -70 +81 @@
     private static object GetValueFromJObject(JObject obj) =>
       obj[nameof(IJsonItem.Value)]?.ToObject<object>();
+
+    private static IEnumerable<string> CollectResults(InstData instData) {
+      IList<string> res = new List<string>();
+      foreach(JObject obj in instData.Template[Constants.Results]) {
+        res.Add(obj.Property("Name").Value.ToString());
+      }
+      return res;
+    }
 
     private static void CollectParameterizedItems(InstData instData) {