Changeset 6611 for branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs
- Timestamp:
- 07/29/11 11:38:02 (13 years ago)
- Location:
- branches/QAPAlgorithms
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/QAPAlgorithms
- Property svn:mergeinfo changed
/trunk/sources merged: 6571-6585,6587-6592,6596-6606,6609
- Property svn:mergeinfo changed
-
branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis merged: 6574,6581,6587-6590,6592,6602-6604,6606
- Property svn:mergeinfo changed
-
branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs
r6569 r6611 20 20 #endregion 21 21 22 using System; 22 23 using System.Collections.Generic; 23 24 using System.Linq; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; 27 using HeuristicLab.Data; 26 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using System;28 using HeuristicLab.Data;29 29 30 30 namespace HeuristicLab.Problems.DataAnalysis { … … 35 35 [Item("Regression Ensemble Solution", "A regression solution that contains an ensemble of multiple regression models")] 36 36 // [Creatable("Data Analysis")] 37 public class RegressionEnsembleSolution : RegressionSolution, IRegressionEnsembleSolution {37 public sealed class RegressionEnsembleSolution : RegressionSolution, IRegressionEnsembleSolution { 38 38 public new IRegressionEnsembleModel Model { 39 39 get { return (IRegressionEnsembleModel)base.Model; } … … 46 46 47 47 [StorableConstructor] 48 pr otectedRegressionEnsembleSolution(bool deserializing) : base(deserializing) { }49 pr otectedRegressionEnsembleSolution(RegressionEnsembleSolution original, Cloner cloner)48 private RegressionEnsembleSolution(bool deserializing) : base(deserializing) { } 49 private RegressionEnsembleSolution(RegressionEnsembleSolution original, Cloner cloner) 50 50 : base(original, cloner) { 51 51 trainingPartitions = new Dictionary<IRegressionModel, IntRange>(); … … 64 64 trainingPartitions = new Dictionary<IRegressionModel, IntRange>(); 65 65 testPartitions = new Dictionary<IRegressionModel, IntRange>(); 66 AddModelsAndPar itions(models,66 AddModelsAndPartitions(models, 67 67 from m in models select (IntRange)problemData.TrainingPartition.Clone(), 68 68 from m in models select (IntRange)problemData.TestPartition.Clone()); … … 74 74 this.trainingPartitions = new Dictionary<IRegressionModel, IntRange>(); 75 75 this.testPartitions = new Dictionary<IRegressionModel, IntRange>(); 76 AddModelsAndPar itions(models, trainingPartitions, testPartitions);76 AddModelsAndPartitions(models, trainingPartitions, testPartitions); 77 77 RecalculateResults(); 78 78 } … … 80 80 public override IDeepCloneable Clone(Cloner cloner) { 81 81 return new RegressionEnsembleSolution(this, cloner); 82 } 83 84 protected override void RecalculateResults() { 85 CalculateResults(); 82 86 } 83 87 … … 152 156 153 157 154 public void AddModelsAndPar itions(IEnumerable<IRegressionSolution> solutions) {158 public void AddModelsAndPartitions(IEnumerable<IRegressionSolution> solutions) { 155 159 foreach (var solution in solutions) { 156 160 var ensembleSolution = solution as RegressionEnsembleSolution; … … 176 180 } 177 181 178 private void AddModelsAndPar itions(IEnumerable<IRegressionModel> models, IEnumerable<IntRange> trainingPartitions, IEnumerable<IntRange> testPartitions) {182 private void AddModelsAndPartitions(IEnumerable<IRegressionModel> models, IEnumerable<IntRange> trainingPartitions, IEnumerable<IntRange> testPartitions) { 179 183 var modelEnumerator = models.GetEnumerator(); 180 184 var trainingPartitionEnumerator = trainingPartitions.GetEnumerator();
Note: See TracChangeset
for help on using the changeset viewer.