Context Navigation

-                      r5680
+                      r5681
       IEnumerable<int> rows) {
       string targetVariable = problemData.TargetVariable;
+      List<double> originalClasses = problemData.ClassValues.ToList();
+      int nClasses = problemData.Classes;
+      List<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(tree, problemData.Dataset, rows).ToList();
+      double maxEstimatedValue = estimatedValues.Max();
+      double minEstimatedValue = estimatedValues.Min();
+      var estimatedTargetValues =
+         (from row in problemData.TrainingIndizes
+          select new { EstimatedValue = estimatedValues[row], TargetValue = problemData.Dataset[targetVariable, row] })
+         .ToList();
+      var estimatedValues = interpreter.GetSymbolicExpressionTreeValues(tree, problemData.Dataset, rows);
+      var targetClassValues = problemData.Dataset.GetEnumeratedVariableValues(targetVariable, rows);
+      Dictionary<double, double> classMean = new Dictionary<double, double>();
+      Dictionary<double, double> classStdDev = new Dictionary<double, double>();
+      // calculate moments per class
+      foreach (var classValue in originalClasses) {
+        var estimatedValuesForClass = from x in estimatedTargetValues
+                                      where x.TargetValue == classValue
+                                      select x.EstimatedValue;
+        double mean, variance;
+        OnlineMeanAndVarianceCalculator.Calculate(estimatedValuesForClass, out mean, out variance);
+        classMean[classValue] = mean;
+        classStdDev[classValue] = Math.Sqrt(variance);
+      }
+      List<double> thresholds = new List<double>();
+      for (int i = 0; i < nClasses - 1; i++) {
+        for (int j = i + 1; j < nClasses; j++) {
+          double x1, x2;
+          double class0 = originalClasses[i];
+          double class1 = originalClasses[j];
+          // calculate all thresholds
+          CalculateCutPoints(classMean[class0], classStdDev[class0], classMean[class1], classStdDev[class1], out x1, out x2);
+          if (!thresholds.Any(x => x.IsAlmost(x1))) thresholds.Add(x1);
+          if (!thresholds.Any(x => x.IsAlmost(x2))) thresholds.Add(x2);
+        }
+      }
+      thresholds.Sort();
+      thresholds.Insert(0, double.NegativeInfinity);
+      thresholds.Add(double.PositiveInfinity);
+      List<double> classValues = new List<double>();
+      for (int i = 0; i < thresholds.Count - 1; i++) {
+        double m;
+        if (double.IsNegativeInfinity(thresholds[i])) {
+          m = thresholds[i + 1] - 1.0;
+        } else if (double.IsPositiveInfinity(thresholds[i + 1])) {
+          m = thresholds[i] + 1.0;
+        } else {
+          m = thresholds[i] + (thresholds[i + 1] - thresholds[i]) / 2.0;
+        }
+        double maxDensity = 0;
+        double maxDensityClassValue = -1;
+        foreach (var classValue in originalClasses) {
+          double density = NormalDensity(m, classMean[classValue], classStdDev[classValue]);
+          if (density > maxDensity) {
+            maxDensity = density;
+            maxDensityClassValue = classValue;
+          }
+        }
+        classValues.Add(maxDensityClassValue);
+      }
+      List<double> filteredThresholds = new List<double>();
+      List<double> filteredClassValues = new List<double>();
+      filteredThresholds.Add(thresholds[0]);
+      filteredClassValues.Add(classValues[0]);
+      for (int i = 0; i < classValues.Count - 1; i++) {
+        if (classValues[i] != classValues[i + 1]) {
+          filteredThresholds.Add(thresholds[i + 1]);
+          filteredClassValues.Add(classValues[i + 1]);
+        }
+      }
+      filteredThresholds.Add(double.PositiveInfinity);
+      return new SymbolicDiscriminantFunctionClassificationModel(tree, interpreter, filteredClassValues, filteredThresholds);
+    }
+    private static double NormalDensity(double x, double mu, double sigma) {
+      return (1.0 / Math.Sqrt(2.0 * Math.PI * sigma * sigma)) * Math.Exp(-((x - mu) * (x - mu)) / (2.0 * sigma * sigma));
+    }
+    private static void CalculateCutPoints(double m1, double s1, double m2, double s2, out double x1, out double x2) {
+      double a = (s1 * s1 - s2 * s2);
+      x1 = -(-m2 * s1 * s1 + m1 * s2 * s2 + Math.Sqrt(s1 * s1 * s2 * s2 * ((m1 - m2) * (m1 - m2) + 2.0 * (-s1 * s1 + s2 * s2) * Math.Log(s2 / s1)))) / a;
+      x2 = (m2 * s1 * s1 - m1 * s2 * s2 + Math.Sqrt(s1 * s1 * s2 * s2 * ((m1 - m2) * (m1 - m2) + 2.0 * (-s1 * s1 + s2 * s2) * Math.Log(s2 / s1)))) / a;
+      double[] classValues;
+      double[] thresholds;
+      NormalDistributionCutPointsThresholdCalculator.CalculateThresholds(problemData, estimatedValues, targetClassValues, out classValues, out thresholds);
+      return new SymbolicDiscriminantFunctionClassificationModel(tree, interpreter, classValues, thresholds);
+    }
+  }

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.EvolutionStrategy/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabAlgorithmsEvolutionStrategyPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabAlgorithmsGeneticAlgorithmPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.LocalSearch/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabAlgorithmsLocalSearchPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.NSGA2/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabAlgorithmsNSGA2Plugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabAlgorithmsOffspringSelectionGeneticAlgorithmPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3

