Changeset 9745 for branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/TrainingBestSolutionAnalyzer.cs

Timestamp:

07/24/13 13:10:17 (11 years ago)

Author:

gkronber

Message:

#1508 refactoring: removed smurf-naming.

File:

• branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/TrainingBestSolutionAnalyzer.cs (moved) (moved from branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SymbolicTradingSingleObjectiveTrainingBestSolutionAnalyzer.cs) (2 diffs)

branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/TrainingBestSolutionAnalyzer.cs

@@ -31 +31 @@
   /// An operator that analyzes the training best symbolic trading solution for single objective symbolic trading problems.
   /// </summary>
-  [Item("SymbolicTradingSingleObjectiveTrainingBestSolutionAnalyzer", "An operator that analyzes the training best symbolic trading solution for single objective symbolic trading problems.")]
+  [Item("Training-best Solution Analyzer (symbolic trading)", "An operator that analyzes the training best symbolic trading solution for single objective symbolic trading problems.")]
   [StorableClass]
-  public sealed class SymbolicTradingSingleObjectiveTrainingBestSolutionAnalyzer : SymbolicDataAnalysisSingleObjectiveTrainingBestSolutionAnalyzer<ISymbolicTradingSolution>,
+  public sealed class TrainingBestSolutionAnalyzer : SymbolicDataAnalysisSingleObjectiveTrainingBestSolutionAnalyzer<ISolution>,
   ISymbolicDataAnalysisInterpreterOperator {
     private const string ProblemDataParameterName = "ProblemData";
     private const string SymbolicDataAnalysisTreeInterpreterParameterName = "SymbolicDataAnalysisTreeInterpreter";
     #region parameter properties
-    public ILookupParameter<ITradingProblemData> ProblemDataParameter {
-      get { return (ILookupParameter<ITradingProblemData>)Parameters[ProblemDataParameterName]; }
+    public ILookupParameter<IProblemData> ProblemDataParameter {
+      get { return (ILookupParameter<IProblemData>)Parameters[ProblemDataParameterName]; }
     }
     public ILookupParameter<ISymbolicDataAnalysisExpressionTreeInterpreter> SymbolicDataAnalysisTreeInterpreterParameter {
@@ -47 +47 @@
 
     [StorableConstructor]
-    private SymbolicTradingSingleObjectiveTrainingBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
-    private SymbolicTradingSingleObjectiveTrainingBestSolutionAnalyzer(SymbolicTradingSingleObjectiveTrainingBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
-    public SymbolicTradingSingleObjectiveTrainingBestSolutionAnalyzer()
+    private TrainingBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    private TrainingBestSolutionAnalyzer(TrainingBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
+    public TrainingBestSolutionAnalyzer()
       : base() {
-      Parameters.Add(new LookupParameter<ITradingProblemData>(ProblemDataParameterName, "The problem data for the symbolic regression solution."));
+      Parameters.Add(new LookupParameter<IProblemData>(ProblemDataParameterName, "The problem data for the symbolic regression solution."));
       Parameters.Add(new LookupParameter<ISymbolicDataAnalysisExpressionTreeInterpreter>(SymbolicDataAnalysisTreeInterpreterParameterName, "The symbolic data analysis tree interpreter for the symbolic expression tree."));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymbolicTradingSingleObjectiveTrainingBestSolutionAnalyzer(this, cloner);
+      return new TrainingBestSolutionAnalyzer(this, cloner);
     }
 
-    protected override ISymbolicTradingSolution CreateSolution(ISymbolicExpressionTree bestTree, double bestQuality) {
-      var model = new SymbolicTradingModel((ISymbolicExpressionTree)bestTree.Clone(), SymbolicDataAnalysisTreeInterpreterParameter.ActualValue);
-      return new SymbolicTradingSolution(model, (ITradingProblemData)ProblemDataParameter.ActualValue.Clone());
+    protected override ISolution CreateSolution(ISymbolicExpressionTree bestTree, double bestQuality) {
+      var model = new Model((ISymbolicExpressionTree)bestTree.Clone(), SymbolicDataAnalysisTreeInterpreterParameter.ActualValue);
+      return new SymbolicSolution(model, (IProblemData)ProblemDataParameter.ActualValue.Clone());
     }
   }