Changeset 17287 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverter.cs

Timestamp:

10/02/19 12:44:44 (5 years ago)

Author:

dpiringe

Message:

#3026

• added class for constants -> Constants
• added new converter -> ValueLookupParameterConverter
• fixed a bug with type extension IsEqualTo
• fixed converter priorities

File:

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

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverter.cs

@@ -52 +52 @@
       Register<IntValue>(new ValueTypeValueConverter<IntValue, int>(), 1);
       Register<DoubleValue>(new ValueTypeValueConverter<DoubleValue, double>(), 1);
-      Register<PercentValue>(new ValueTypeValueConverter<PercentValue, double>(), 1);
+      Register<PercentValue>(new ValueTypeValueConverter<PercentValue, double>(), 2);
       Register<BoolValue>(new ValueTypeValueConverter<BoolValue, bool>(), 1);
       Register<DateTimeValue>(new ValueTypeValueConverter<DateTimeValue, DateTime>(), 1);
@@ -59 +59 @@
       Register<IntArray>(new ValueTypeArrayConverter<IntArray, int>(), 1);
       Register<DoubleArray>(new ValueTypeArrayConverter<DoubleArray, double>(), 1);
-      Register<PercentArray>(new ValueTypeArrayConverter<PercentArray, double>(), 1);
+      Register<PercentArray>(new ValueTypeArrayConverter<PercentArray, double>(), 2);
       Register<BoolArray>(new ValueTypeArrayConverter<BoolArray, bool>(), 1);
 
       Register<IntMatrix>(new ValueTypeMatrixConverter<IntMatrix, int>(), 1);
       Register<DoubleMatrix>(new ValueTypeMatrixConverter<DoubleMatrix, double>(), 1);
-      Register<PercentMatrix>(new ValueTypeMatrixConverter<PercentMatrix, double>(), 1);
+      Register<PercentMatrix>(new ValueTypeMatrixConverter<PercentMatrix, double>(), 2);
       Register<BoolMatrix>(new ValueTypeMatrixConverter<BoolMatrix, bool>(), 1);
 
-      Register(typeof(IConstrainedValueParameter<>), new ConstrainedValueParameterConverter(), 1);
-      Register(typeof(ILookupParameter), new LookupParameterConverter(), 1);
-      Register(typeof(IValueParameter), new ValueParameterConverter(), 1);
-      Register(typeof(IParameterizedItem), new ParameterizedItemConverter(), 1);
+      Register(typeof(EnumValue<>), new EnumTypeConverter(), 1);
+
+      Register<IValueParameter>(new ValueParameterConverter(), 1);
+      Register<IParameterizedItem>(new ParameterizedItemConverter(), 1);
+      Register<ILookupParameter>(new LookupParameterConverter(), 2);
+      Register<IValueLookupParameter>(new ValueLookupParameterConverter(), 3);
+
+      Register(typeof(IConstrainedValueParameter<>), new ConstrainedValueParameterConverter(), 2);
       Register(typeof(ICheckedMultiOperator<>), new MultiCheckedOperatorConverter(), 2);
-      Register(typeof(EnumValue<>), new EnumTypeConverter(), 1);
     }
-
   }
 }