Changeset 8885 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification

Timestamp:

11/08/12 16:43:08 (12 years ago)

Author:

sforsten

Message:

#1942:

• implemented changes suggested by mkommend in comment:15:ticket:1942 except the first remark
• TimeSeriesPrognosisInstanceProvider has been adapted to work similar to other DataAnalysisInstanceProvider, also views have been created for it

Location:

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification

Files:

• CSV/ClassifiactionCSVInstanceProvider.cs (modified) (2 diffs)
• ClassificationImportType.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/CSV/ClassifiactionCSVInstanceProvider.cs

@@ -94 +94 @@
       List<IList> values = csvFileParser.Values;
       if (type.Shuffle) {
-        values = Shuffle(values, csvFileParser.VariableNames.ToList().FindIndex(x => x.Equals(type.TargetVariable)),
-                         type.Training, out trainingPartEnd);
+        values = Shuffle(values);
+        if (type.UniformlyDistributeClasses) {
+          values = Shuffle(values, csvFileParser.VariableNames.ToList().FindIndex(x => x.Equals(type.TargetVariable)),
+                           type.Training, out trainingPartEnd);
+        }
       }
 
@@ -147 +150 @@
       trainingPartEnd = training.First().Count;
 
-      training = Shuffle(training);
-      test = Shuffle(test);
       for (int i = 0; i < training.Count; i++) {
         for (int j = 0; j < test[i].Count; j++) {

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/ClassificationImportType.cs

@@ -23 +23 @@
   public class ClassificationImportType : DataAnalysisImportType {
     public string TargetVariable { get; set; }
+    public bool UniformlyDistributeClasses { get; set; }
   }
 }