Changeset 397 for trunk

Timestamp:

07/29/08 11:37:13 (16 years ago)

Author:

gkronber

Message:

fixed #206

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

@@ -37 +37 @@
     private const string VALIDATIONSAMPLESSTART = "VALIDATIONSAMPLESSTART";
     private const string VALIDATIONSAMPLESEND = "VALIDATIONSAMPLESEND";
+    private const string TESTSAMPLESSTART = "TESTSAMPLESSTART";
+    private const string TESTSAMPLESEND = "TESTSAMPLESEND";
     private Tokenizer tokenizer;
     private Dictionary<string, List<Token>> metadata;
@@ -138 +140 @@
         if(metadata.ContainsKey(VALIDATIONSAMPLESEND)) {
           return metadata[VALIDATIONSAMPLESEND][0].intValue;
+        } else return rows;
+      }
+    }
+    public int TestSamplesStart {
+      get {
+        if(metadata.ContainsKey(TESTSAMPLESSTART)) {
+          return metadata[TESTSAMPLESSTART][0].intValue;
+        } else return 0;
+      }
+    }
+
+    public int TestSamplesEnd {
+      get {
+        if(metadata.ContainsKey(TESTSAMPLESEND)) {
+          return metadata[TESTSAMPLESEND][0].intValue;
         } else return rows;
       }

trunk/sources/HeuristicLab.StructureIdentification/StructIdProblemInjector.cs

@@ -49 +49 @@
       AddVariableInfo(new VariableInfo("ValidationSamplesEnd", "ValidationSamplesEnd", typeof(IntData), VariableKind.New));
       AddVariable(new Variable("ValidationSamplesEnd", new IntData()));
+      AddVariableInfo(new VariableInfo("TestSamplesStart", "TestSamplesStart", typeof(IntData), VariableKind.New));
+      AddVariable(new Variable("TestSamplesStart", new IntData()));
+      AddVariableInfo(new VariableInfo("TestSamplesEnd", "TestSamplesEnd", typeof(IntData), VariableKind.New));
+      AddVariable(new Variable("TestSamplesEnd", new IntData()));
     }
 
@@ -62 +66 @@
       scope.AddVariable(new Variable(scope.TranslateName("ValidationSamplesStart"), (IItem)GetVariable("ValidationSamplesStart").Value.Clone()));
       scope.AddVariable(new Variable(scope.TranslateName("ValidationSamplesEnd"), (IItem)GetVariable("ValidationSamplesEnd").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("TestSamplesStart"), (IItem)GetVariable("TestSamplesStart").Value.Clone()));
+      scope.AddVariable(new Variable(scope.TranslateName("TestSamplesEnd"), (IItem)GetVariable("TestSamplesEnd").Value.Clone()));
       return null;
     }

trunk/sources/HeuristicLab.StructureIdentification/StructIdProblemInjectorView.cs

@@ -101 +101 @@
           ((IntData)StructIdProblemInjector.GetVariable("ValidationSamplesStart").Value).Data = parser.ValidationSamplesStart;
           ((IntData)StructIdProblemInjector.GetVariable("ValidationSamplesEnd").Value).Data = parser.ValidationSamplesEnd;
+          ((IntData)StructIdProblemInjector.GetVariable("TestSamplesStart").Value).Data = parser.TestSamplesStart;
+          ((IntData)StructIdProblemInjector.GetVariable("TestSamplesEnd").Value).Data = parser.TestSamplesEnd;
           ((IntData)StructIdProblemInjector.GetVariable("TargetVariable").Value).Data = parser.TargetVariable;
           Refresh();