Changeset 17410 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueTypeValueConverter.cs

Timestamp:

01/28/20 14:53:45 (5 years ago)

Author:

dpiringe

Message:

#3026:

• deleted JsonItemArrayControl and JsonItemDefaultControl
• redesigned architecture for JsonItem: now there are different types of JsonItem (IntJsonItem, BoolJsonItem, ...) -> for better type safety and expandability
• fixed bug in BaseConverter for GetMinValue and GetMaxValue for IntValue, but ignored for other value types (DoubleValue, DateTimeValue, ...) because the redesign of JsonItem-Architecture can make these two methods obsolet soon
• fixed bug in JsonItemConverter to prevent null pointer exceptions
• refactored value and range converters -> removed complicated generic ValueTypeValueConverter and ValueRangeConverter and implemented the necessary methods directly in concrete classes (improves readability and removes the need of reflection)
• redesigned view handling in OptimizerIntegration -> dynamically seaches for JsonItemVMBase implementations, which are connected with a view
  • this enables better scaling with more user controls
• JsonItemVMBase implements MVVM architecture

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueTypeValueConverter.cs (modified) (1 diff)

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

@@ -9 +9 @@
 namespace HeuristicLab.JsonInterface {
 
-  public class IntValueConverter : ValueTypeValueConverter<IntValue, int> {
+  public class IntValueConverter : BaseConverter {
     public override int Priority => 1;
     public override Type ConvertableType => typeof(IntValue);
+
+    public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) =>
+      ((IntValue)item).Value = ((IntJsonItem)data).Value;
+
+    public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
+      new IntJsonItem() {
+        Name = "[OverridableParamName]",
+        Value = ((IntValue)value).Value,
+        Range = new int[] { int.MinValue, int.MaxValue }
+      };
   }
 
-  public class DoubleValueConverter : ValueTypeValueConverter<DoubleValue, double> {
+  public class DoubleValueConverter : BaseConverter {
     public override int Priority => 1;
     public override Type ConvertableType => typeof(DoubleValue);
+
+    public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) =>
+      ((DoubleValue)item).Value = ((DoubleJsonItem)data).Value;
+
+    public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
+      new DoubleJsonItem() {
+        Name = "[OverridableParamName]",
+        Value = ((DoubleValue)value).Value,
+        Range = new double[] { double.MinValue, double.MaxValue }
+      };
   }
 
-  public class PercentValueConverter : ValueTypeValueConverter<PercentValue, double> {
+  public class PercentValueConverter : BaseConverter {
     public override int Priority => 2;
     public override Type ConvertableType => typeof(PercentValue);
+
+    public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) =>
+      ((PercentValue)item).Value = ((DoubleJsonItem)data).Value;
+
+    public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
+      new DoubleJsonItem() {
+        Name = "[OverridableParamName]",
+        Value = ((PercentValue)value).Value,
+        Range = new double[] { double.MinValue, double.MaxValue }
+      };
   }
 
-  public class BoolValueConverter : ValueTypeValueConverter<BoolValue, bool> {
+  public class BoolValueConverter : BaseConverter {
     public override int Priority => 1;
     public override Type ConvertableType => typeof(BoolValue);
+
+    public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) =>
+      ((BoolValue)item).Value = ((BoolJsonItem)data).Value;
+
+    public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
+      new BoolJsonItem() {
+        Name = "[OverridableParamName]",
+        Value = ((BoolValue)value).Value,
+        Range = new bool[] { false, true }
+      };
   }
 
-  public class DateTimeValueConverter : ValueTypeValueConverter<DateTimeValue, DateTime> {
+  public class DateTimeValueConverter : BaseConverter {
     public override int Priority => 1;
     public override Type ConvertableType => typeof(DateTimeValue);
-  }
-
-  public abstract class ValueTypeValueConverter<ValueType, T> : BaseConverter
-    where ValueType : ValueTypeValue<T>
-    where T : struct {
 
     public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) =>
-      ((ValueType)item).Value = CastValue<T>(data.Value);
+      ((DateTimeValue)item).Value = ((DateTimeJsonItem)data).Value;
 
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
-      new JsonItem() {
+      new DateTimeJsonItem() {
         Name = "[OverridableParamName]",
-        Value = ((ValueType)value).Value,
-        Range = new object[] { GetMinValue(typeof(T)), GetMaxValue(typeof(T)) }
+        Value = ((DateTimeValue)value).Value,
+        Range = new DateTime[] { DateTime.MinValue, DateTime.MaxValue }
       };
   }