Property svn:ignore

old	new
4	4	*.user
5	5	*.suo
	6	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.SimulatedAnnealing/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabAlgorithmsSimulatedAnnealingPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.TabuSearch/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabAlgorithmsTabuSearchPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Analysis.Views/3.3

Property svn:ignore

old	new
3	3	HeuristicLabAnalysisViewsPlugin.cs
4	4	*.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Analysis/3.3

Property svn:ignore

old	new
3	3	HeuristicLabAnalysisPlugin.cs
4	4	*.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Clients.Common/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabClientsCommonPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.CodeEditor/3.3

Property svn:ignore

old	new
3	3	HeuristicLabCodeEditorPlugin.cs
4	4	*.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Collections/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabCollectionsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Common.Resources/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabCommonResourcesPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Common/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabCommonPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Core.Views/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabCoreViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Core/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabCorePlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Data.Views/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabDataViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Data/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabDataPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.DebugEngine/3.3

Property svn:ignore

old	new
3	3	HeuristicLabDebugEnginePlugin.cs
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Tests

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.PermutationEncoding.Views/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabEncodingsPermutationEncodingViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.PermutationEncoding/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabEncodingsPermutationEncodingPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3

Property svn:ignore

old	new
3	3	HeuristicLabEncodingsRealVectorEncodingPlugin.cs
4	4	*.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests

Property svn:ignore

old	new
2	2	obj
3	3	*.user
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3

Property svn:ignore

old	new
3	3	HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

Property svn:ignore

old	new
2	2	obj
3	3	HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Tests

Property svn:ignore

old	new
2	2	obj
3	3	*.user
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Property svn:ignore

old	new
3	3	HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs
4	4	*.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests

Property svn:ignore

old	new
2	2	obj
3	3	*.user
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.1.0/ALGLIB-3.1.0

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.1.0/HeuristicLab.ALGLIB-3.1.0

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabALGLIBPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/HeuristicLab.LibSVM-1.6.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabLibSVMPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/HeuristicLab.ProtobufCS

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProtobufCSPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoGen

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoGen.Test

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers.Test

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.SharpDevelop/3.1.1.5327

Property svn:ignore

old	new
2	2	obj
3	3	*.user
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/HeuristicLab.WinFormsUI-2.3.1

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabWinFormsUIPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/WinFormsUI-2.3.1

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ExtLibs/HeuristicLab.log4net/1.2.10.0

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.MainForm.WindowsForms/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.MainForm/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Operators.Programmable/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3

Property svn:ignore

old	new
3	3	obj
4	4	*Plugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Operators.Views/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabOperatorsViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Operators/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabOperatorsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Optimization.Operators/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Optimization.Views/3.3

Property svn:ignore

old	new
3	3	obj
4	4	*.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Optimization/3.3

Property svn:ignore

