Changeset 17540 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters

Timestamp:

05/12/20 17:06:04 (5 years ago)

Author:

dpiringe

Message:

#3026:

• added new converter: BatchRunConverter, ExperimentConverter
• fixed a bug with the path of the .hl file in JCGenerator
• fixed a bug with a redundant search for a suitable converter in JsonItemConverter
• added a restriction for TargetVariable and AllowedInputVariables in RegressionProblemDataConverter
• removed unnecessary code in Runner

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters

Files:

• BatchRunConverter.cs (added)
• ExperimentConverter.cs (added)
• RegressionProblemDataConverter.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs

@@ -254 +254 @@
       };
     }
-      
-
-    private IJsonItem GetTargetVariable(IItem item) =>
-      new StringJsonItem() {
+
+
+    private IJsonItem GetTargetVariable(IItem item) {
+      var vars = (IEnumerable<StringValue>)((dynamic)item).InputVariables;
+      return new StringJsonItem() {
         Name = TargetVariable,
         Value = (string)((dynamic)item).TargetVariable,
-        //ConcreteRestrictedItems = variables.Select(x => x.Value)
-      };
-
-    private IJsonItem GetAllowedInputVariables(IItem item) =>
-      new StringArrayJsonItem() {
+        ConcreteRestrictedItems = vars.Select(x => x.Value)
+      };
+    }
+
+    private IJsonItem GetAllowedInputVariables(IItem item) {
+      var vars = (IEnumerable<StringValue>)((dynamic)item).InputVariables;
+      return new StringArrayJsonItem() {
         Name = AllowedInputVariables,
         Value = ((IEnumerable<string>)((dynamic)item).AllowedInputVariables).ToArray(),
-        //ConcreteRestrictedItems = variables.Select(x => x.Value)
-      };
+        ConcreteRestrictedItems = vars.Select(x => x.Value)
+      };
+    }
     #endregion
   }