Changeset 6302 for trunk/sources

Timestamp:

05/26/11 17:55:44 (14 years ago)

Author:

gkronber

Message:

#1450: fixed cloning bug and a problem in the regression line chart view.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs

@@ -73 +73 @@
         this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Points.DataBindXY(Content.ProblemData.TrainingIndizes.ToArray(),
           Content.EstimatedTrainingValues.ToArray());
+        this.chart.DataManipulator.InsertEmptyPoints(Content.ProblemData.Dataset.Rows, IntervalType.Number, ESTIMATEDVALUES_TRAINING_SERIES_NAME);
         this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Tag = Content;
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs

@@ -54 +54 @@
       trainingPartitions = new Dictionary<IClassificationModel, IntRange>();
       testPartitions = new Dictionary<IClassificationModel, IntRange>();
-      foreach (var model in Model.Models) {
-        trainingPartitions[model] = (IntRange)ProblemData.TrainingPartition.Clone();
-        testPartitions[model] = (IntRange)ProblemData.TestPartition.Clone();
+      foreach (var pair in original.trainingPartitions) {
+        trainingPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
+      }
+      foreach (var pair in original.testPartitions) {
+        testPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
       }
       RecalculateResults();

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs

@@ -51 +51 @@
       trainingPartitions = new Dictionary<IRegressionModel, IntRange>();
       testPartitions = new Dictionary<IRegressionModel, IntRange>();
-      foreach (var model in Model.Models) {
-        trainingPartitions[model] = (IntRange)ProblemData.TrainingPartition.Clone();
-        testPartitions[model] = (IntRange)ProblemData.TestPartition.Clone();
+      foreach (var pair in original.trainingPartitions) {
+        trainingPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
       }
+      foreach (var pair in original.testPartitions) {
+        testPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
+      }
+      RecalculateResults();
     }