Changeset 2217

Timestamp:

07/31/09 12:11:41 (15 years ago)

Author:

mkommend

Message:

first part of performance improvements (ticket #712)

Location:

branches/HeuristicLab.Modeling Database Backend/sources

Files:

• HeuristicLab.CEDMA.Core/3.3/Results.cs (modified) (3 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Model.cs (modified) (2 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/ModelData.cs (added)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (7 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj (modified) (1 diff)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/ModelingDataContext.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database/3.2/IModel.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database/3.2/IModelingDatabase.cs (modified) (1 diff)

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Core/3.3/Results.cs

@@ -85 +85 @@
 
     private IEnumerable<ResultsEntry> SelectRows() {
+      database.GetAllModelResults();
       entries = new List<ResultsEntry>();
       foreach (var model in database.GetAllModels()) {
@@ -91 +92 @@
           modelEntry.Set(modelResult.Result.Name, modelResult.Value);
         }
-        modelEntry.Set("PersistedData", model.Data);
+        modelEntry.Set("PersistedData", database.GetModelData(model));
         modelEntry.Set("TargetVariable", model.TargetVariable.Name);
         Dictionary<HeuristicLab.Modeling.Database.IVariable, ResultsEntry> inputVariableResultsEntries = 
@@ -100 +101 @@
             inputVariableResultsEntries[inputVariableResult.Variable] = new ResultsEntry();
             inputVariableResultsEntries[inputVariableResult.Variable].Set("InputVariableName", inputVariableResult.Variable.Name);
-            }
-           inputVariableResultsEntries[inputVariableResult.Variable].Set(inputVariableResult.Result.Name, inputVariableResult.Value);
+          }
+          inputVariableResultsEntries[inputVariableResult.Variable].Set(inputVariableResult.Result.Name, inputVariableResult.Value);
         }
         modelEntry.Set("VariableImpacts", inputVariableResultsEntries.Values);

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Model.cs

@@ -14 +14 @@
     }
 
-    public Model(Variable targetVariable, Algorithm algorithm, byte[] data)
+    public Model(Variable targetVariable, Algorithm algorithm)
       : this() {
       this.targetVariableId = targetVariable.Id;
       this.algorithmId = algorithm.Id;
-      this.Data = data;
     }
 
@@ -26 +25 @@
       get { return this.id; }
       private set { this.id = value; }
-    }
-
-    private byte[] data;
-    [Column(Storage = "data", DbType = "image", CanBeNull = false)]
-    public byte[] Data {
-      get { return this.data; }
-      set { this.data = value; }
     }
 

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs

@@ -45 +45 @@
 
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
-        model = new Model(target, algo, PersistenceManager.SaveToGZip(algorithm.Model.Data));
+        model = new Model(target, algo);
         model.TrainingSamplesStart = trainingSamplesStart;
         model.TrainingSamplesEnd = trainingSamplesEnd;
@@ -59 +59 @@
 
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+        ctx.ModelData.InsertOnSubmit(new ModelData(model, PersistenceManager.SaveToGZip(algorithm.Model.Data)));
+      }
+
+      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
         foreach (string inputVariable in algorithm.Model.InputVariables) {
-          ctx.InputVariables.InsertOnSubmit(new InputVariable(model, variables[inputVariable]));          
+          ctx.InputVariables.InsertOnSubmit(new InputVariable(model, variables[inputVariable]));
         }
         ctx.SubmitChanges();
@@ -194 +198 @@
 
     public IEnumerable<IResult> GetAllResultsForInputVariables() {
-      using(ModelingDataContext ctx = new ModelingDataContext(connection) ){
-        return (from ir in ctx.InputVariableResults  select ir.Result).Distinct().ToList().Cast<IResult>();
+      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+        return (from ir in ctx.InputVariableResults select ir.Result).Distinct().ToList().Cast<IResult>();
       }
     }
@@ -205 +209 @@
       ModelingDataContext ctx = new ModelingDataContext(connection);
       DataLoadOptions dlo = new DataLoadOptions();
-      dlo.LoadWith<ModelResult>(mr => mr.Model);
       dlo.LoadWith<ModelResult>(mr => mr.Result);
       ctx.LoadOptions = dlo;
@@ -214 +217 @@
       return results.ToList().Cast<IModelResult>();
     }
+
+    public void GetAllModelResults() {
+      ModelingDataContext ctx = new ModelingDataContext(connection);
+      DataLoadOptions dlo = new DataLoadOptions();
+      dlo.LoadWith<ModelResult>(mr => mr.Result);
+      dlo.LoadWith<ModelResult>(mr => mr.Model);
+      ctx.LoadOptions = dlo;
+
+      var results = from result in ctx.ModelResults
+                    select result;
+      results.ToList();     
+
+    }
     #endregion
 
@@ -221 +237 @@
       DataLoadOptions dlo = new DataLoadOptions();
       dlo.LoadWith<InputVariableResult>(ir => ir.Variable);
-      dlo.LoadWith<InputVariableResult>(ir => ir.Result);
-      dlo.LoadWith<InputVariableResult>(ir => ir.Model);
+      dlo.LoadWith<InputVariableResult>(ir => ir.Result);      
       ctx.LoadOptions = dlo;
 
@@ -241 +256 @@
       return ctx.Models.ToList().Cast<IModel>();
     }
+
+    public byte[] GetModelData(IModel model) {
+      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+        var data = (from md in ctx.ModelData
+                    where md.Model == model
+                    select md);
+        if (data.Count() == 0)
+          return null;
+        return data.Single().Data;
+      }
+    }
     #endregion
 

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj

@@ -122 +122 @@
     <Compile Include="DataObjects\InputVariableResult.cs" />
     <Compile Include="DataObjects\Model.cs" />
+    <Compile Include="DataObjects\ModelData.cs" />
     <Compile Include="HeuristicLabModelingDatabaseSQLServerCompactPlugin.cs" />
     <Compile Include="ModelingDataContext.cs" />

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/ModelingDataContext.cs

@@ -33 +33 @@
     }
 
+    public Table<ModelData> ModelData {
+      get { return GetTable<ModelData>(); }
+    }
+
     public Table<InputVariableResult> InputVariableResults {
       get { return GetTable<InputVariableResult>(); }

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database/3.2/IModel.cs

@@ -29 +29 @@
     IVariable TargetVariable { get; }
     IAlgorithm Algorithm { get; }
-    byte[] Data { get; }
     int TrainingSamplesStart { get; }
     int TrainingSamplesEnd { get; }

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database/3.2/IModelingDatabase.cs

@@ -32 +32 @@
     IEnumerable<IResult> GetAllResultsForInputVariables();
     IEnumerable<IModelResult> GetModelResults(IModel model);
-    IEnumerable<IInputVariableResult> GetInputVariableResults(IModel model);    
+    byte[] GetModelData(IModel model);
+    IEnumerable<IInputVariableResult> GetInputVariableResults(IModel model);
+
+    void GetAllModelResults();
   }
 }