Context Navigation

Changeset 16803 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4

Timestamp:

04/17/19 19:43:45 (6 years ago)

Author:

ddorfmei

Message:

#2931: Merged revision(s) 16720-16802 from trunk

Location:

branches/2931_OR-Tools_LP_MIP

Files:

branches/2931_OR-Tools_LP_MIP
- Property svn:mergeinfo changed
  /trunk merged: 16729,16737,16740,16743,16757-16758,16762-16764,16768-16769,16779,16782-16784,16788,16792,16794-16799,16802

Property svn:mergeinfo changed

/branches/SensitivityEvaluator/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (added)	merged: 12204,12209-12211,12216,12218,12302,12309,12311,12409,12416-12418,12448-12449,12486-12487,13401
/trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification	merged: 16763,16788

r16720	r16803
126	126	<Compile Include="ModelCreators\NormalDistributedThresholdsModelCreator.cs" />
127	127	<Compile Include="MultiObjective\SymbolicClassificationMultiObjectiveValidationBestSolutionAnalyzer.cs" />
	128	<Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveWeightedPerformanceMeasuresEvaluator.cs" />
	129	<Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveWeightedResidualsMeanSquaredErrorEvaluator.cs" />
128	130	<Compile Include="SymbolicClassificationPhenotypicDiversityAnalyzer.cs" />
129	131	<Compile Include="SymbolicClassificationPruningAnalyzer.cs" />

r16720	r16803
81	81	var classificationProblemData = problemData as IClassificationProblemData;
82	82	if (classificationProblemData == null)
83		throw new ArgumentException("The problem data is not ~~a regression problem data~~. Instead a " + problemData.GetType().GetPrettyName() + " was provided.", "problemData");
	83	throw new ArgumentException("The problem data is not compatible with this classification model. Instead a " + problemData.GetType().GetPrettyName() + " was provided.", "problemData");
84	84	return IsProblemDataCompatible(classificationProblemData, out errorMessage);
85	85	}

-                      r16720
+                      r16803
     public override IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows) {
+      var estimatedValues = GetEstimatedValues(dataset, rows);
+      return GetEstimatedClassValues(estimatedValues);
+    }
+    public IEnumerable<double> GetEstimatedClassValues(IEnumerable<double> estimatedValues) {
       if (!Thresholds.Any() && !ClassValues.Any()) throw new ArgumentException("No thresholds and class values were set for the current symbolic classification model.");
       foreach (var x in GetEstimatedValues(dataset, rows)) {
+      foreach (var x in estimatedValues) {
         int classIndex = 0;
         // find first threshold value which is larger than x => class index = threshold index + 1
 …
+      }
+    }
     public override ISymbolicClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData) {

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