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

Timestamp:

02/18/20 16:28:53 (5 years ago)

Author:

dpiringe

Message:

#3026:

• added two new methods in IJsonItem -> FixatePath and LoosenPath to fixate/loosen the path (to enable name changing without effects on path)
• set IsInRange to virtual and made overrides for IntMatrixJsonItem and DoubleMatrixJsonItem (IsInRange is a bad name and needs to be renamed in future versions)
• implemented basic validation feedback with ErrorProvider for some inputs (templateName, Name, Range)
• now all items gets validated before export (validation errors are shown with ErrorHandling.ShowErrorDialog)
• added a check in AlgorithmConverter to prevent an exception for accessing the first element of an empty IEnumerable

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models

Files:

• JsonItem.cs (modified) (5 diffs)
• JsonItems.cs (modified) (1 diff)

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

@@ -45 +45 @@
     public virtual string Description { get; set; }
 
+    private string fixedPath = "";
     public virtual string Path {
       get {
+        if (!string.IsNullOrWhiteSpace(fixedPath))
+          return fixedPath;
+
         IJsonItem tmp = Parent;
         StringBuilder builder = new StringBuilder(this.Name);
@@ -57 +61 @@
     }
 
+    public virtual object Value { get; set; }
+
+    public virtual IEnumerable<object> Range { get; set; }
+    
+    public virtual string ActualName { get; set; }
+
     [JsonIgnore]
     public virtual IList<IJsonItem> Children { get; protected set; }
@@ -62 +72 @@
     [JsonIgnore]
     public virtual IJsonItem Parent { get; set; }
-
-    public virtual object Value { get; set; }
-
-    public virtual IEnumerable<object> Range { get; set; }
-    
-    public virtual string ActualName { get; set; }
 
     #region Constructors
@@ -97 +101 @@
 
     public void AddChildren(IEnumerable<IJsonItem> childs) {
+      if (childs == null) return;
       if (Children == null)
         Children = new List<IJsonItem>();
@@ -106 +111 @@
 
     public virtual IJsonItemValidator GetValidator() => new JsonItemValidator(this);
+
+    public void FixatePath() => fixedPath = Path;
+    public void LoosenPath() => fixedPath = "";
     #endregion
 
     #region Helper
-    protected bool IsInRange() {
+    protected virtual bool IsInRange() {
       bool b1 = true, b2 = true;
       if (Value is IEnumerable && !(Value is string)) {

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

@@ -9 +9 @@
   public class IntArrayJsonItem: JsonItem<int[], int> { }
   public class IntRangeJsonItem : JsonItem<int[], int> { }
-  public class IntMatrixJsonItem : JsonItem<int[][], int> { }
+  public class IntMatrixJsonItem : JsonItem<int[][], int> {
+    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;
+    }
+  }
 
   public class DoubleJsonItem: JsonItem<double> {}
   public class DoubleArrayJsonItem: JsonItem<double[], double> { }
   public class DoubleRangeJsonItem : JsonItem<double[], double> { }
-  public class DoubleMatrixJsonItem : JsonItem<double[][], double> { }
+  public class DoubleMatrixJsonItem : JsonItem<double[][], 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;
+    }
+  }
 
   public class BoolJsonItem: JsonItem<bool> { }