Changeset 2197 for branches

Timestamp:

07/28/09 16:28:52 (15 years ago)

Author:

mkommend

Message:

adapted connection string and explicitly implemented the defined interfaces in hl.modeling.database (ticket #712)

Location:

branches/HeuristicLab.Modeling Database Backend/sources

Files:

• HeuristicLab.CEDMA.Server/3.3/Server.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/InputVariable.cs (modified) (2 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/InputVariableResult.cs (modified) (3 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Model.cs (modified) (5 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/ModelResult.cs (modified) (3 diffs)

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/Server.cs

@@ -38 +38 @@
 namespace HeuristicLab.CEDMA.Server {
   public class Server : IViewable {
-    private static readonly string sqlServerCompactFile = AppDomain.CurrentDomain.BaseDirectory + "HeuristicLab.Modeling.database";
+    private static readonly string sqlServerCompactFile = AppDomain.CurrentDomain.BaseDirectory + "HeuristicLab.Modeling.database.sdf";
     private static readonly string sqlServerCompactConnectionString = @"Data Source=" + sqlServerCompactFile;
 

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

@@ -34 +34 @@
     private EntityRef<Variable> variable;
     [Association(Storage = "variable", ThisKey = "VariableId", OtherKey = "Id", IsForeignKey = true)]
-    public IVariable Variable {
+    public Variable Variable {
       get { return variable.Entity; }
+    }
+
+    IVariable IInputVariable.Variable {
+      get { return this.Variable; }
     }
 
@@ -53 +57 @@
     private EntityRef<Model> model;
     [Association(Storage = "model", ThisKey = "ModelId", OtherKey = "Id", IsForeignKey = true)]
-    public IModel Model {
+    public Model Model {
       get { return model.Entity; }
+    }
+
+    IModel IInputVariable.Model {
+      get { return this.Model;}
     }
   }

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

@@ -37 +37 @@
     private EntityRef<Variable> variable;
     [Association(Storage = "variable", ThisKey = "VariableId", OtherKey = "Id", IsForeignKey = true)]
-    public IVariable Variable {
+    public Variable Variable {
       get { return variable.Entity; }
+    }
+
+    IVariable IInputVariableResult.Variable {
+      get { return this.Variable; }
     }
 
@@ -56 +60 @@
     private EntityRef<Model> model;
     [Association(Storage = "model", ThisKey = "ModelId", OtherKey = "Id", IsForeignKey = true)]
-    public IModel Model {
+    public Model Model {
       get { return model.Entity; }
+    }
+
+    IModel IInputVariableResult.Model {
+      get { return this.Model; }
     }
 
@@ -75 +83 @@
     private EntityRef<Result> result;
     [Association(Storage = "result", ThisKey = "ResultId", OtherKey = "Id", IsForeignKey = true)]
-    public IResult Result {
+    public Result Result {
       get { return result.Entity; }
+    }
+
+    IResult IInputVariableResult.Result {
+      get { return this.Result; }
     }
 

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

@@ -29 +29 @@
 
     private byte[] data;
-    [Column(Storage = "model", DbType = "image", CanBeNull = false)]
+    [Column(Storage = "data", DbType = "image", CanBeNull = false)]
     public byte[] Data {
       get { return this.data; }
@@ -50 +50 @@
     private EntityRef<Algorithm> algorithm;
     [Association(Storage = "algorithm", ThisKey = "AlgorithmId", OtherKey = "Id", IsForeignKey = true)]
-    public IAlgorithm Algorithm {
+    public Algorithm Algorithm {
       get { return this.algorithm.Entity; }
       private set {
@@ -58 +58 @@
             algorithm.Entity = null;
           }
-          algorithm.Entity = (Algorithm)value;
+          algorithm.Entity =value;
           if (value != null) {
-            algorithmId = ((Algorithm)value).Id;
+            algorithmId = value.Id;
           }
         }
       }
+    }
+
+    IAlgorithm IModel.Algorithm {
+      get { return this.Algorithm; }
     }
 
@@ -81 +85 @@
     private EntityRef<Variable> targetVariable;
     [Association(Storage = "targetVariable", ThisKey = "TargetVariableId", OtherKey = "Id", IsForeignKey = true)]
-    public IVariable TargetVariable {
+    public Variable TargetVariable {
       get { return this.targetVariable.Entity; }
       private set {
@@ -89 +93 @@
             targetVariable.Entity = null;
           }
-          targetVariable.Entity = (Variable)value;
+          targetVariable.Entity = value;
           if (value != null) {
-            targetVariableId = ((Variable)value).Id;
+            targetVariableId = value.Id;
           }
         }
       }
+    }
+
+    IVariable IModel.TargetVariable {
+      get { return this.TargetVariable; }
     }
 

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

@@ -7 +7 @@
 namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name = "ModelResult")]
-  public class ModelResult {
+  public class ModelResult : IModelResult {
     public ModelResult() {
       this.model = default(EntityRef<Model>);
@@ -58 +58 @@
     }
 
+    IModel IModelResult.Model {
+      get { return this.Model; }
+    }
+
     private int resultId;
     [Column(Storage = "resultId", CanBeNull = false)]
@@ -89 +93 @@
     }
 
+    IResult IModelResult.Result {
+      get { return this.Result; }
+    }
+
   }
 }