Changeset 131 for trunk

Timestamp:

04/18/08 15:07:52 (17 years ago)

Author:

gkronber

Message:

changed the StructIdProblemInjector to inject only the training data (between TrainingSamplesStart and TrainingSamplesEnd). As a consequence the two variables start and end are not needed and have been removed.

Location:

trunk/sources/HeuristicLab.StructureIdentification

Files:

• StructIdProblemInjector.cs (modified) (2 diffs)
• StructIdProblemInjectorView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.StructureIdentification/StructIdProblemInjector.cs

@@ -46 +46 @@
       AddVariableInfo(new VariableInfo("MaxTreeSize", "MaxTreeSize", typeof(IntData), VariableKind.New));
       AddVariable(new Variable("MaxTreeSize", new IntData(1)));
-      AddVariableInfo(new VariableInfo("TrainingSamplesStart", "First sample to evaluate in training", typeof(IntData), VariableKind.New));
-      AddVariable(new Variable("TrainingSamplesStart", new IntData(0)));
-      AddVariableInfo(new VariableInfo("TrainingSamplesEnd", "Last sample to evaluate in training", typeof(IntData), VariableKind.New));
-      AddVariable(new Variable("TrainingSamplesEnd", new IntData(0)));
     }
 
@@ -62 +58 @@
       scope.AddVariable(new Variable(scope.TranslateName("MaxTreeHeight"), (IItem)GetVariable("MaxTreeHeight").Value.Clone()));
       scope.AddVariable(new Variable(scope.TranslateName("MaxTreeSize"), (IItem)GetVariable("MaxTreeSize").Value.Clone()));
-      scope.AddVariable(new Variable(scope.TranslateName("TrainingSamplesStart"), (IItem)GetVariable("TrainingSamplesStart").Value.Clone()));
-      scope.AddVariable(new Variable(scope.TranslateName("TrainingSamplesEnd"), (IItem)GetVariable("TrainingSamplesEnd").Value.Clone()));
       return null;
     }

trunk/sources/HeuristicLab.StructureIdentification/StructIdProblemInjectorView.cs

@@ -88 +88 @@
         if (success) {
           Dataset dataset = (Dataset)StructIdProblemInjector.GetVariable("Dataset").Value;
-          dataset.Rows = parser.Rows;
+          dataset.Rows = parser.TrainingSamplesEnd - parser.TrainingSamplesStart;
           dataset.Columns = parser.Columns;
           dataset.VariableNames = parser.VariableNames;
           dataset.Name = parser.ProblemName;
-          dataset.Samples = parser.Samples;
+          dataset.Samples = new double[dataset.Rows * dataset.Columns];
+          Array.Copy(parser.Samples, dataset.Samples, dataset.Columns * dataset.Rows);
 
           ((IntData)StructIdProblemInjector.GetVariable("TargetVariable").Value).Data = parser.TargetVariable;
           ((IntData)StructIdProblemInjector.GetVariable("MaxTreeHeight").Value).Data = parser.MaxTreeHeight;
           ((IntData)StructIdProblemInjector.GetVariable("MaxTreeSize").Value).Data = parser.MaxTreeSize;
-          ((IntData)StructIdProblemInjector.GetVariable("TrainingSamplesStart").Value).Data = parser.TrainingSamplesStart;
-          ((IntData)StructIdProblemInjector.GetVariable("TrainingSamplesEnd").Value).Data = parser.TrainingSamplesEnd;
           Refresh();
         }