Changeset 172

Timestamp:

04/23/08 13:13:06 (16 years ago)

Author:

gkronber

Message:

changed StructIdProblemInjector to inject only the dataset and the target-variable (removed max-tree-height and max-tree-size variable).
also removed the requirement that TrainingSamplesStart and TrainingSamplesEnd have to be specified in the import file. If they are not defined explicitly we just use the whole dataset for training.

Location:

trunk/sources

Files:

• HeuristicLab.DataAnalysis/DatasetParser.cs (modified) (2 diffs)
• HeuristicLab.StructureIdentification/StructIdProblemInjector.cs (modified) (2 diffs)
• HeuristicLab.StructureIdentification/StructIdProblemInjectorView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.DataAnalysis/DatasetParser.cs

@@ -89 +89 @@
     public int TrainingSamplesStart {
       get {
-        return metadata["TRAININGSAMPLESSTART"][0].intValue;
+        if(!metadata.ContainsKey("TRAININGSAMPLESTART")) return 0;
+        else return metadata["TRAININGSAMPLESSTART"][0].intValue;
       }
     }
@@ -95 +96 @@
     public int TrainingSamplesEnd {
       get {
-        return metadata["TRAININGSAMPLESEND"][0].intValue;
+        if(!metadata.ContainsKey("TRAININGSAMPLEEND")) return rows;
+        else return metadata["TRAININGSAMPLESEND"][0].intValue;
       }
     }

trunk/sources/HeuristicLab.StructureIdentification/StructIdProblemInjector.cs

@@ -41 +41 @@
       AddVariableInfo(new VariableInfo("TargetVariable", "TargetVariable", typeof(IntData), VariableKind.New));
       AddVariable(new Variable("TargetVariable", new IntData()));
-      AddVariableInfo(new VariableInfo("MaxTreeHeight", "MaxTreeHeight", typeof(IntData), VariableKind.New));
-      AddVariable(new Variable("MaxTreeHeight", new IntData(1)));
-      AddVariableInfo(new VariableInfo("MaxTreeSize", "MaxTreeSize", typeof(IntData), VariableKind.New));
-      AddVariable(new Variable("MaxTreeSize", new IntData(1)));
     }
 
@@ -54 +50 @@
       scope.AddVariable(new Variable(scope.TranslateName("Dataset"), (IItem)GetVariable("Dataset").Value.Clone()));
       scope.AddVariable(new Variable(scope.TranslateName("TargetVariable"), (IItem)GetVariable("TargetVariable").Value.Clone()));
-      scope.AddVariable(new Variable(scope.TranslateName("MaxTreeHeight"), (IItem)GetVariable("MaxTreeHeight").Value.Clone()));
-      scope.AddVariable(new Variable(scope.TranslateName("MaxTreeSize"), (IItem)GetVariable("MaxTreeSize").Value.Clone()));
       return null;
     }

trunk/sources/HeuristicLab.StructureIdentification/StructIdProblemInjectorView.cs

@@ -91 +91 @@
 
           ((IntData)StructIdProblemInjector.GetVariable("TargetVariable").Value).Data = parser.TargetVariable;
-          ((IntData)StructIdProblemInjector.GetVariable("MaxTreeHeight").Value).Data = parser.MaxTreeHeight;
-          ((IntData)StructIdProblemInjector.GetVariable("MaxTreeSize").Value).Data = parser.MaxTreeSize;
           Refresh();
         }