Changeset 18045 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Timestamp:

08/31/21 15:43:06 (3 years ago)

Author:

dpiringe

Message:

#3026

• code cleanup
• fixed a bug in ValueParameterConverter which prevented successful injection
• changed error handling in method Main.HeadlessRun and Runner.Run

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters

Files:

• ParameterizedItemConverter.cs (modified) (1 diff)
• RegressionProblemDataConverter.cs (modified) (2 diffs)
• ValueLookupParameterConverter.cs (modified) (1 diff)
• ValueParameterConverter.cs (modified) (1 diff)

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

@@ -11 +11 @@
 
     public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
-      IParameterizedItem pItem = item as IParameterizedItem;
+      var pItem = item as IParameterizedItem;
 
       if(data.Children != null) {

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

@@ -43 +43 @@
       StringArrayJsonItem allowedInputVariables = null;
 
-
       // search first for the items (cache them, because the 
       // order is important for injection)
       foreach (var child in data.Children) {
-
         if (child.Path.EndsWith(Dataset))
           dataset = child as DoubleMatrixJsonItem;
@@ -58 +56 @@
         else if (child.Path.EndsWith(AllowedInputVariables))
           allowedInputVariables = child as StringArrayJsonItem;
-
       }
 

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

@@ -20 +20 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) {
       IValueLookupParameter param = value as IValueLookupParameter;
-
       IValueLookupJsonItem item = new ValueLookupJsonItem();
 

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

@@ -13 +13 @@
       IParameter parameter = value as IParameter;
 
-      if (!(data is EmptyJsonItem)) {
-        if (parameter.ActualValue == null)
-          parameter.ActualValue = Instantiate(parameter.DataType);
-        root.Inject(parameter.ActualValue, data, root);
-      }
+      if (parameter.ActualValue == null)
+        parameter.ActualValue = Instantiate(parameter.DataType);
+      root.Inject(parameter.ActualValue, data, root);
     }