Changeset 2304

Timestamp:

08/21/09 12:32:42 (15 years ago)

Author:

mkommend

Message:

added problem methods to modeling database (ticket #712)

Location:

trunk/sources

Files:

• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Problem.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (3 diffs)
• HeuristicLab.Modeling.Database/3.2/HeuristicLab.Modeling.Database-3.2.csproj (modified) (1 diff)
• HeuristicLab.Modeling.Database/3.2/IModelingDatabase.cs (modified) (2 diffs)
• HeuristicLab.Modeling.Database/3.2/IProblem.cs (modified) (1 diff)

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

@@ -56 +56 @@
     public Dataset Dataset {
       get { return (Dataset)PersistenceManager.RestoreFromGZip(this.Data); }
-      set { this.Data = PersistenceManager.SaveToGZip(value); }
+      private set { this.Data = PersistenceManager.SaveToGZip(value); }
     }
   }

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

@@ -145 +145 @@
     }
 
-    public Problem GetOrCreateProblem(Dataset dataset) {
-      Problem problem;
+    public IProblem GetOrCreateProblem(Dataset dataset) {
+      IProblem problem;
       if (ctx.Problems.Count() == 0)
-        problem = PersistProblem(dataset);
+        problem =  PersistProblem(dataset);
       else
         problem = ctx.Problems.Single();
@@ -156 +156 @@
     }
 
-    private Problem PersistProblem(Dataset dataset) {
+    public IProblem PersistProblem(Dataset dataset) {
       Problem problem;
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
@@ -272 +272 @@
     }
     #endregion
-
-    #region Problem
-    public IProblem GetProblem() {
-      if (ctx.Problems.Count() == 0)
-        return null;
-      return ctx.Problems.Single();
-    }
-    #endregion
   }
 }

trunk/sources/HeuristicLab.Modeling.Database/3.2/HeuristicLab.Modeling.Database-3.2.csproj

@@ -101 +101 @@
       <Name>HeuristicLab.Core-3.2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.DataAnalysis\3.2\HeuristicLab.DataAnalysis-3.2.csproj">
+      <Project>{7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}</Project>
+      <Name>HeuristicLab.DataAnalysis-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">
       <Project>{80F7FADA-549D-4151-8856-79B620A50DBA}</Project>

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

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using HeuristicLab.DataAnalysis;
 
 namespace HeuristicLab.Modeling.Database {
@@ -29 +30 @@
     void Persist(HeuristicLab.Modeling.IAnalyzerModel model, string algorithmName, string algorithmDescription);
     void Persist(HeuristicLab.Modeling.IAlgorithm algorithm);
+    IProblem PersistProblem(Dataset dataset);
+
     IEnumerable<IModel> GetAllModels();
     IEnumerable<IResult> GetAllResults();
     IEnumerable<IResult> GetAllResultsForInputVariables();
     IEnumerable<IAlgorithm> GetAllAlgorithms();
-    IEnumerable<IModelResult> GetModelResults(IModel model);
+       
+    Dataset GetDataset();
     byte[] GetModelData(IModel model);
     IPredictor GetModelPredictor(IModel model);
+    IEnumerable<IModelResult> GetModelResults(IModel model);
     IEnumerable<IInputVariableResult> GetInputVariableResults(IModel model);
-    IProblem GetProblem();
 
     void Connect();

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

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using HeuristicLab.DataAnalysis;
 
 namespace HeuristicLab.Modeling.Database {
   public interface IProblem {
     byte[] Data { get; }
+    Dataset Dataset { get; }
   }
 }