Changeset 2326 for trunk

Timestamp:

09/02/09 16:48:56 (15 years ago)

Author:

mkommend

Message:

added name in IModel
added update methods for IModel and ModelData
(ticket #712)

Location:

trunk/sources

Files:

• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Model.cs (modified) (2 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (2 diffs)
• HeuristicLab.Modeling.Database/3.2/IModel.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database/3.2/IModelingDatabase.cs (modified) (1 diff)

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

@@ -32 +32 @@
     public Model() {
       targetVariable = default(EntityRef<Variable>);
-      algorithm = default(EntityRef<Algorithm>);
+      algorithm = default(EntityRef<Algorithm>);      
     }
 
@@ -94 +94 @@
     }
 
+    private string name;
+    [Column(Storage = "name", CanBeNull = true)]
+    public string Name {
+      get { return this.name; }
+      set { this.name = value; }
+    }
+
     private int trainingSamplesStart;
     [Column(Storage = "trainingSamplesStart", CanBeNull = false)]

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

@@ -264 +264 @@
     }
 
+    public void UpdateModel(IModel model) {
+      Model m = (Model)model;
+      Model orginal = ctx.Models.GetOriginalEntityState(m);
+      if (orginal == null)
+        ctx.Models.Attach(m);
+      ctx.SubmitChanges();
+    }
+
     public byte[] GetModelData(IModel model) {
       var data = (from md in ctx.ModelData
@@ -273 +281 @@
     }
 
+    public void UpdateModelData(IModel model, byte[] modelData) {
+      Model m = (Model)model;
+      ctx.ModelData.DeleteAllOnSubmit(ctx.ModelData.Where(x => x.Model == m));
+      ctx.ModelData.InsertOnSubmit(new ModelData(m, modelData));
+      ctx.SubmitChanges();
+    }
+
     public IPredictor GetModelPredictor(IModel model) {
       byte[] data = GetModelData(model);

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

@@ -29 +29 @@
     IVariable TargetVariable { get; }
     IAlgorithm Algorithm { get; }
+    string Name { get; set; }
     int TrainingSamplesStart { get; }
     int TrainingSamplesEnd { get; }

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

@@ -32 +32 @@
     IProblem PersistProblem(Dataset dataset);
 
+    void UpdateModel(IModel model);
+    void UpdateModelData(IModel model, byte[] modelData);
+
     IEnumerable<IModel> GetAllModels();
     IEnumerable<IResult> GetAllResults();