Changeset 7994

Timestamp:

06/12/12 16:30:34 (13 years ago)

Author:

sforsten

Message:

#1867: corrected some mistakes

Location:

branches/HeuristicLab.DataImporter

Files:

• HeuristicLab.DataImporter.Command/MissingValues/DeleteColumnsWithMissingValuesThresholdCommand.cs (modified) (1 diff)
• HeuristicLab.DataImporter.Command/MissingValues/DeleteRowsWithMissingValuesThresholdCommand.cs (modified) (1 diff)
• HeuristicLab.DataImporter.Data/View/ColumnGroupView.cs (modified) (1 diff)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/DeleteColumnsWithMissingValuesThresholdCommand.cs

@@ -52 +52 @@
 
       oldColumn = ColumnGroup.GetColumn(oldColumnIndex);
-      if ((double)oldColumn.NullValuesCount / (double)oldColumn.TotalValuesCount < Threshold) {
+      if ((double)oldColumn.NonNullValuesCount / (double)oldColumn.TotalValuesCount < Threshold) {
         ColumnGroup.RemoveColumn(oldColumn);
       } else {

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/DeleteRowsWithMissingValuesThresholdCommand.cs

@@ -57 +57 @@
       for (int rowInd = 0; rowInd < ColumnGroup.RowCount; rowInd++) {
         row = ColumnGroup.GetRow(rowInd);
-        double missingValues = ColumnGroup.GetRow(rowInd).Where(x => x != null).Count();
-        if (missingValues / columnsCount < Threshold) {
+        double setValues = ColumnGroup.GetRow(rowInd).Where(x => x != null).Count();
+        if (setValues / columnsCount < Threshold) {
           deletedRows[rowInd] = row;
         }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/View/ColumnGroupView.cs

@@ -392 +392 @@
       }
       lblNullValues.Text = nullValuesCount.ToString();
-      double nullPercentage = (double)nullValuesCount / (double)totalValuesCount;
+      double nullPercentage = (100.0 / (double)(totalValuesCount + nullValuesCount)) * (double)nullValuesCount;
       lblNullPercentage.Text = Double.IsNaN(nullPercentage) ? "" : nullPercentage.ToString();
       lblValues.Text = totalValuesCount.ToString();