Changeset 4780 for trunk/sources

Timestamp:

11/12/10 13:25:24 (14 years ago)

Author:

mkommend

Message:

Corrected updating of ´ClassificationProblemData` parameters after data import (ticket #939).

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Classification/3.3/ClassificationProblemData.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblemData.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/ClassificationProblemData.cs

@@ -255 +255 @@
     }
 
+    protected override void OnProblemDataChanged(EventArgs e) {
+      base.OnProblemDataChanged(e);
+      UpdateClassValues();
+    }
+
     private void UpdateClassValues() {
       sortedClassValues = Dataset.GetVariableValues(TargetVariable.Value).Distinct().ToList();
@@ -271 +276 @@
       }
       ClassNames = array;
+      UpdateMisclassifciationMatrixHeaders();
       RegisterParameterValueEvents();
     }
@@ -304 +310 @@
 
     private void UpdateMisclassifciationMatrixHeaders() {
-      MisclassificationMatrix.RowNames = ClassNames.Select(name => "Estimated " + name);
-      MisclassificationMatrix.ColumnNames = ClassNames.Select(name => "Actual " + name);
+      MisclassificationMatrix.RowNames = ClassNames.Select(name => "Estimated " + name).ToList() ;
+      MisclassificationMatrix.ColumnNames = ClassNames.Select(name => "Actual " + name).ToList();
     }
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblemData.cs

@@ -405 +405 @@
       InputVariables.SetItemCheckedState(variableNames.First(), false);
       int middle = (int)(csvFileParser.Rows * 0.5);
+      TrainingSamplesEnd = new IntValue(middle);
       TrainingSamplesStart = new IntValue(0);
-      TrainingSamplesEnd = new IntValue(middle);
+      TestSamplesEnd = new IntValue(csvFileParser.Rows);
       TestSamplesStart = new IntValue(middle);
-      TestSamplesEnd = new IntValue(csvFileParser.Rows);
       suppressEvents = false;
       OnProblemDataChanged(EventArgs.Empty);