Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6302


Ignore:
Timestamp:
05/26/11 17:55:44 (11 years ago)
Author:
gkronber
Message:

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

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs

    r6252 r6302  
    7373        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Points.DataBindXY(Content.ProblemData.TrainingIndizes.ToArray(),
    7474          Content.EstimatedTrainingValues.ToArray());
     75        this.chart.DataManipulator.InsertEmptyPoints(Content.ProblemData.Dataset.Rows, IntervalType.Number, ESTIMATEDVALUES_TRAINING_SERIES_NAME);
    7576        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Tag = Content;
    7677
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs

    r6254 r6302  
    5454      trainingPartitions = new Dictionary<IClassificationModel, IntRange>();
    5555      testPartitions = new Dictionary<IClassificationModel, IntRange>();
    56       foreach (var model in Model.Models) {
    57         trainingPartitions[model] = (IntRange)ProblemData.TrainingPartition.Clone();
    58         testPartitions[model] = (IntRange)ProblemData.TestPartition.Clone();
     56      foreach (var pair in original.trainingPartitions) {
     57        trainingPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
     58      }
     59      foreach (var pair in original.testPartitions) {
     60        testPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
    5961      }
    6062      RecalculateResults();
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs

    r6254 r6302  
    5151      trainingPartitions = new Dictionary<IRegressionModel, IntRange>();
    5252      testPartitions = new Dictionary<IRegressionModel, IntRange>();
    53       foreach (var model in Model.Models) {
    54         trainingPartitions[model] = (IntRange)ProblemData.TrainingPartition.Clone();
    55         testPartitions[model] = (IntRange)ProblemData.TestPartition.Clone();
     53      foreach (var pair in original.trainingPartitions) {
     54        trainingPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
    5655      }
     56      foreach (var pair in original.testPartitions) {
     57        testPartitions[cloner.Clone(pair.Key)] = cloner.Clone(pair.Value);
     58      }
     59      RecalculateResults();
    5760    }
    5861
Note: See TracChangeset for help on using the changeset viewer.