Changeset 2314 for trunk/sources

Timestamp:

08/27/09 17:47:37 (15 years ago)

Author:

mkommend

Message:

extended IModelingDatabase interface to return persisted model (ticket #712)

Location:

trunk/sources

Files:

• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (3 diffs)
• HeuristicLab.Modeling.Database/3.2/IModelingDatabase.cs (modified) (1 diff)

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

@@ -68 +68 @@
     }
 
-    public void Persist(HeuristicLab.Modeling.IAlgorithm algorithm) {
+    public IModel Persist(HeuristicLab.Modeling.IAlgorithm algorithm) {
       GetOrCreateProblem(algorithm.Dataset);
-      Persist(algorithm.Model, algorithm.Name, algorithm.Description);
-    }
-
-    public void Persist(HeuristicLab.Modeling.IAnalyzerModel model, string algorithmName, string algorithmDescription) {
+      return Persist(algorithm.Model, algorithm.Name, algorithm.Description);
+    }
+
+    public IModel Persist(HeuristicLab.Modeling.IAnalyzerModel model, string algorithmName, string algorithmDescription) {
       Dictionary<string, Variable> variables = GetAllVariables();
       Algorithm algo = GetOrCreateAlgorithm(algorithmName, algorithmDescription);
@@ -133 +133 @@
         ctx.SubmitChanges();
       }
+
+      //if connected to database return inserted model
+      if (this.ctx != null)
+        return this.ctx.Models.Where(x => x.Id == m.Id).Single();
+      return null;
     }
 
@@ -149 +154 @@
       IProblem problem;
       if (ctx.Problems.Count() == 0)
-        problem =  PersistProblem(dataset);
+        problem = PersistProblem(dataset);
       else
         problem = ctx.Problems.Single();

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

@@ -28 +28 @@
 namespace HeuristicLab.Modeling.Database {
   public interface IModelingDatabase {
-    void Persist(HeuristicLab.Modeling.IAnalyzerModel model, string algorithmName, string algorithmDescription);
-    void Persist(HeuristicLab.Modeling.IAlgorithm algorithm);
+    IModel Persist(HeuristicLab.Modeling.IAlgorithm algorithm);
+    IModel Persist(HeuristicLab.Modeling.IAnalyzerModel model, string algorithmName, string algorithmDescription);
     IProblem PersistProblem(Dataset dataset);