old	new
3	3	obj
4	4	*.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Optimizer/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabOptimizerPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.ParallelEngine/3.3

Property svn:ignore

old	new
2	2	obj
3	3	HeuristicLabParallelEnginePlugin.cs
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Parameters.Views/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabParametersViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Parameters/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabParametersPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Persistence.GUI/3.3

Property svn:ignore

old	new
4	4	HeuristicLab.Persistence.GUI-3.3.suo
5	5	HeuristicLabPersistenceGUIPlugin.cs
	6	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Persistence/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabPersistencePlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Persistence/3.3/Tests

Property svn:ignore

old	new
2	2	obj
3	3	*.user
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.PluginInfrastructure/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	Service References
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt.Views/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabProblemsArtificialAntViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt.Views/3.4

Property svn:ignore

old	new
2	2	obj
3	3	HeuristicLabProblemsArtificialAntViewsPlugin.cs
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabProblemsArtificialAntPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4

Property svn:ignore

old	new
2	2	obj
3	3	HeuristicLabProblemsArtificialAntPlugin.cs
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Classification/3.3

Property svn:ignore

old	new
4	4	HeuristicLabProblemsDataAnalysisClassifcationPlugin.cs
5	5	HeuristicLabProblemsDataAnalysisClassificationPlugin.cs
	6	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Regression/3.3

Property svn:ignore

old	new
3	3	HeuristicLabProblemsDataAnalysisRegressionPlugin.cs
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4

Property svn:ignore

old	new
3	3	HeuristicLabProblemsDataAnalysisSymbolicClassificationPlugin.cs
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveTrainingBestSolutionAnalyzer.cs

r5678	r5681
74	74	var estimatedValues = SymbolicDataAnalysisTreeInterpreter.GetSymbolicExpressionTreeValues(bestTree, ProblemData.Dataset, ProblemData.TrainingIndizes);
75	75	var targetValues = ProblemData.Dataset.GetEnumeratedVariableValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes);
76		~~DiscriminantFunctionClassificationSolution.CalculateClass~~Thresholds(ProblemData, estimatedValues, targetValues, out classValues, out thresholds);
	76	AccuracyMaximizationThresholdCalculator.CalculateThresholds(ProblemData, estimatedValues, targetValues, out classValues, out thresholds);
77	77	var model = new SymbolicDiscriminantFunctionClassificationModel(bestTree, SymbolicDataAnalysisTreeInterpreter, classValues, thresholds);
78	78	return new SymbolicDiscriminantFunctionClassificationSolution(model, ProblemData);

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveTrainingBestSolutionAnalyzer.cs

r5678	r5681
72	72	var estimatedValues = SymbolicDataAnalysisTreeInterpreter.GetSymbolicExpressionTreeValues(bestTree, ProblemData.Dataset, ProblemData.TrainingIndizes);
73	73	var targetValues = ProblemData.Dataset.GetEnumeratedVariableValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes);
74		~~DiscriminantFunctionClassificationSolution.CalculateClass~~Thresholds(ProblemData, estimatedValues, targetValues, out classValues, out thresholds);
	74	AccuracyMaximizationThresholdCalculator.CalculateThresholds(ProblemData, estimatedValues, targetValues, out classValues, out thresholds);
75	75	var model = new SymbolicDiscriminantFunctionClassificationModel(bestTree, SymbolicDataAnalysisTreeInterpreter, classValues, thresholds);
76	76	return new SymbolicDiscriminantFunctionClassificationSolution(model, ProblemData);

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Property svn:ignore

old	new
3	3	HeuristicLabProblemsDataAnalysisSymbolicRegressionPlugin.cs
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Property svn:ignore

old	new
3	3	HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tests

Property svn:ignore

old	new
1	1	bin
2	2	obj
	3	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabProblemsDataAnalysisViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProblemsDataAnalysisViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3

Property svn:ignore

old	new
3	3	HeuristicLabProblemsDataAnalysisPlugin.cs
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Tests

Property svn:ignore

old	new
2	2	obj
3	3	*.user
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4

Property svn:ignore

old	new
3	3	HeuristicLabProblemsDataAnalysisPlugin.cs
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DiscriminantFunctionClassificationModel.cs

