Context Navigation

← Previous Change
Next Change →

Classification

Timestamp:

10/29/15 18:33:51 (9 years ago)

Author:

gkronber

Message:

#1998: merged changesets r10551:13081 (only on HeuristicLab.Problems.DataAnalysis) from trunk to branch

Location:

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis

Files:

: 10 edited

. (modified) (1 prop)
3.4/Interfaces/Classification/IClassificationEnsembleModel.cs (modified) (2 diffs)
3.4/Interfaces/Classification/IClassificationEnsembleSolution.cs (modified) (2 diffs)
3.4/Interfaces/Classification/IClassificationModel.cs (modified) (2 diffs)
3.4/Interfaces/Classification/IClassificationProblem.cs (modified) (1 diff)
3.4/Interfaces/Classification/IClassificationProblemData.cs (modified) (2 diffs)
3.4/Interfaces/Classification/IClassificationSolution.cs (modified) (1 diff)
3.4/Interfaces/Classification/IDiscriminantFunctionClassificationModel.cs (modified) (2 diffs)
3.4/Interfaces/Classification/IDiscriminantFunctionClassificationSolution.cs (modified) (1 diff)
3.4/Interfaces/Classification/IDiscriminantFunctionThresholdCalculator.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis

Property svn:mergeinfo changed

/branches/Classification-Extensions/HeuristicLab.Problems.DataAnalysis (added)	merged: 11606-11607,11622,11643,11683-11686,11761
/branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis (added)	merged: 10134,10145-10148,10160,10164,10538,10689-10690,10694-10695,10708,10770,10772,10814,10845,10854,10869,10880,10922,10925,11002,11009,11011,11038,11064,11068,11070
/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis (added)	merged: 11571,11589,11621,12031-12032,12105,12141,12190,12437,12452-12453,12489,12505,12508
/branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.DataAnalysis (added)	merged: 11185,12694
/stable/HeuristicLab.Problems.DataAnalysis	merged: 11170,11173,12008-12009,12751
/trunk/sources/HeuristicLab.Problems.DataAnalysis	merged: 11031,11114,11156,11171,11174,11330,11417,11422,11623,11763,11766,12012,12067,12485,12492,12504,12509,12511,12524,12581,12612,12641,12722,12753,12790,12792,12816-12817,12851,13001,13027,13038,13040

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEnsembleModel.cs

r10556	r13083
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.
…	…
26	26	void Remove(IClassificationModel model);
27	27	IEnumerable<IClassificationModel> Models { get; }
28		IEnumerable<IEnumerable<double>> GetEstimatedClassValueVectors(Dataset dataset, IEnumerable<int> rows);
	28	IEnumerable<IEnumerable<double>> GetEstimatedClassValueVectors(IDataset dataset, IEnumerable<int> rows);
29	29	}
30	30	}

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEnsembleSolution.cs

r10556	r13083
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.
…	…
26	26	new IClassificationEnsembleModel Model { get; }
27	27	IItemCollection<IClassificationSolution> ClassificationSolutions { get; }
28		IEnumerable<IEnumerable<double>> GetEstimatedClassValueVectors(Dataset dataset, IEnumerable<int> rows);
	28	IEnumerable<IEnumerable<double>> GetEstimatedClassValueVectors(IDataset dataset, IEnumerable<int> rows);
29	29	}
30	30	}

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationModel.cs

-                      r10556
+                      r13083
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IClassificationModel : IDataAnalysisModel {
     IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows);
+    IEnumerable<double> GetEstimatedClassValues(IDataset dataset, IEnumerable<int> rows);
     IClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData);
+  }

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblem.cs

r10556	r13083
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationProblemData.cs

-                      r10556
+                      r13083
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
     IEnumerable<string> ClassNames { get; }
+    string PositiveClass { get; set; }
     IEnumerable<double> ClassValues { get; }
     int Classes { get; }

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationSolution.cs

r10556	r13083
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IDiscriminantFunctionClassificationModel.cs

-                      r10556
+                      r13083
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
     // class values and thresholds can only be assigned simultanously
     void SetThresholdsAndClassValues(IEnumerable<double> thresholds, IEnumerable<double> classValues);
     IEnumerable<double> GetEstimatedValues(Dataset dataset, IEnumerable<int> rows);
+    IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows);
     event EventHandler ThresholdsChanged;

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IDiscriminantFunctionClassificationSolution.cs

r10556	r13083
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IDiscriminantFunctionThresholdCalculator.cs

r10556	r13083
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

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

Context Navigation

Changeset 13083 for branches/ClassificationModelComparison/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification

Legend:

Download in other formats: