Changeset 17451 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models

Timestamp:

02/25/20 17:18:00 (5 years ago)

Author:

dpiringe

Message:

#3026:

• renamed ResultItem to ResultJsonItem
• implemented RegressionProblemDataConverter
• added support for "named matrices" (named = rows and columns have names) -> INamedMatrixJsonItem incl. base classes and views
• added a bool property Active in IJsonItem -> marks items, which should be written into the template

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models

Files:

• DoubleJsonItems.cs (modified) (1 diff)
• IntJsonItems.cs (modified) (1 diff)
• JsonItem.cs (modified) (4 diffs)
• NamedMatrixJsonItemBase.cs (added)
• ResultJsonItem.cs (moved) (moved from branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ResultItem.cs) (1 diff)
• StringJsonItem.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DoubleJsonItems.cs

@@ -23 +23 @@
     }
   }
+
+  public class DoubleNamedMatrixJsonItem : NamedMatrixJsonItemBase<double> {
+    protected override bool IsInRange() {
+      for (int c = 0; c < Value.Length; ++c) {
+        for (int r = 0; r < Value[c].Length; ++r) {
+          if (Value[c][r] < Range.First() && Range.Last() < Value[c][r])
+            return false;
+        }
+      }
+      return true;
+    }
+  }
 }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/IntJsonItems.cs

@@ -6 +6 @@
 
 namespace HeuristicLab.JsonInterface {
-  public class IntJsonItem : JsonItem<int> { }
+  public class IntJsonItem : JsonItem<int> {
+    /*I
+    public int MinValue { get; set; } 
+    public int MaxValue { get; set; }
+    */
+  }
   public class IntArrayJsonItem : ArrayJsonItemBase<int> { }
   public class IntRangeJsonItem : ArrayJsonItemBase<int> {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/JsonItem.cs

@@ -66 +66 @@
     public virtual IEnumerable<object> Range { get; set; }
     
+    // TODO eigene items für LookUp?
     public virtual string ActualName { get; set; }
+
+    // TODO jsonIgnore dataType?
 
     [JsonIgnore]
@@ -73 +76 @@
     [JsonIgnore]
     public virtual IJsonItem Parent { get; set; }
+
+    [JsonIgnore]
+    public virtual bool Active { get; set; }
 
     #region Constructors
@@ -81 +87 @@
     }
     #endregion
-
-    #region Public Static Methods
-    public static void Merge(JsonItem target, JsonItem from) {
-      target.Name = from.Name ?? target.Name;
-      target.Range = from.Range ?? target.Range;
-      target.Value = from.Value ?? target.Value;
-      target.ActualName = from.ActualName ?? target.ActualName;
-      if(target.Children != null) {
-        if (from.Children != null)
-          ((List<IJsonItem>)from.Children).AddRange(target.Children); 
-      } else {
-        target.Children = from.Children;
-      }
-    }
-    #endregion
-
+    
     #region Public Methods
     public void AddChildren(params IJsonItem[] childs) => 
@@ -124 +115 @@
 
     #region Helper
+    /*
+     * TODO protected abstract bool Validate();
+     */
+
     protected virtual bool IsInRange() {
       bool b1 = true, b2 = true;

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ResultJsonItem.cs

@@ -6 +6 @@
 
 namespace HeuristicLab.JsonInterface {
-  public class ResultItem : JsonItem {
+  public class ResultJsonItem : JsonItem {
 
   }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/StringJsonItem.cs

@@ -7 +7 @@
 namespace HeuristicLab.JsonInterface {
   public class StringJsonItem : JsonItem<string> { }
+  public class StringArrayJsonItem : JsonItem<string[], string> { }
 }