r5678	r5681
64	64
65	65	[StorableConstructor]
66		protected DiscriminantFunctionClassificationModel(~~) : base(~~) { }
	66	protected DiscriminantFunctionClassificationModel(bool deserializing) : base(deserializing) { }
67	67	protected DiscriminantFunctionClassificationModel(DiscriminantFunctionClassificationModel original, Cloner cloner)
68	68	: base(original, cloner) {

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DiscriminantFunctionClassificationSolution.cs

-                      r5678
+                      r5681
       : base(original, cloner) {
+    }
     public DiscriminantFunctionClassificationSolution(IRegressionModel model, IClassificationProblemData problemData)
       : this(new DiscriminantFunctionClassificationModel(model, problemData.ClassValues, CalculateClassThresholds(model, problemData, problemData.TrainingIndizes)), problemData) {
+    public DiscriminantFunctionClassificationSolution(IRegressionModel model, IClassificationProblemData problemData, IEnumerable<double> classValues, IEnumerable<double> thresholds)
+      : this(new DiscriminantFunctionClassificationModel(model, classValues, thresholds), problemData) {
+    }
     public DiscriminantFunctionClassificationSolution(IDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData)
 …
+    }
     #endregion
-    private static double[] CalculateClassThresholds(IRegressionModel model, IClassificationProblemData problemData, IEnumerable<int> rows) {
-      double[] thresholds;
-      double[] classValues;
-      CalculateClassThresholds(problemData, model.GetEstimatedValues(problemData.Dataset, rows), problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows), out classValues, out thresholds);
-      return thresholds;
+    }
-    public static void CalculateClassThresholds(IClassificationProblemData problemData, IEnumerable<double> estimatedValues, IEnumerable<double> targetClassValues, out double[] classValues, out double[] thresholds) {
-      int slices = 100;
-      List<double> estimatedValuesList = estimatedValues.ToList();
-      double maxEstimatedValue = estimatedValuesList.Max();
-      double minEstimatedValue = estimatedValuesList.Min();
-      double thresholdIncrement = (maxEstimatedValue - minEstimatedValue) / slices;
-      var estimatedAndTargetValuePairs =
-        estimatedValuesList.Zip(targetClassValues, (x, y) => new { EstimatedValue = x, TargetClassValue = y })
-        .OrderBy(x => x.EstimatedValue)
-        .ToList();
-      classValues = problemData.ClassValues.OrderBy(x => x).ToArray();
-      int nClasses = classValues.Length;
-      thresholds = new double[nClasses + 1];
-      thresholds[0] = double.NegativeInfinity;
-      thresholds[thresholds.Length - 1] = double.PositiveInfinity;
-      // incrementally calculate accuracy of all possible thresholds
-      int[,] confusionMatrix = new int[nClasses, nClasses];
-      // one threshold is always treated as binary separation of the remaining classes
-      for (int i = 1; i < thresholds.Length - 1; i++) {
-        double lowerThreshold = thresholds[i - 1];
-        double actualThreshold = Math.Max(lowerThreshold, minEstimatedValue);
-        double lowestBestThreshold = double.NaN;
-        double highestBestThreshold = double.NaN;
-        double bestClassificationScore = double.PositiveInfinity;
-        bool seriesOfEqualClassificationScores = false;
-        while (actualThreshold < maxEstimatedValue) {
-          double classificationScore = 0.0;
-          foreach (var pair in estimatedAndTargetValuePairs) {
-            //all positives
-            if (pair.TargetClassValue.IsAlmost(classValues[i - 1])) {
-              if (pair.EstimatedValue > lowerThreshold && pair.EstimatedValue < actualThreshold)
-                //true positive
-                classificationScore += problemData.GetClassificationPenalty(classValues[i - 1], classValues[i - 1]);
-              else
-                //false negative
-                classificationScore += problemData.GetClassificationPenalty(classValues[i], classValues[i - 1]);
+            }
-              //all negatives
-            else {
-              if (pair.EstimatedValue > lowerThreshold && pair.EstimatedValue < actualThreshold)
-                //false positive
-                classificationScore += problemData.GetClassificationPenalty(classValues[i - 1], classValues[i]);
-              else
-                //true negative, consider only upper class
-                classificationScore += problemData.GetClassificationPenalty(classValues[i], classValues[i]);
+            }
+          }
-          //new best classification score found
-          if (classificationScore < bestClassificationScore) {
-            bestClassificationScore = classificationScore;
-            lowestBestThreshold = actualThreshold;
-            highestBestThreshold = actualThreshold;
-            seriesOfEqualClassificationScores = true;
+          }
-            //equal classification scores => if seriesOfEqualClassifcationScores == true update highest threshold
-          else if (Math.Abs(classificationScore - bestClassificationScore) < double.Epsilon && seriesOfEqualClassificationScores)
-            highestBestThreshold = actualThreshold;
-          //worse classificatoin score found reset seriesOfEqualClassifcationScores
-          else seriesOfEqualClassificationScores = false;
-          actualThreshold += thresholdIncrement;
+        }
-        //scale lowest thresholds and highest found optimal threshold according to the misclassification matrix
-        double falseNegativePenalty = problemData.GetClassificationPenalty(classValues[i], classValues[i - 1]);
-        double falsePositivePenalty = problemData.GetClassificationPenalty(classValues[i - 1], classValues[i]);
-        thresholds[i] = (lowestBestThreshold * falsePositivePenalty + highestBestThreshold * falseNegativePenalty) / (falseNegativePenalty + falsePositivePenalty);
+      }
+    }
+  }
+}

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

