Changeset 17834 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters

Timestamp:

02/12/21 15:24:18 (3 years ago)

Author:

dpiringe

Message:

#3026

• added ResultFormatter to add an extra layer of result transformation logic (converting a result value to a string with a defined logic, e.g. MatlabResultFormatter for ISymbolicRegressionSolution)
• extended the IResultJsonItem with two properties for result formatting
• added a new control to selected a result formatter for a result value
• refactored the Runner for the new result formatting process

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters

Files:

• AlgorithmConverter.cs (modified) (1 diff)
• BaseConverter.cs (modified) (1 diff)
• RegressionProblemDataConverter.cs (modified) (4 diffs)
• ResultConverter.cs (added)
• ResultParameterConverter.cs (modified) (2 diffs)

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

@@ -30 +30 @@
       IAlgorithm algorithm = value as IAlgorithm;
       foreach (var res in algorithm.Results) {
+        item.AddChildren(root.Extract(res, root));
+        /*
         item.AddChildren(new ResultJsonItem() {
           Name = res.Name,
           Description = res.Description
-        });
+        });*/
       }
       item.AddChildren(root.Extract(algorithm.Problem, root));

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

@@ -20 +20 @@
     public abstract IJsonItem Extract(IItem value, IJsonItemConverter root);
 
+
     #region Helper
-
     protected IItem Instantiate(Type type, params object[] args) =>
       (IItem)Activator.CreateInstance(type,args);

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

@@ -66 +66 @@
 
       // check data
-      if(!dataset.RowNames.Any(x => x == targetVariable.Value)) {
+      if(!dataset.ColumnNames.Any(x => x == targetVariable.Value)) {
         throw new Exception($"The value of the target variable ('{targetVariable.Value}') has no matching row name value of the dataset.");
       }
 
       foreach(var v in allowedInputVariables.Value) {
-        if(!dataset.RowNames.Any(x => x == v))
+        if(!dataset.ColumnNames.Any(x => x == v))
           throw new Exception($"The value of the input variable ('{v}') has no matching row name value of the dataset.");
       }
@@ -106 +106 @@
         var dictTmp = new Dictionary<string, IList>();
         int c = 0;
-        foreach (var col in item.RowNames) {
+        foreach (var col in item.ColumnNames) {
           dictTmp.Add(col, new List<double>(item.Value[c]));
           ++c;
@@ -116 +116 @@
 
         var variableNames = dataset.GetType().GetField(VariableNames, flags);
-        variableNames.SetValue(dataset, item.RowNames);
+        variableNames.SetValue(dataset, item.ColumnNames);
 
         var dataInfo = dataset.GetType().GetField(VariableValues, flags);
@@ -162 +162 @@
 
         // add list items and set their check state (based on allowed input variables)
-        foreach(var i in matrix.RowNames) {
+        foreach(var i in matrix.ColumnNames) {
           bool isChecked = false;
           foreach(var x in item.Value)

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
@@ -14 +11 @@
 
     public override bool CanConvertType(Type t) =>
-      t.GetInterfaces().Any(x => x == typeof(IResultParameter));
+      t.GetInterfaces().Any(x => x == ConvertableType);
 
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) {
       IResultParameter res = value as IResultParameter;
+      var formatter = ResultFormatter.ForType(res.DataType).Last();
       return new ResultJsonItem() {
         Name = res.ActualName,
-        Description = res.Description
+        Description = res.Description,
+        ResultFormatterType = formatter.GetType().FullName,
+        ValueType = res.DataType
       };
     }