Changeset 2270 for trunk

Timestamp:

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

Author:

gkronber

Message:

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

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs (modified) (3 diffs)
• HeuristicLab.GP.StructureIdentification/3.3/BaseClasses/AlgorithmBase.cs (modified) (1 diff)
• HeuristicLab.LinearRegression/3.2/LinearRegression.cs (modified) (2 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (2 diffs)
• HeuristicLab.Modeling/3.2/IModel.cs (modified) (1 diff)
• HeuristicLab.Modeling/3.2/Model.cs (modified) (1 diff)
• HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs

@@ -43 +43 @@
     }
 
-    private Random random;    
+    private Random random;
     private Dictionary<int, List<AlgorithmConfiguration>> finishedAndDispatchedRuns;
 
     public SimpleDispatcher(IModelingDatabase database, Problem problem)
-      : base(database, problem) {      
+      : base(database, problem) {
       random = new Random();
       finishedAndDispatchedRuns = new Dictionary<int, List<AlgorithmConfiguration>>();
@@ -100 +100 @@
     private void PopulateFinishedRuns() {
       var dispatchedAlgos = from model in Database.GetAllModels()
-                            select new { 
-                              TargetVariable = model.TargetVariable.Name, 
-                              Algorithm = model.Algorithm.Name, 
-                              Inputvariables = Database.GetInputVariableResults(model).Select(x => x.Variable.Name).Distinct() };
+                            select new {
+                              TargetVariable = model.TargetVariable.Name,
+                              Algorithm = model.Algorithm.Name,
+                              Inputvariables = Database.GetInputVariableResults(model).Select(x => x.Variable.Name).Distinct()
+                            };
       foreach (var algo in dispatchedAlgos) {
         AddDispatchedRun(algo.TargetVariable, algo.Inputvariables, algo.Algorithm);
@@ -144 +145 @@
     private void AddDispatchedRun(string targetVariable, IEnumerable<string> inputVariables, string algorithm) {
       AddDispatchedRun(
-        Problem.Dataset.GetVariableIndex(targetVariable), 
-        inputVariables.Select(x => Problem.Dataset.GetVariableIndex(x)).ToArray(), 
+        Problem.Dataset.GetVariableIndex(targetVariable),
+        inputVariables.Select(x => Problem.Dataset.GetVariableIndex(x)).ToArray(),
         algorithm);
     }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/BaseClasses/AlgorithmBase.cs

@@ -423 +423 @@
       model.Dataset = ds;
       model.TargetVariable = ds.GetVariableName(bestModelScope.GetVariableValue<IntData>("TargetVariable", true).Data);
+      model.TrainingSamplesStart = bestModelScope.GetVariableValue<IntData>("TrainingSamplesStart", true).Data;
+      model.TrainingSamplesEnd = bestModelScope.GetVariableValue<IntData>("TrainingSamplesEnd", true).Data;
+      model.ValidationSamplesStart = bestModelScope.GetVariableValue<IntData>("ValidationSamplesStart", true).Data;
+      model.ValidationSamplesEnd = bestModelScope.GetVariableValue<IntData>("ValidationSamplesEnd", true).Data;
+      model.TestSamplesStart = bestModelScope.GetVariableValue<IntData>("TestSamplesStart", true).Data;
+      model.TestSamplesEnd = bestModelScope.GetVariableValue<IntData>("TestSamplesEnd", true).Data;
+
       model.TrainingMeanSquaredError = bestModelScope.GetVariableValue<DoubleData>("Quality", false).Data;
       model.ValidationMeanSquaredError = bestModelScope.GetVariableValue<DoubleData>("ValidationQuality", false).Data;

trunk/sources/HeuristicLab.LinearRegression/3.2/LinearRegression.cs

@@ -152 +152 @@
       testMSE.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";
       #endregion
-      
+
       #region R2
       CoefficientOfDeterminationEvaluator trainingR2 = new CoefficientOfDeterminationEvaluator();
@@ -290 +290 @@
       model.Dataset = ds;
       model.TargetVariable = ds.GetVariableName(bestModelScope.GetVariableValue<IntData>("TargetVariable", true).Data);
+      model.TrainingSamplesStart = bestModelScope.GetVariableValue<IntData>("TrainingSamplesStart", true).Data;
+      model.TrainingSamplesEnd = bestModelScope.GetVariableValue<IntData>("TrainingSamplesEnd", true).Data;
+      model.ValidationSamplesStart = bestModelScope.GetVariableValue<IntData>("ValidationSamplesStart", true).Data;
+      model.ValidationSamplesEnd = bestModelScope.GetVariableValue<IntData>("ValidationSamplesEnd", true).Data;
+      model.TestSamplesStart = bestModelScope.GetVariableValue<IntData>("TestSamplesStart", true).Data;
+      model.TestSamplesEnd = bestModelScope.GetVariableValue<IntData>("TestSamplesEnd", true).Data;
 
       ItemList evaluationImpacts = bestModelScope.GetVariableValue<ItemList>("VariableEvaluationImpacts", false);

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);

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

@@ -31 +31 @@
     string TargetVariable { get; }
     IEnumerable<string> InputVariables { get; }
+    int TrainingSamplesStart { get; set; }
+    int TrainingSamplesEnd { get; set; }
+    int ValidationSamplesStart { get; set; }
+    int ValidationSamplesEnd { get; set; }
+    int TestSamplesStart { get; set; }
+    int TestSamplesEnd { get; set; }
     double TrainingMeanSquaredError { get; }
     double ValidationMeanSquaredError { get; }

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

@@ -46 +46 @@
       get { return inputVariables; }
     }
+
+    public int TrainingSamplesStart { get; set; }
+    public int TrainingSamplesEnd { get; set; }
+    public int ValidationSamplesStart { get; set; }
+    public int ValidationSamplesEnd { get; set; }
+    public int TestSamplesStart { get; set; }
+    public int TestSamplesEnd { get; set; }
 
     public void AddInputVariables(string variableName) {

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorRegression.cs

@@ -162 +162 @@
       modelScopeCreator.AddVariable(new HeuristicLab.Core.Variable("SubScopes", new IntData(1)));
       main.AddSubOperator(modelScopeCreator);
-      
+
       SequentialSubScopesProcessor seqSubScopesProc = new SequentialSubScopesProcessor();
       IOperator modelProcessor = CreateModelProcessor();
@@ -238 +238 @@
       nuBranch.Name = "NuLoop";
       nuBranch.GetVariableInfo("Condition").ActualName = "RepeatNuLoop";
-      
+
       nuBranch.AddSubOperator(nuLoop);
       nuLoop.AddSubOperator(nuBranch);
@@ -362 +362 @@
       progOp.RemoveVariableInfo("Result");
       progOp.AddVariableInfo(new VariableInfo("Value", "Value", typeof(IntData), VariableKind.In | VariableKind.Out));
-      progOp.Code = "Value.Data = "+value+";";
+      progOp.Code = "Value.Data = " + value + ";";
       progOp.GetVariableInfo("Value").ActualName = paramName;
       return progOp;
@@ -443 +443 @@
       model.Dataset = ds;
       model.TargetVariable = ds.GetVariableName(bestModelScope.GetVariableValue<IntData>("TargetVariable", true).Data);
+      model.TrainingSamplesStart = bestModelScope.GetVariableValue<IntData>("TrainingSamplesStart", true).Data;
+      model.TrainingSamplesEnd = bestModelScope.GetVariableValue<IntData>("TrainingSamplesEnd", true).Data;
+      model.ValidationSamplesStart = bestModelScope.GetVariableValue<IntData>("ValidationSamplesStart", true).Data;
+      model.ValidationSamplesEnd = bestModelScope.GetVariableValue<IntData>("ValidationSamplesEnd", true).Data;
+      model.TestSamplesStart = bestModelScope.GetVariableValue<IntData>("TestSamplesStart", true).Data;
+      model.TestSamplesEnd = bestModelScope.GetVariableValue<IntData>("TestSamplesEnd", true).Data;
 
       ItemList evaluationImpacts = bestModelScope.GetVariableValue<ItemList>("VariableEvaluationImpacts", false);