Changeset 17407 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ConstrainedValueParameterConverter.cs

Timestamp:

01/27/20 12:18:06 (4 years ago)

Author:

dpiringe

Message:

#3026:

• simplified converter inheritance:
  • BaseConverter now only has Inject and Extract from IJsonItemConverter as abstract methods
  • removed ParameterBaseConverter
  • concrete converters have to initialize their JsonItem now -> enables better handling with different types of JsonItem

File:

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

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

@@ -8 +8 @@
 
 namespace HeuristicLab.JsonInterface {
-  public class ConstrainedValueParameterConverter : ParameterBaseConverter {
+  public class ConstrainedValueParameterConverter : BaseConverter {
     public override int Priority => 3;
     public override Type ConvertableType => typeof(IConstrainedValueParameter<>);
 
-    public override void InjectData(IParameter parameter, IJsonItem data, IJsonItemConverter root) {
-      foreach(var x in GetValidValues(parameter))
+    public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
+      IParameter parameter = item as IParameter;
+      foreach (var x in GetValidValues(parameter))
         if(x.ToString() == CastValue<string>(data.Value))
           parameter.ActualValue = x;
@@ -24 +25 @@
       }
     }
+    
+    public override IJsonItem Extract(IItem value, IJsonItemConverter root) {
+      IParameter parameter = value as IParameter;
 
-    public override void Populate(IParameter value, IJsonItem item, IJsonItemConverter root) {
-      item.AddChilds(GetParameterizedChilds(value));
-      item.Name = value.Name;
-      item.Value = value.ActualValue?.ToString();
-      item.Range = GetValidValues(value).Select(x => x.ToString());
-    }      
+      IJsonItem item = new JsonItem() {
+        Name = parameter.Name,
+        Value = parameter.ActualValue?.ToString(),
+        Range = GetValidValues(parameter).Select(x => x.ToString())
+      };
+      item.AddChilds(GetParameterizedChilds(parameter));
+
+      return item;
+    }
 
     #region Helper