Changeset 17464 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Timestamp:

03/02/20 15:53:52 (5 years ago)

Author:

dpiringe

Message:

#3026:

• Runner now uses SymbolicDataAnalysisExpressionMATLABFormatter to save instances of ISymbolicRegressionSolution
• refactored user controls for detail view of json items, now they do not inherit from JsonItemBaseControl -> JsonItemBaseControl uses now an extra control
  • this change was made for fluid repositioning of controls (e.g. when no ActualName is present)

File:

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

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

@@ -17 +17 @@
 
     public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
-      //Dictionary<string, IList<double>> dict = null;
       var dictTmp = new Dictionary<string, IList>();
-      /*if (data.Children[0].Value is JObject jObj) {
-        dict = jObj.ToObject<Dictionary<string, IList<double>>>();
-        foreach (var x in dict) {
-          dictTmp.Add(x.Key, (IList)x.Value);
-        }
-      } else if(data.Children[0].Value is Dictionary<string, IList<double>> d) {
-        dict = d;
-      } else {
-        dictTmp = (Dictionary<string, IList>)data.Children[0].Value;
-      }
-      */
       DoubleNamedMatrixJsonItem matrix = data.Children[0] as DoubleNamedMatrixJsonItem;
       if(matrix != null) {
@@ -74 +62 @@
           int r = 0;
           foreach(var rowValue in x.Value) {
+            // TODO: for integers and bools aswell
             mat[c][r] = (double)rowValue; 
             ++r;