Changeset 17843 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultFormatter

Timestamp:

02/23/21 16:36:44 (4 years ago)

Author:

dpiringe

Message:

#3026

• removed property ConvertableType from all converters
• removed the option to fixate or loosen the path of JsonItems (obsolete)
• added a abstract formatter SymbolicRegressionSolutionFormatterBase as base formatter for ISymbolicRegressionSolution
• unified the construction of exporter controls
• code cleanup

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultFormatter

Files:

• MatlabResultFormatter.cs (modified) (1 diff)
• ResultFormatter.cs (modified) (1 diff)
• SymbolicRegressionSolutionFormatterBase.cs (added)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultFormatter/MatlabResultFormatter.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 
 namespace HeuristicLab.JsonInterface {
-  public class MatlabResultFormatter : ResultFormatter {
-    public override int Priority => 5;
-
-    public override bool CanFormatType(Type t) {
-      var interfaces = t.GetInterfaces();
-      return t.GetInterfaces().Any(x => x == typeof(ISymbolicRegressionSolution));
-    }
-      
-    private ISymbolicExpressionTreeStringFormatter MatlabFormatter => new SymbolicDataAnalysisExpressionMATLABFormatter();
-
-    public override string Format(object o) => MatlabFormatter.Format((ISymbolicExpressionTree)((ISymbolicRegressionSolution)o).Model.SymbolicExpressionTree);
+  public class MatlabResultFormatter : SymbolicRegressionSolutionFormatterBase {
+    protected override ISymbolicExpressionTreeStringFormatter SymbolicExpressionTreeStringFormatter 
+      => new SymbolicDataAnalysisExpressionMATLABFormatter();
   }
 }

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

@@ -12 +12 @@
   public abstract class ResultFormatter : IResultFormatter {
     public abstract int Priority { get; }
-
     public abstract bool CanFormatType(Type t);
     public abstract string Format(object o);