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

Timestamp:

02/11/20 17:35:28 (4 years ago)

Author:

dpiringe

Message:

#3026:

• set read-only to false for name input (in JsonItemBaseControl)
• result items now can be selected/deselected in export dialog
• removed metadata.problem property and renamed metadata.optimizer property to TemplateName in json template
• fixed bug with wrong description for result items in AlgorithmConverter
• refactored a lot of code in JCGenerator and added the need for a directory path (location for the template files)
• fixed a null reference bug in JsonItemValidator (cannot try to iterate through possible null referenced collections)

File:

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

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

@@ -42 +42 @@
 
       // extract metadata information
-      string optimizerName = instData.Template[Constants.Metadata][Constants.Optimizer].ToString();
-      string hLFileLocation = instData.Template[Constants.Metadata][Constants.HLFileLocation].ToString();
+      string optimizerName = instData.Template[Constants.Metadata][Constants.TemplateName].ToString();
+      string hLFileLocation = Path.GetFullPath(instData.Template[Constants.Metadata][Constants.HLFileLocation].ToString());
 
       // deserialize hl file
@@ -72 +72 @@
 
     private static void CollectParameterizedItems(InstData instData) {
-      //JCGenerator generator = new JCGenerator();
-      //IEnumerable<IJsonItem> items = generator.FetchJsonItems(instData.Optimizer);
       IJsonItem root = JsonItemConverter.Extract(instData.Optimizer);
       instData.Objects.Add(root.Path, root);
@@ -95 +93 @@
         instData.Objects.Add(tmp.Path, tmp);
       }
-
-
-      /*
-      foreach (JObject item in instData.Template[Constants.Parameters]) {
-        string[] pathParts = item.Property("Path").Value.ToString().Split('.');
-        
-        // rebuilds object tree
-        IJsonItem parent = null;
-        StringBuilder partialPath = new StringBuilder();
-        for(int i = 0; i < pathParts.Length-1; ++i) {
-          partialPath.Append(pathParts[i]);
-          IJsonItem tmp = null;
-          if (instData.Objects.TryGetValue(partialPath.ToString(), out IJsonItem value)) {
-            tmp = value;
-          } else {
-            tmp = new JsonItem() { Name = pathParts[i] };
-            if (parent != null) parent.AddChilds(tmp);
-            instData.Objects.Add(partialPath.ToString(), tmp);
-          }
-          partialPath.Append(".");
-          parent = tmp;
-        }
-
-        IJsonItem data = JsonItem.BuildJsonItem(item);
-        parent.AddChilds(data);
-        instData.Objects.Add(data.Path, data);
-      }*/
     }
     
@@ -127 +98 @@
       foreach (JObject obj in instData.Config) {
         // build item from config object
-        //IJsonItem item = JsonItem.BuildJsonItem(obj);
         string path = obj.Property("Path").Value.ToString();
         // override default value
@@ -138 +108 @@
       }
     }
-
-    private static IJsonItem GetData(string key, InstData instData)
-    {
-      if (instData.Objects.TryGetValue(key, out IJsonItem value))
-        return value;
-      else
-        throw new InvalidDataException($"Type of item '{key}' is not defined!");
-    }
     #endregion
   }