Changeset 17394 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueRangeConverter.cs

Timestamp:

01/07/20 16:25:39 (4 years ago)

Author:

dpiringe

Message:

#3026:

• deleted: ConvertableAttribute, DummyConverter, ObjectExtensions
• renamed: CustomJsonWriter -> SingleLineArrayJsonWriter, JCInstantiator -> JsonTemplateInstantiator
• added: JsonItemConverterFactory, UnsupportedJsonItem
• IJsonItemConverter:
  • added two new properties: Priority and ConvertableType -> because converters are automatically collected by plugin infrastructure now
  • Extract, Inject references a root converter now -> typically an instance of JsonItemConverter -> to prevent cycles
• JsonItemConverter:
  • now implements the interface IJsonItemConverter
  • is now a dynamic class
  • is only instantiable with an factory (JsonItemConverterFactory)
  • still has the old (but now public) static methods Extract and Inject (without ref param IJsonItemConverter root) -> creates instance with factory and calls methods of instance
  • removed register and unregister methods, because the factory collects all converters automatically now (on first call of Create)
  • has cycle detection for Extract and Inject
  • renamed method Get to GetConverter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueRangeConverter.cs (modified) (2 diffs)

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

@@ -11 +11 @@
 namespace HeuristicLab.JsonInterface {
 
-  public class IntRangeConverter : ValueRangeConverter<IntRange, IntValue, int> { }
-  public class DoubleRangeConverter : ValueRangeConverter<DoubleRange, DoubleValue, double> {}
+  public class IntRangeConverter : ValueRangeConverter<IntRange, IntValue, int> {
+    public override int Priority => 1;
+    public override Type ConvertableType => typeof(IntRange);
+  }
+  public class DoubleRangeConverter : ValueRangeConverter<DoubleRange, DoubleValue, double> {
+    public override int Priority => 1;
+    public override Type ConvertableType => typeof(DoubleRange);
+  }
 
-  public class ValueRangeConverter<RangeType, T, TType> : BaseConverter 
+  public abstract class ValueRangeConverter<RangeType, T, TType> : BaseConverter 
     where RangeType : StringConvertibleValueTuple<T, T>
     where T : ValueTypeValue<TType>, IDeepCloneable, IStringConvertibleValue
@@ -21 +27 @@
     private const BindingFlags Flags = BindingFlags.NonPublic | BindingFlags.Instance;
 
-    public override JsonItem ExtractData(IItem value) {
+    public override void Populate(IItem value, JsonItem item, IJsonItemConverter root) {
       var field = value.GetType().GetField("values", Flags);
       Tuple<T,T> tuple = (Tuple<T,T>)field.GetValue(value);
-
-      return new JsonItem() {
-        Name = "[OverridableParamName]",
-        Value = new object[] { tuple.Item1.Value, tuple.Item2.Value },
-        Range = new object[] { GetMinValue(tuple.Item1.Value.GetType()), 
-                               GetMaxValue(tuple.Item2.Value.GetType()) }
-      };
+      item.Name = "[OverridableParamName]";
+      item.Value = new object[] { tuple.Item1.Value, tuple.Item2.Value };
+      item.Range = new object[] { GetMinValue(tuple.Item1.Value.GetType()), GetMaxValue(tuple.Item2.Value.GetType()) };
     }
 
-    public override void InjectData(IItem item, JsonItem data) {
+    public override void InjectData(IItem item, JsonItem data, IJsonItemConverter root) {
       object[] arr = (object[])data.Value;
       Tuple<T,T> tuple = new Tuple<T,T>(Instantiate<T>(arr[0]), Instantiate<T>(arr[1]));