-                      r5662
+                      r5681
     <Compile Include="ClusteringSolution.cs" />
     <Compile Include="ClassificationEnsembleModel.cs" />
+    <Compile Include="Interfaces\Classification\IDiscriminantFunctionThresholdCalculator.cs" />
     <Compile Include="Interfaces\Classification\IClassificationEnsembleModel.cs" />
     <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs" />
 …
     <Compile Include="RegressionSolution.cs" />
     <Compile Include="TableFileParser.cs" />
+    <Compile Include="ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
+    <Compile Include="ThresholdCalculators\NormalDistributionCutPointsThresholdCalculator.cs" />
+    <Compile Include="ThresholdCalculators\ThresholdCalculator.cs" />
     <None Include="HeuristicLab.snk" />
     <None Include="HeuristicLabProblemsDataAnalysisPlugin.cs.frame" />

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Tests

Property svn:ignore

old	new
1	1	bin
2	2	obj
	3	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.3

Property svn:ignore

old	new
3	3	HeuristicLabProblemsExternalEvaluationGPViewsPlugin.cs
4	4	HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.4

Property svn:ignore

old	new
3	3	HeuristicLabProblemsExternalEvaluationGPViewsPlugin.cs
4	4	HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProblemsExternalEvaluationGPPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.GP/3.4

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProblemsExternalEvaluationGPPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation.Views/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProblemsExternalEvaluationViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ExternalEvaluation/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProblemsExternalEvaluationPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.Knapsack.Views/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.Knapsack/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.OneMax.Views/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProblemsOneMaxViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.OneMax/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.TestFunctions.Views/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProblemsTestFunctionsViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.TestFunctions/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProblemsTestFunctionsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.TestFunctions/3.3/Tests

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.TravelingSalesman.Views/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabProblemsTravelingSalesmanViewsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.TravelingSalesman/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabProblemsTravelingSalesmanPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.VehicleRouting.Views/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Problems.VehicleRouting/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Random/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Selection/3.3

Property svn:ignore

old	new
3	3	bin
4	4	obj
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.SequentialEngine/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabSequentialEnginePlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Tracing/3.3

Property svn:ignore

old	new
3	3	*.user
4	4	HeuristicLabTracingPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab.Visualization.ChartControlsExtensions/3.3

Property svn:ignore

old	new
3	3	obj
4	4	HeuristicLabVisualizationChartControlsExtensionsPlugin.cs
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab/3.3

Property svn:ignore

old	new
3	3	CustomPostBuild.cmd
4	4	*.user
	5	*.vs10x

branches/DataAnalysis Refactoring/HeuristicLab/3.3/Tests

Property svn:ignore

old	new
2	2	bin
3	3	obj
	4	*.vs10x

Note: See TracChangeset for help on using the changeset viewer.