Changeset 18031

Timestamp:

07/26/21 17:59:15 (3 years ago)

Author:

dpiringe

Message:

#3026

• fixed wrong inheritance for RangedJsonItem
• added VariableRanges automatic injection for RegressionProblemDataConverter

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Files:

• Converters/RegressionProblemDataConverter.cs (modified) (4 diffs)
• JsonItems/RangedJsonItem.cs (modified) (2 diffs)

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

@@ -9 +9 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
+using HeuristicLab.Problems.DataAnalysis;
 using Newtonsoft.Json.Linq;
 
@@ -23 +24 @@
     private const string VariableNames = "variableNames";
     private const string InputVariables = "InputVariables";
+    private const string VariableRanges = "VariableRanges";
     private const string Rows = "rows";
     private const string Value = "value";
@@ -78 +80 @@
       SetTestPartition(regressionProblemData, testPartition);
       SetTrainingPartition(regressionProblemData, trainingPartition);
-
+      SetVariableRanges(regressionProblemData, dataset);
     }
 
@@ -166 +168 @@
         }
       }
+    }
+
+    private void SetVariableRanges(dynamic regressionProblemData, DoubleMatrixJsonItem item) {
+      // TODO 
+      if (item != null) {
+        object variableRanges = (object)regressionProblemData.VariableRanges; //IRegressionProblemData.cs
+        IntervalCollection collection = new IntervalCollection();
+        int count = 0;
+        foreach (var column in item.ColumnNames) {
+          collection.AddInterval(column, new Interval(item.Value[count].Min(), item.Value[count].Max()));
+          count++;
+        }
+
+        var variableRangesInfo = regressionProblemData.GetType().GetField(VariableRanges, flags);
+        variableRangesInfo.SetValue(regressionProblemData, collection);
+      }
+    }
+
+    private void SetShapeConstraints() {
+      // TODO
     }
     #endregion

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItems/RangedJsonItem.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
-  public abstract class RangedJsonItem<T> : JsonItem, IRangedJsonItem<T>
+  public abstract class RangedJsonItem<T> : IntervalRestrictedValueJsonItem<T>, IRangedJsonItem<T>
     where T : IComparable {
     public T MinValue { get; set; }
     public T MaxValue { get; set; }
-    public T Minimum { get; set; }
-    public T Maximum { get; set; }
 
     protected override ValidationResult Validate() {
@@ -19 +18 @@
 
     }
-      
+
+    public override void SetJObject(JObject jObject) {
+      var minValueProp = jObject[nameof(IRangedJsonItem<T>.MinValue)];
+      if (minValueProp != null) MinValue = minValueProp.ToObject<T>();
+
+      var maxValueProp = jObject[nameof(IRangedJsonItem<T>.MaxValue)];
+      if (maxValueProp != null) MaxValue = maxValueProp.ToObject<T>();
+
+      base.SetJObject(jObject);
+    }
+
   }
 }