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

Timestamp:

01/07/20 16:25:39 (5 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/RegressionProblemDataConverter.cs (modified) (2 diffs)

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

@@ -11 +11 @@
   public class RegressionProblemDataConverter : BaseConverter {
     private const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-    public override JsonItem ExtractData(IItem value) {
-      JsonItem item = new JsonItem() {
-        Path = value.ItemName,
-        Children = new List<JsonItem>()
-      };
-      
+    public override int Priority => 20;
+    public override Type ConvertableType => HEAL.Attic.Mapper.StaticCache.GetType(new Guid("EE612297-B1AF-42D2-BF21-AF9A2D42791C"));
+
+    public override void Populate(IItem value, JsonItem item, IJsonItemConverter root) {      
       dynamic val = (dynamic)value;
       object dataset = (object)val.Dataset;
@@ -22 +20 @@
       FieldInfo dataInfo = dataset.GetType().GetField("storableData", flags);
       // TODO: aufteilen in trainings und test daten abschnitte
-      item.Children.Add(new JsonItem() {
+      item.AddChilds(new JsonItem() {
         Name = "Dataset",
-        Value = dataInfo.GetValue(dataset),
-        Path = "Dataset"
+        Value = dataInfo.GetValue(dataset)
       });
 
       IEnumerable<StringValue> variables = (IEnumerable<StringValue>)val.InputVariables;
-      item.Children.Add(new JsonItem() {
+      item.AddChilds(new JsonItem() {
         Name = "TargetVariable",
         Value = (object)targetVariable,
-        Range = variables.Select(x => x.Value),
-        Path = "TargetVariable"
+        Range = variables.Select(x => x.Value)
       });
 
 
-      item.Children.Add(new JsonItem() {
+      item.AddChilds(new JsonItem() {
         Name = "AllowedInputVariables",
         Value = (object)val.AllowedInputVariables,
-        Range = variables.Select(x => x.Value),
-        Path = "AllowedInputVariables"
+        Range = variables.Select(x => x.Value)
       });
-
-      item.UpdatePath();
-
-      return item;
     }
 
-    public override void InjectData(IItem item, JsonItem data) {
+    public override void InjectData(IItem item, JsonItem data, IJsonItemConverter root) {
       // TODO: inject data
       throw new NotImplementedException();