Changeset 2389 for trunk/sources

Timestamp:

09/24/09 17:37:00 (15 years ago)

Author:

mkommend

Message:

adapted modeling database (ticket #759)

Location:

trunk/sources

Files:

• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Model.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (6 diffs)
• HeuristicLab.Modeling.Database/3.2/IModel.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database/3.2/IModelingDatabase.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Model.cs

@@ -46 +46 @@
     public int Id {
       get { return this.id; }
-      private set { this.id = value; }
+      set { this.id = value; }
     }
 

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

@@ -95 +95 @@
     }
 
-    public IModel CreateModel(ModelType modelType, IAlgorithm algorithm, IVariable targetVariable,
-int trainingSamplesStart, int trainingSamplesEnd, int validationSamplesStart, int validationSamplesEnd, int testSamplesStart, int testSamplesEnd) {
-      return CreateModel(null, modelType, algorithm, targetVariable, trainingSamplesStart, trainingSamplesEnd, validationSamplesStart, validationSamplesEnd, testSamplesStart, testSamplesEnd);
+    public IModel CreateModel(int id, string modelName, ModelType modelType, IAlgorithm algorithm, IVariable targetVariable,
+        int trainingSamplesStart, int trainingSamplesEnd, int validationSamplesStart, int validationSamplesEnd, int testSamplesStart, int testSamplesEnd) {
+      Model m = (Model)CreateModel(modelName, modelType, algorithm, targetVariable, trainingSamplesStart, trainingSamplesEnd, validationSamplesStart, validationSamplesEnd, testSamplesStart, testSamplesEnd);
+      m.Id = id;
+      return m;
     }
 
@@ -142 +144 @@
 
     public Dataset GetDataset() {
-      if (ctx.Problems.Count() != 1)
-        throw new InvalidOperationException("Could not get dataset. No or more than one problems are persisted in the database.");
-      Problem problem = ctx.Problems.Single();
-      return problem.Dataset;
+      if (ctx.Problems.Count() > 1)
+        throw new InvalidOperationException("Could not get dataset. More than one problems are persisted in the database.");
+      if (ctx.Problems.Count() == 1)
+        return ctx.Problems.Single().Dataset;
+      return null;
     }
 
@@ -192 +195 @@
         ctx.SubmitChanges();
       }
+    }
+
+    public IInputVariable GetInputVariable(IModel model, string inputVariableName) {
+      var inputVariables = ctx.InputVariables.Where(i => i.Model == model && i.Variable.Name == inputVariableName);
+      if (inputVariables.Count() == 1)
+        return inputVariables.Single();
+
+      if (inputVariables.Count() > 1)
+        throw new ArgumentException("More than one input variable with the same name are for the given model persisted.");
+
+      return null;
     }
 
@@ -258 +272 @@
     }
 
-    public void PersistModelResults(IModel model,IEnumerable<IModelResult> modelResults) {
+    public void PersistModelResults(IModel model, IEnumerable<IModelResult> modelResults) {
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
         ctx.ModelResults.DeleteAllOnSubmit(GetModelResults(model).Cast<ModelResult>());
@@ -277 +291 @@
     }
 
-    public void PersistInputVariableResults(IModel model,IEnumerable<IInputVariableResult> inputVariableResults) {
+    public void PersistInputVariableResults(IModel model, IEnumerable<IInputVariableResult> inputVariableResults) {
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
         ctx.InputVariableResults.DeleteAllOnSubmit(GetInputVariableResults(model).Cast<InputVariableResult>());
@@ -306 +320 @@
 
     public IModel Persist(HeuristicLab.Modeling.IAnalyzerModel model, string algorithmName, string algorithmDescription) {
-      Algorithm algorithm = (Algorithm) GetOrPersistAlgorithm(algorithmName);
-      Variable targetVariable  = (Variable)GetVariable (model.TargetVariable);
-
-      Model m = (Model)CreateModel(model.Type, algorithm, targetVariable, model.TrainingSamplesStart, model.TrainingSamplesEnd,
+      Algorithm algorithm = (Algorithm)GetOrPersistAlgorithm(algorithmName);
+      Variable targetVariable = (Variable)GetVariable(model.TargetVariable);
+
+      Model m = (Model)CreateModel(null, model.Type, algorithm, targetVariable, model.TrainingSamplesStart, model.TrainingSamplesEnd,
         model.ValidationSamplesStart, model.ValidationSamplesEnd, model.TestSamplesStart, model.TestSamplesEnd);
       PersistModel(m);

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

@@ -27 +27 @@
 namespace HeuristicLab.Modeling.Database {
   public interface IModel {
+    int Id { get; }
     IVariable TargetVariable { get; }
     IAlgorithm Algorithm { get; }

trunk/sources/HeuristicLab.Modeling.Database/3.2/IModelingDatabase.cs

@@ -42 +42 @@
     IModel Persist(HeuristicLab.Modeling.IAnalyzerModel model, string algorithmName, string algorithmDescription);
 
-    IModel CreateModel(ModelType modelType, IAlgorithm algorithm, IVariable targetVariable,
-     int trainingSamplesStart, int trainingSamplesEnd, int validationSamplesStart, int validationSamplesEnd, int testSamplesStart, int testSamplesEnd);
     IModel CreateModel(string modelName, ModelType modelType, IAlgorithm algorithm, IVariable targetVariable,
       int trainingSamplesStart, int trainingSamplesEnd, int validationSamplesStart, int validationSamplesEnd, int testSamplesStart, int testSamplesEnd);
+    IModel CreateModel(int id,string modelName, ModelType modelType, IAlgorithm algorithm, IVariable targetVariable,
+    int trainingSamplesStart, int trainingSamplesEnd, int validationSamplesStart, int validationSamplesEnd, int testSamplesStart, int testSamplesEnd);
     void PersistModel(IModel model);
     void DeleteModel(IModel model);
@@ -55 +55 @@
     IPredictor GetModelPredictor(IModel model);
     void PersistPredictor(IModel model, IPredictor predictor);
+    IInputVariable GetInputVariable(IModel model, string inputVariableName);
 
     IAlgorithm GetOrPersistAlgorithm(string algorithmName);