Changeset 2270 for trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs

Timestamp:

08/10/09 14:11:37 (15 years ago)

Author:

gkronber

Message:

Added properties for the separation in training/validation/test set to HL.Modeling.IModel. #712

File:

• trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs

@@ -68 +68 @@
 
     public void Persist(HeuristicLab.Modeling.IAlgorithm algorithm) {
-      int trainingSamplesStart = ((IntData)algorithm.Engine.GlobalScope.GetVariableValue("TrainingSamplesStart", false)).Data;
-      int trainingSamplesEnd = ((IntData)algorithm.Engine.GlobalScope.GetVariableValue("TrainingSamplesEnd", false)).Data;
-      int validationSamplesStart = ((IntData)algorithm.Engine.GlobalScope.GetVariableValue("ValidationSamplesStart", false)).Data;
-      int validationSamplesEnd = ((IntData)algorithm.Engine.GlobalScope.GetVariableValue("ValidationSamplesEnd", false)).Data;
-      int testSamplesStart = ((IntData)algorithm.Engine.GlobalScope.GetVariableValue("TestSamplesStart", false)).Data;
-      int testSamplesEnd = ((IntData)algorithm.Engine.GlobalScope.GetVariableValue("TestSamplesEnd", false)).Data;
-
       GetOrCreateProblem(algorithm.Dataset);
       Dictionary<string, Variable> variables = GetAllVariables();
@@ -83 +76 @@
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
         model = new Model(target, algo);
-        model.TrainingSamplesStart = trainingSamplesStart;
-        model.TrainingSamplesEnd = trainingSamplesEnd;
-        model.ValidationSamplesStart = validationSamplesStart;
-        model.ValidationSamplesEnd = validationSamplesEnd;
-        model.TestSamplesStart = testSamplesStart;
-        model.TestSamplesEnd = testSamplesEnd;
+        model.TrainingSamplesStart = algorithm.Model.TrainingSamplesStart;
+        model.TrainingSamplesEnd = algorithm.Model.TrainingSamplesEnd;
+        model.ValidationSamplesStart = algorithm.Model.ValidationSamplesStart;
+        model.ValidationSamplesEnd = algorithm.Model.ValidationSamplesEnd;
+        model.TestSamplesStart = algorithm.Model.TestSamplesStart;
+        model.TestSamplesEnd = algorithm.Model.TestSamplesEnd;
 
         ctx.Models.InsertOnSubmit(model);