Changeset 17477 for branches/3026_IntegrationIntoSymSpace/Heuristiclab.ConfigStarter/Program.cs

Timestamp:

03/17/20 12:33:35 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored JsonTemplateInstantiator -> now returns a InstantiatorResult which contains the optimizer and an IEnumerable of IResultJsonItem
• code cleanup in JCGenerator
• relocated the serialization of json items into IJsonItem with method GenerateJObject (virtual base implementation in JsonItem)
  • this allows custom serialization for json items (example: ValueLookupJsonItem)
  • items of interface IIntervalRestrictedJsonItem have a custom implementation of GenerateJObject -> hides Minimum and Maximum if the values are the physically min/max of their type
• code cleanup in BaseConverter

File:

• branches/3026_IntegrationIntoSymSpace/Heuristiclab.ConfigStarter/Program.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/Heuristiclab.ConfigStarter/Program.cs

@@ -47 +47 @@
       IJsonItem root = JsonItemConverter.Extract(alg);
       ActivateJsonItems(root);
-      //var x = root.Children[0];
-      //root.Children.Remove(x);
-      //x.Parent = null;
 
-
-      JCGenerator generator = new JCGenerator();
-      generator.GenerateTemplate(@"C:\Workspace", "Template", alg, root);
-      //JsonTemplateInstantiator.Instantiate(@"C:\Workspace\Template.json");
+      JCGenerator.GenerateTemplate(@"C:\Workspace", "Template", alg, root);
       
       List<ICommandLineArgument> arguments = new List<ICommandLineArgument>();
       arguments.Add(new StartArgument("JsonInterface"));
       arguments.Add(new OpenArgument(@"C:\Workspace\Template.json"));
-      arguments.Add(new OpenArgument(@"C:\Workspace\ConfigProto1.json"));
+      arguments.Add(new OpenArgument(@"C:\Workspace\Config.json"));
       arguments.Add(new StringArgument(@"C:\Workspace\Output.json"));
 
@@ -67 +61 @@
 
     private static void ActivateJsonItems(IJsonItem item) {
-      item.Active = true;
-      if(item.Children != null) {
-        foreach (var x in item.Children)
-          ActivateJsonItems(x);
+      foreach (var x in item) {
+        x.Active = true;
+        if (x is ValueLookupJsonItem i) {
+          i.Active = true;
+        }
       }
     }