Changeset 8946 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisImpactValuesCalculator.cs

Timestamp:

11/27/12 11:02:09 (12 years ago)

Author:

mkommend

Message:

#1763: Merged remaining changes from the TreeSimplifier branch in the trunk and refactored impact values calculators.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (1 prop)
• 3.4 (modified) (1 prop)
• 3.4/Interfaces/ISymbolicDataAnalysisImpactValuesCalculator.cs (copied) (copied from branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisImpactValuesCalculator.cs) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

@@ +1 @@
+*.user
+Plugin.cs
 bin
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs
 obj
-*.vs10x
-Plugin.cs

@@ +1 @@
+*.user
+Plugin.cs
 bin
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs
 obj
-*.vs10x
-Plugin.cs

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisImpactValuesCalculator.cs

@@ -4 +4 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public interface ISymbolicDataAnalysisSolutionImpactValuesCalculator {
-    Dictionary<ISymbolicExpressionTreeNode, double> CalculateReplacementValues(ISymbolicExpressionTree tree,
-                                                                               ISymbolicDataAnalysisExpressionTreeInterpreter interpreter,
-                                                                               IDataAnalysisProblemData problemData);
-    Dictionary<ISymbolicExpressionTreeNode, double> CalculateImpactValues(ISymbolicExpressionTree tree,
-                                                                          ISymbolicDataAnalysisExpressionTreeInterpreter interpreter,
-                                                                          IDataAnalysisProblemData problemData,
-                                                                          double lowerEstimationLimit, double upperEstimationLimit);
+    double CalculateReplacementValue(ISymbolicDataAnalysisModel model, ISymbolicExpressionTreeNode node, IDataAnalysisProblemData problemData, IEnumerable<int> rows);
+    double CalculateImpactValue(ISymbolicDataAnalysisModel model, ISymbolicExpressionTreeNode node, IDataAnalysisProblemData problemData, IEnumerable<int> rows, double originalQuality = double.NaN);
   }
 }

@@ +1 @@
+*.user
+Plugin.cs
 bin
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs
 obj
-*.vs10x
-Plugin.cs