Changeset 2194 for branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2

Timestamp:

07/28/09 15:29:10 (15 years ago)

Author:

mkommend

Message:

adapted HeuristicLab.Modeling.Database and Database.SQLServerCompact (ticket #712)

Location:

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database.SQLServerCompact

Files:

• . (moved) (moved from branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.SQLServerCompactBackend)
• 3.2/DataObjects/Algorithm.cs (modified) (1 diff)
• 3.2/DataObjects/InputVariable.cs (modified) (4 diffs)
• 3.2/DataObjects/InputVariableResult.cs (modified) (5 diffs)
• 3.2/DataObjects/Model.cs (modified) (7 diffs)
• 3.2/DataObjects/ModelResult.cs (modified) (1 diff)
• 3.2/DataObjects/Problem.cs (modified) (1 diff)
• 3.2/DataObjects/Result.cs (modified) (1 diff)
• 3.2/DataObjects/Variable.cs (modified) (1 diff)
• 3.2/DatabaseService.cs (modified) (4 diffs)
• 3.2/HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj (copied) (copied from branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.SQLServerCompactBackend/3.2/HeuristicLab.Modeling.SQLServerCompactBackend-3.2.csproj) (2 diffs)
• 3.2/HeuristicLab.Modeling.SQLServerCompactBackend-3.2.csproj (deleted)
• 3.2/ModelingDataContext.cs (modified) (1 diff)
• 3.2/SQLServerCompactDatabase.sdf (deleted)

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

@@ -6 +6 @@
 using System.Text;
 
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name = "Algorithm")]
-  public class Algorithm {
+  public class Algorithm : IAlgorithm  {
     public Algorithm() {
     }

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

@@ -5 +5 @@
 using System.Text;
 
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name = "InputVariable")]
-  public class InputVariable {
+  public class InputVariable : IInputVariable {
     public InputVariable() {
       this.model = default(EntityRef<Model>);
@@ -27 +27 @@
           if (variable.HasLoadedOrAssignedValue)
             throw new ForeignKeyReferenceAlreadyHasValueException();
-          variableId = value;
+          variableId = value;          
         }
       }
@@ -34 +34 @@
     private EntityRef<Variable> variable;
     [Association(Storage = "variable", ThisKey = "VariableId", OtherKey = "Id", IsForeignKey = true)]
-    public Variable Variable {
+    public IVariable Variable {
       get { return variable.Entity; }
     }
@@ -53 +53 @@
     private EntityRef<Model> model;
     [Association(Storage = "model", ThisKey = "ModelId", OtherKey = "Id", IsForeignKey = true)]
-    public Model Model {
+    public IModel Model {
       get { return model.Entity; }
     }

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

@@ -5 +5 @@
 using System.Text;
 
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name="InputVariableResult")]
-  public class InputVariableResult {
+  public class InputVariableResult : IInputVariableResult {
     public InputVariableResult() {
       this.model = default(EntityRef<Model>);
@@ -16 +16 @@
     public InputVariableResult(InputVariable inputVariable, Result result, double value)
       : this() {
-      this.variable.Entity = inputVariable.Variable;
-      this.model.Entity = inputVariable.Model;
+      this.variable.Entity = (Variable)inputVariable.Variable;
+      this.model.Entity = (Model)inputVariable.Model;
       this.result.Entity = result;
       this.value = value;
@@ -37 +37 @@
     private EntityRef<Variable> variable;
     [Association(Storage = "variable", ThisKey = "VariableId", OtherKey = "Id", IsForeignKey = true)]
-    public Variable Variable {
+    public IVariable Variable {
       get { return variable.Entity; }
     }
@@ -56 +56 @@
     private EntityRef<Model> model;
     [Association(Storage = "model", ThisKey = "ModelId", OtherKey = "Id", IsForeignKey = true)]
-    public Model Model {
+    public IModel Model {
       get { return model.Entity; }
     }
@@ -75 +75 @@
     private EntityRef<Result> result;
     [Association(Storage = "result", ThisKey = "ResultId", OtherKey = "Id", IsForeignKey = true)]
-    public Result Result {
+    public IResult Result {
       get { return result.Entity; }
     }

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

@@ -6 +6 @@
 using System.Text;
 
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name = "Model")]
   public class Model : IModel{
@@ -14 +14 @@
     }
 
-    public Model(Variable targetVariable, Algorithm algorithm, byte[] model)
+    public Model(Variable targetVariable, Algorithm algorithm, byte[] data)
       : this() {
       this.TargetVariable = targetVariable;
       this.Algorithm = algorithm;
-      this.modelData = model;
+      this.Data = data;
     }
 
@@ -28 +28 @@
     }
 
-    private byte[] modelData;
+    private byte[] data;
     [Column(Storage = "model", DbType = "image", CanBeNull = false)]
-    public byte[] ModelData {
-      get { return this.modelData; }
-      set { this.modelData = value; }
+    public byte[] Data {
+      get { return this.data; }
+      set { this.data = value; }
     }
 
@@ -50 +50 @@
     private EntityRef<Algorithm> algorithm;
     [Association(Storage = "algorithm", ThisKey = "AlgorithmId", OtherKey = "Id", IsForeignKey = true)]
-    public Algorithm Algorithm {
+    public IAlgorithm Algorithm {
       get { return this.algorithm.Entity; }
-      set {
+      private set {
         Algorithm previousValue = algorithm.Entity;
         if (previousValue != value || (!algorithm.HasLoadedOrAssignedValue)) {
@@ -58 +58 @@
             algorithm.Entity = null;
           }
-          algorithm.Entity = value;
+          algorithm.Entity = (Algorithm)value;
           if (value != null) {
-            algorithmId = value.Id;
+            algorithmId = ((Algorithm)value).Id;
           }
         }
@@ -81 +81 @@
     private EntityRef<Variable> targetVariable;
     [Association(Storage = "targetVariable", ThisKey = "TargetVariableId", OtherKey = "Id", IsForeignKey = true)]
-    public Variable TargetVariable {
+    public IVariable TargetVariable {
       get { return this.targetVariable.Entity; }
-      set {
+      private set {
         Variable previousValue = targetVariable.Entity;
         if (previousValue != value || (!targetVariable.HasLoadedOrAssignedValue)) {
@@ -89 +89 @@
             targetVariable.Entity = null;
           }
-          targetVariable.Entity = value;
+          targetVariable.Entity = (Variable)value;
           if (value != null) {
-            targetVariableId = value.Id;
+            targetVariableId = ((Variable)value).Id;
           } 
         }

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

@@ -5 +5 @@
 using System.Text;
 
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name = "ModelResult")]
   public class ModelResult {

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

@@ -7 +7 @@
 using HeuristicLab.DataAnalysis;
 
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name = "Problem")]
   public class Problem {

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

@@ -6 +6 @@
 using System.Text;
 
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name = "Result")]
   public class Result : IResult {

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

@@ -6 +6 @@
 using System.Text;
 
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name = "Variable")]
-  public class Variable {
+  public class Variable : IVariable{
     public Variable() {
     }

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

@@ -9 +9 @@
 using HeuristicLab.GP.StructureIdentification;
 using HeuristicLab.Data;
-
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+using System.Data.Linq;
+
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   public class DatabaseService : IModelingDatabase {
 
@@ -29 +30 @@
     }
 
-    public void Persist(IAlgorithm algorithm) {
+    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;
@@ -179 +180 @@
 
     public IEnumerable<IResult> GetAllResults() {
-      throw new NotImplementedException();
+      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+        return ctx.Results.AsEnumerable().Cast<IResult>();
+      }
     }
 
@@ -186 +189 @@
     #region ModelResult
     public IEnumerable<IModelResult> GetModelResults(IModel model) {
-      throw new NotImplementedException();
+      ModelingDataContext ctx = new ModelingDataContext(connection);
+      DataLoadOptions dlo = new DataLoadOptions();
+      dlo.LoadWith<ModelResult>(mr => mr.Model);
+      dlo.LoadWith<ModelResult>(mr => mr.Result);
+      ctx.LoadOptions = dlo;
+
+      var results = from result in ctx.ModelResults
+                    where result.Model == model
+                    select result;
+      return results.AsEnumerable().Cast<IModelResult>();
     }
     #endregion
 
     #region Model
-    public IEnumerable<IDatabaseModel> GetAllModels() {
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
-        return ctx.Models;
+    public IEnumerable<IModel> GetAllModels() {
+      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+        return ctx.Models.AsEnumerable().Cast<IModel>();
       }
     }

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

@@ -6 +6 @@
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9B4F7D05-CCE1-45BB-81D1-5D4925851901}</ProjectGuid>
+    <ProjectGuid>{EC1AA756-D612-4FA6-AA52-25CF4F8E3836}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.Modeling.SQLServerCompactBackend</RootNamespace>
-    <AssemblyName>HeuristicLab.Modeling.SQLServerCompactBackend-3.2</AssemblyName>
+    <RootNamespace>HeuristicLab.Modeling.Database.SQLServerCompact</RootNamespace>
+    <AssemblyName>HeuristicLab.Modeling.Database.SQLServerCompact-3.2</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -103 +103 @@
       <Name>HeuristicLab.GP.StructureIdentification-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Modeling.Database\3.2\HeuristicLab.Modeling.Database-3.2.csproj">
+      <Project>{E84E5717-79F8-498F-A5E0-A055C4EC086B}</Project>
+      <Name>HeuristicLab.Modeling.Database-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">
       <Project>{80F7FADA-549D-4151-8856-79B620A50DBA}</Project>

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

@@ -6 +6 @@
 using System.Text;
 
-namespace HeuristicLab.Modeling.SQLServerCompactBackend {
+namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   public class ModelingDataContext : DataContext{
     public ModelingDataContext(string connection)