Changeset 2161 for trunk/sources/HeuristicLab.Modeling

Timestamp:

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

Author:

gkronber

Message:

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

File:

• trunk/sources/HeuristicLab.Modeling/3.2/ProblemInjector.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Modeling/3.2/ProblemInjector.cs

@@ -56 +56 @@
       AddVariable(new Variable("TrainingSamplesEnd", new IntData()));
 
+      AddVariableInfo(new VariableInfo("ActualTrainingSamplesStart", "ActualTrainingSamplesStart", typeof(IntData), VariableKind.New));
+      AddVariableInfo(new VariableInfo("ActualTrainingSamplesEnd", "ActualTrainingSamplesEnd", typeof(IntData), VariableKind.New));
+
       AddVariableInfo(new VariableInfo("ValidationSamplesStart", "ValidationSamplesStart", typeof(IntData), VariableKind.New));
       GetVariableInfo("ValidationSamplesStart").Local = true;
@@ -71 +74 @@
       GetVariableInfo("TestSamplesEnd").Local = true;
       AddVariable(new Variable("TestSamplesEnd", new IntData()));
+
+      AddVariableInfo(new VariableInfo("MaxNumberOfTrainingSamples", "Maximal number of training samples to use (optional)", typeof(IntData), VariableKind.In));
     }
 
@@ -78 +83 @@
 
     public override IOperation Apply(IScope scope) {
-      foreach(VariableInfo info in VariableInfos) {
-        if(info.Local) {
-          IVariable var = GetVariable(info.FormalName);
-          if(var != null) scope.AddVariable(new Variable(info.ActualName, (IItem)var.Value.Clone()));
-        }
+      AddVariableToScope("Dataset", scope);
+      AddVariableToScope("TargetVariable", scope);
+      AddVariableToScope("AllowedFeatures", scope);
+      AddVariableToScope("TrainingSamplesStart", scope);
+      AddVariableToScope("TrainingSamplesEnd", scope);
+      AddVariableToScope("ValidationSamplesStart", scope);
+      AddVariableToScope("ValidationSamplesEnd", scope);
+      AddVariableToScope("TestSamplesStart", scope);
+      AddVariableToScope("TestSamplesEnd", scope);
+
+      int trainingStart = GetVariableValue<IntData>("TrainingSamplesStart", scope, true).Data;
+      int trainingEnd = GetVariableValue<IntData>("TrainingSamplesEnd", scope, true).Data;
+
+      var maxTraining = GetVariableValue<IntData>("MaxNumberOfTrainingSamples", scope, true, false);
+      int nTrainingSamples;
+      if (maxTraining != null) {
+        nTrainingSamples = Math.Min(maxTraining.Data, trainingEnd - trainingStart);
+        if (nTrainingSamples <= 0)
+          throw new ArgumentException("Maximal number of training samples must be larger than 0", "MaxNumberOfTrainingSamples");
+      } else {
+        nTrainingSamples = trainingEnd - trainingStart;
       }
+      scope.AddVariable(new Variable(scope.TranslateName("ActualTrainingSamplesStart"), new IntData(trainingStart)));
+      scope.AddVariable(new Variable(scope.TranslateName("ActualTrainingSamplesEnd"), new IntData(trainingStart + nTrainingSamples)));
       return null;
+    }
+
+    private void AddVariableToScope(string variableName, IScope scope) {
+      scope.AddVariable(new Variable(variableName, (IItem)GetVariable(variableName).Value.Clone()));      
     }
   }