Changeset 2161 for trunk/sources/HeuristicLab.LinearRegression

Timestamp:

07/15/09 16:23:29 (16 years ago)

Author:

gkronber

Message:

Implemented #704 (Shuffling of training data (only) in (non-timeseries) modeling algorithms)

Location:

trunk/sources/HeuristicLab.LinearRegression/3.2

Files:

• HeuristicLab.LinearRegression-3.2.csproj (modified) (1 diff)
• HeuristicLabLinearRegressionPlugin.cs (modified) (1 diff)
• LinearRegression.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.LinearRegression/3.2/HeuristicLab.LinearRegression-3.2.csproj

@@ -133 +133 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Random\3.2\HeuristicLab.Random-3.2.csproj">
+      <Project>{47019A74-F7F7-482E-83AA-D3F4F777E879}</Project>
+      <Name>HeuristicLab.Random-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.SequentialEngine\3.2\HeuristicLab.SequentialEngine-3.2.csproj">
       <Project>{B4BE8E53-BA06-4237-9A01-24255F880201}</Project>

trunk/sources/HeuristicLab.LinearRegression/3.2/HeuristicLabLinearRegressionPlugin.cs

@@ -34 +34 @@
   [Dependency(Dependency = "HeuristicLab.GP.StructureIdentification-3.3")]
   [Dependency(Dependency = "HeuristicLab.Modeling-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Random-3.2")]
   [Dependency(Dependency = "HeuristicLab.SequentialEngine-3.2")]
   public class HeuristicLabLinearRegression : PluginBase {

trunk/sources/HeuristicLab.LinearRegression/3.2/LinearRegression.cs

@@ -33 +33 @@
 using HeuristicLab.Modeling;
 using HeuristicLab.GP;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.LinearRegression {
@@ -88 +89 @@
       seq.Name = "LinearRegression";
 
+      var randomInjector = new RandomInjector();
+      randomInjector.Name = "Random Injector";
       IOperator globalInjector = CreateGlobalInjector();
       ProblemInjector problemInjector = new ProblemInjector();
+      problemInjector.GetVariableInfo("MaxNumberOfTrainingSamples").Local = true;
+      problemInjector.AddVariable(new HeuristicLab.Core.Variable("MaxNumberOfTrainingSamples", new IntData(5000)));
+
+      IOperator shuffler = new DatasetShuffler();
+      shuffler.GetVariableInfo("ShuffleStart").ActualName = "TrainingSamplesStart";
+      shuffler.GetVariableInfo("ShuffleEnd").ActualName = "TrainingSamplesEnd";
+
       LinearRegressionOperator lrOperator = new LinearRegressionOperator();
-      lrOperator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-      lrOperator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
-
-
+      lrOperator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+      lrOperator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
+
+      seq.AddSubOperator(randomInjector);
       seq.AddSubOperator(globalInjector);
       seq.AddSubOperator(problemInjector);
+      seq.AddSubOperator(shuffler);
       seq.AddSubOperator(lrOperator);
       seq.AddSubOperator(CreateModelAnalyser());
-
 
       algo.OperatorGraph.InitialOperator = seq;
@@ -126 +136 @@
       trainingMSE.GetVariableInfo("FunctionTree").ActualName = "LinearRegressionModel";
       trainingMSE.GetVariableInfo("MSE").ActualName = "TrainingQuality";
-      trainingMSE.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";
-      trainingMSE.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";
+      trainingMSE.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+      trainingMSE.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       MeanSquaredErrorEvaluator validationMSE = new MeanSquaredErrorEvaluator();
       validationMSE.Name = "ValidationMseEvaluator";
@@ -147 +157 @@
       trainingR2.GetVariableInfo("FunctionTree").ActualName = "LinearRegressionModel";
       trainingR2.GetVariableInfo("R2").ActualName = "TrainingR2";
-      trainingR2.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-      trainingR2.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      trainingR2.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+      trainingR2.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       CoefficientOfDeterminationEvaluator validationR2 = new CoefficientOfDeterminationEvaluator();
       validationR2.Name = "ValidationR2Evaluator";
@@ -168 +178 @@
       trainingMAPE.GetVariableInfo("FunctionTree").ActualName = "LinearRegressionModel";
       trainingMAPE.GetVariableInfo("MAPE").ActualName = "TrainingMAPE";
-      trainingMAPE.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-      trainingMAPE.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      trainingMAPE.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+      trainingMAPE.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       MeanAbsolutePercentageErrorEvaluator validationMAPE = new MeanAbsolutePercentageErrorEvaluator();
       validationMAPE.Name = "ValidationMapeEvaluator";
@@ -189 +199 @@
       trainingMAPRE.GetVariableInfo("FunctionTree").ActualName = "LinearRegressionModel";
       trainingMAPRE.GetVariableInfo("MAPRE").ActualName = "TrainingMAPRE";
-      trainingMAPRE.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-      trainingMAPRE.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      trainingMAPRE.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+      trainingMAPRE.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       MeanAbsolutePercentageOfRangeErrorEvaluator validationMAPRE = new MeanAbsolutePercentageOfRangeErrorEvaluator();
       validationMAPRE.Name = "ValidationMapreEvaluator";
@@ -210 +220 @@
       trainingVAF.GetVariableInfo("FunctionTree").ActualName = "LinearRegressionModel";
       trainingVAF.GetVariableInfo("VAF").ActualName = "TrainingVAF";
-      trainingVAF.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";
-      trainingVAF.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";
+      trainingVAF.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+      trainingVAF.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
       VarianceAccountedForEvaluator validationVAF = new VarianceAccountedForEvaluator();
       validationVAF.Name = "ValidationVafEvaluator";