Changeset 17477 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DoubleJsonItems.cs

Timestamp:

03/17/20 12:33:35 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored JsonTemplateInstantiator -> now returns a InstantiatorResult which contains the optimizer and an IEnumerable of IResultJsonItem
• code cleanup in JCGenerator
• relocated the serialization of json items into IJsonItem with method GenerateJObject (virtual base implementation in JsonItem)
  • this allows custom serialization for json items (example: ValueLookupJsonItem)
  • items of interface IIntervalRestrictedJsonItem have a custom implementation of GenerateJObject -> hides Minimum and Maximum if the values are the physically min/max of their type
• code cleanup in BaseConverter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/DoubleJsonItems.cs (modified) (1 diff)

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

@@ -4 +4 @@
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
-  public class DoubleJsonItem : IntervalRestrictedValueJsonItem<double> { }
-  public class DoubleArrayJsonItem : IntervalRestrictedArrayJsonItem<double> { }
-  public class DoubleRangeJsonItem : RangedJsonItem<double> { }
+  public class DoubleJsonItem : IntervalRestrictedValueJsonItem<double> {
+    public override JObject GenerateJObject() {
+      var obj = base.GenerateJObject();
 
+      if (Minimum.CompareTo(double.MinValue) == 0)
+        obj.Property("Minimum").Remove();
+
+      if (Maximum.CompareTo(double.MaxValue) == 0)
+        obj.Property("Maximum").Remove();
+
+      return obj;
+    }
+
+    public override void SetJObject(JObject jObject) {
+      Minimum = double.MinValue;
+      Maximum = double.MaxValue;
+      base.SetJObject(jObject);
+    }
+  }
+  public class DoubleArrayJsonItem : IntervalRestrictedArrayJsonItem<double> {
+    public override JObject GenerateJObject() {
+      var obj = base.GenerateJObject();
+
+      if (Minimum.CompareTo(double.MinValue) == 0)
+        obj.Property("Minimum").Remove();
+
+      if (Maximum.CompareTo(double.MaxValue) == 0)
+        obj.Property("Maximum").Remove();
+
+      return obj;
+    }
+
+    public override void SetJObject(JObject jObject) {
+      Minimum = double.MinValue;
+      Maximum = double.MaxValue;
+      base.SetJObject(jObject);
+    }
+  }
+  public class DoubleRangeJsonItem : RangedJsonItem<double> {
+    public override JObject GenerateJObject() {
+      var obj = base.GenerateJObject();
+
+      if (Minimum.CompareTo(double.MinValue) == 0)
+        obj.Property("Minimum").Remove();
+
+      if (Maximum.CompareTo(double.MaxValue) == 0)
+        obj.Property("Maximum").Remove();
+
+      return obj;
+    }
+
+    public override void SetJObject(JObject jObject) {
+      Minimum = double.MinValue;
+      Maximum = double.MaxValue;
+      base.SetJObject(jObject);
+    }
+  }
   public class DoubleMatrixJsonItem : IntervalRestrictedMatrixJsonItem<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 override JObject GenerateJObject() {
+      var obj = base.GenerateJObject();
+
+      if (Minimum.CompareTo(double.MinValue) == 0)
+        obj.Property("Minimum").Remove();
+
+      if (Maximum.CompareTo(double.MaxValue) == 0)
+        obj.Property("Maximum").Remove();
+
+      return obj;
     }
-    */
+
+    public override void SetJObject(JObject jObject) {
+      Minimum = double.MinValue;
+      Maximum = double.MaxValue;
+      base.SetJObject(jObject);
+    }
   }
 }