Changeset 6232 for branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis

Timestamp:

05/18/11 11:08:26 (14 years ago)

Author:

epitzer

Message:

rebased on current trunk r6223 (#1530)

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs (modified) (2 diffs)

branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

@@ -37 +37 @@
     private const string ClassNamesParameterName = "ClassNames";
     private const string ClassificationPenaltiesParameterName = "ClassificationPenalties";
-    private const int MaximumNumberOfClass = 100;
+    private const int MaximumNumberOfClasses = 20;
     private const int InspectedRowsToDetermineTargets = 500;
 
@@ -266 +266 @@
 
     private static IEnumerable<string> CheckVariablesForPossibleTargetVariables(Dataset dataset) {
+      int maxSamples = Math.Min(InspectedRowsToDetermineTargets, dataset.Rows);
       var validTargetVariables = from v in dataset.VariableNames
-                                 let DistinctValues = dataset.Rows > InspectedRowsToDetermineTargets ? dataset.GetVariableValues(v, 0, InspectedRowsToDetermineTargets).Distinct().Count()
-                                                                        : dataset.GetVariableValues(v).Distinct().Count()
-                                 where DistinctValues < MaximumNumberOfClass
+                                 let DistinctValues = dataset.GetVariableValues(v)
+                                   .Take(maxSamples)
+                                   .Distinct()
+                                   .Count()
+                                 where DistinctValues < MaximumNumberOfClasses
                                  select v;
 
       if (!validTargetVariables.Any())
-        throw new ArgumentException("Import of classification problem data was not successfull, because no target variable was found." +
-          " A target variable must have at most " + MaximumNumberOfClass + " distinct values to be applicable to classification.");
+        throw new ArgumentException("Import of classification problem data was not successful, because no target variable was found." +
+          " A target variable must have at most " + MaximumNumberOfClasses + " distinct values to be applicable to classification.");
       return validTargetVariables;
     }