Changeset 2451

Timestamp:

10/27/09 11:51:31 (15 years ago)

Author:

mkommend

Message:

added possibility to reload specific models and added readonly connection to HeuristicLab.Modeling (ticket #792)

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Server/3.3/ExecuterBase.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.Server/3.3/Server.cs (modified) (2 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/ModelData.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (16 diffs)
• HeuristicLab.Modeling.Database/3.2/IModelingDatabase.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ExecuterBase.cs

@@ -71 +71 @@
       this.dispatcher = dispatcher;
       this.databaseService = databaseService;
+      this.databaseService.Connect();
       StoredJobs = databaseService.GetAllModels().Count();
+      this.databaseService.Disconnect();
     }
 
@@ -94 +96 @@
     protected void StoreResults(HeuristicLab.Modeling.IAlgorithm finishedAlgorithm) {
       CalculatedJobs++;
+      databaseService.Connect();
       databaseService.Persist(finishedAlgorithm);
+      databaseService.Disconnect();
       StoredJobs++;
       OnChanged();

trunk/sources/HeuristicLab.CEDMA.Server/3.3/Server.cs

@@ -38 +38 @@
   public class Server : IViewable {
     private static readonly string sqlServerCompactFile = AppDomain.CurrentDomain.BaseDirectory + "HeuristicLab.Modeling.database.sdf";
-    private static readonly string sqlServerCompactConnectionString = @"Data Source=" + sqlServerCompactFile;
 
     private DatabaseService database;
@@ -57 +56 @@
 
     public Server() {
-      database = new DatabaseService(sqlServerCompactConnectionString);
+      database = new DatabaseService(sqlServerCompactFile);
+      database.Connect();
       dataset = database.GetDataset();
       if (dataset == null)
-        dataset = new Dataset();      
+        dataset = new Dataset();
+      database.Disconnect();
     }
 

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

@@ -36 +36 @@
     public ModelData(Model model, byte[] data)
       : base() {
-      this.modelId = model.Id;
+      if (model.Id == -1)
+        this.model.Entity = model;
+      else
+        this.modelId = model.Id;
       this.data = data;
     }

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

@@ -32 +32 @@
 namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   public class DatabaseService : IModelingDatabase {
-    private readonly string connection;
-    public DatabaseService(string connection) {
-      this.connection = connection;
-      Connect();
-      if (!ctx.DatabaseExists())
-        ctx.CreateDatabase();
+    private readonly string fileName;
+
+    public DatabaseService(string fileName) {
+      this.fileName = fileName;
+      this.readOnly = false;
+
+    }
+    public DatabaseService(string fileName, bool readOnly)
+      : this(fileName) {
+      this.readOnly = readOnly;
+    }
+
+    private string ConnectionString {
+      get {
+        string connection = "Data Source =" + fileName + ";";
+        if (this.readOnly)
+          connection += "File Mode = Read Only; Temp Path =" + System.IO.Path.GetTempPath() + ";";
+        else
+          connection += "File Mode = Shared Read;";
+        return connection;
+      }
+    }
+
+    private bool readOnly;
+    public bool ReadOnly {
+      get { return this.readOnly; }
+      set {
+        if (ctx != null)
+          throw new InvalidOperationException("Could not change readonly attribute of DatabaseService because connection is opened.");
+        this.readOnly = value;
+      }
     }
 
@@ -45 +70 @@
       Connect();
       ctx.CreateDatabase();
+      Disconnect();
     }
 
@@ -52 +78 @@
         Disconnect();
 
-      ctx = new ModelingDataContext(connection);
+      ctx = new ModelingDataContext(this.ConnectionString);
       DataLoadOptions dlo = new DataLoadOptions();
       dlo.LoadWith<ModelResult>(mr => mr.Result);
@@ -61 +87 @@
       dlo.LoadWith<Model>(m => m.Algorithm);
       ctx.LoadOptions = dlo;
+
+      if (!ctx.DatabaseExists())
+        ctx.CreateDatabase();
     }
 
@@ -73 +102 @@
     public IEnumerable<IModel> GetAllModels() {
       return ctx.Models.ToList().Cast<IModel>();
+    }
+
+    public IEnumerable<int> GetAllModelIds() {
+      return from m in ctx.Models
+             select m.Id;
     }
 
@@ -118 +152 @@
     }
 
+    public IModel GetModel(int id) {
+      var model = ctx.Models.Where(m => m.Id == id);
+      if (model.Count() == 1)
+        return model.Single();
+      return null;
+    }
+
     public void PersistModel(IModel model) {
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
-        Model m = (Model)model;
-        //check if model has to be updated or inserted
-        if (ctx.Models.Any(x => x.Id == model.Id)) {
-          Model orginal = ctx.Models.GetOriginalEntityState(m);
-          if (orginal == null)
-            ctx.Models.Attach(m);
-          ctx.Refresh(RefreshMode.KeepCurrentValues, m);
-        } else
-          ctx.Models.InsertOnSubmit(m);
-        ctx.SubmitChanges();
-      }
+      Model m = (Model)model;
+      //check if model has to be updated or inserted
+      if (ctx.Models.Any(x => x.Id == model.Id)) {
+        Model orginal = ctx.Models.GetOriginalEntityState(m);
+        if (orginal == null)
+          ctx.Models.Attach(m);
+        ctx.Refresh(RefreshMode.KeepCurrentValues, m);
+      } else
+        ctx.Models.InsertOnSubmit(m);
+      ctx.SubmitChanges();
     }
 
@@ -157 +196 @@
     public void PersistProblem(Dataset dataset) {
       Problem problem;
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+      using (ModelingDataContext ctx = new ModelingDataContext(this.ConnectionString)) {
         if (ctx.Problems.Count() != 0)
           throw new InvalidOperationException("Could not persist dataset. A dataset is already saved in the database.");
@@ -187 +226 @@
     public void PersistPredictor(IModel model, IPredictor predictor) {
       Model m = (Model)model;
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
-        ctx.ModelData.DeleteAllOnSubmit(ctx.ModelData.Where(x => x.Model == m));
-        ctx.ModelResults.DeleteAllOnSubmit(ctx.ModelResults.Where(x => x.Model == m));
-        ctx.InputVariableResults.DeleteAllOnSubmit(ctx.InputVariableResults.Where(x => x.Model == m));
-        ctx.InputVariables.DeleteAllOnSubmit(ctx.InputVariables.Where(x => x.Model == m));
-
-        ctx.ModelData.InsertOnSubmit(new ModelData(m, PersistenceManager.SaveToGZip(predictor)));
-        foreach (string variableName in predictor.GetInputVariables())
-          ctx.InputVariables.InsertOnSubmit(new InputVariable(m, (Variable)GetVariable(variableName)));
-
-        ctx.SubmitChanges();
-      }
+      ctx.ModelData.DeleteAllOnSubmit(ctx.ModelData.Where(x => x.Model == m));
+      ctx.ModelResults.DeleteAllOnSubmit(ctx.ModelResults.Where(x => x.Model == m));
+      ctx.InputVariableResults.DeleteAllOnSubmit(ctx.InputVariableResults.Where(x => x.Model == m));
+      ctx.InputVariables.DeleteAllOnSubmit(ctx.InputVariables.Where(x => x.Model == m));
+
+      ctx.ModelData.InsertOnSubmit(new ModelData(m, PersistenceManager.SaveToGZip(predictor)));
+      foreach (string variableName in predictor.GetInputVariables())
+        ctx.InputVariables.InsertOnSubmit(new InputVariable(m, (Variable)GetVariable(variableName)));
+
+      ctx.SubmitChanges();
     }
 
@@ -214 +251 @@
     public IAlgorithm GetOrPersistAlgorithm(string algorithmName) {
       Algorithm algorithm;
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+      using (ModelingDataContext ctx = new ModelingDataContext(this.ConnectionString)) {
         var algorithms = ctx.Algorithms.Where(algo => algo.Name == algorithmName);
         if (algorithms.Count() == 0) {
@@ -230 +267 @@
     public IResult GetOrPersistResult(string resultName) {
       Result result;
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+      using (ModelingDataContext ctx = new ModelingDataContext(this.ConnectionString)) {
         var results = ctx.Results.Where(r => r.Name == resultName);
         if (results.Count() == 0) {
@@ -246 +283 @@
     public IMetaData GetOrPersistMetaData(string metaDataName) {
       MetaData metadata;
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+      using (ModelingDataContext ctx = new ModelingDataContext(this.ConnectionString)) {
         var md = ctx.MetaData.Where(r => r.Name == metaDataName);
         if (md.Count() == 0) {
@@ -277 +314 @@
 
     public void PersistModelResults(IModel model, IEnumerable<IModelResult> modelResults) {
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+      using (ModelingDataContext ctx = new ModelingDataContext(this.ConnectionString)) {
         ctx.ModelResults.DeleteAllOnSubmit(GetModelResults(model).Cast<ModelResult>());
         ctx.ModelResults.InsertAllOnSubmit(modelResults.Cast<ModelResult>());
@@ -296 +333 @@
 
     public void PersistInputVariableResults(IModel model, IEnumerable<IInputVariableResult> inputVariableResults) {
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+      using (ModelingDataContext ctx = new ModelingDataContext(this.ConnectionString)) {
         ctx.InputVariableResults.DeleteAllOnSubmit(GetInputVariableResults(model).Cast<InputVariableResult>());
         ctx.InputVariableResults.InsertAllOnSubmit(inputVariableResults.Cast<InputVariableResult>());
@@ -310 +347 @@
 
     public void PersistModelMetaData(IModel model, IEnumerable<IModelMetaData> modelMetaData) {
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+      using (ModelingDataContext ctx = new ModelingDataContext(this.ConnectionString)) {
         ctx.ModelMetaData.DeleteAllOnSubmit(GetModelMetaData(model).Cast<ModelMetaData>());
         ctx.ModelMetaData.InsertAllOnSubmit(modelMetaData.Cast<ModelMetaData>());
@@ -326 +363 @@
       Algorithm algorithm = (Algorithm)GetOrPersistAlgorithm(algorithmName);
       Variable targetVariable = (Variable)GetVariable(model.TargetVariable);
-
       Model m = (Model)CreateModel(null, model.Type, algorithm, targetVariable, model.TrainingSamplesStart, model.TrainingSamplesEnd,
         model.ValidationSamplesStart, model.ValidationSamplesEnd, model.TestSamplesStart, model.TestSamplesEnd);
-      PersistModel(m);
-      PersistPredictor(m, model.Predictor);
-
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+
+      using (ModelingDataContext ctx = new ModelingDataContext(this.ConnectionString)) {
+        ctx.Models.InsertOnSubmit(m);
+        ctx.SubmitChanges();
+        ctx.ModelData.InsertOnSubmit(new ModelData(m, PersistenceManager.SaveToGZip(model.Predictor)));
+        foreach (string variableName in model.Predictor.GetInputVariables())
+          ctx.InputVariables.InsertOnSubmit(new InputVariable(m, (Variable)GetVariable(variableName)));
+
         foreach (KeyValuePair<string, double> pair in model.MetaData) {
           MetaData metaData = (MetaData)GetOrPersistMetaData(pair.Key);
           ctx.ModelMetaData.InsertOnSubmit(new ModelMetaData(m, metaData, pair.Value));
         }
-        ctx.SubmitChanges();
-      }
-
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+
         foreach (KeyValuePair<ModelingResult, double> pair in model.Results) {
           Result result = (Result)GetOrPersistResult(pair.Key.ToString());
           ctx.ModelResults.InsertOnSubmit(new ModelResult(m, result, pair.Value));
         }
-        ctx.SubmitChanges();
-      }
-
-      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+
         foreach (InputVariable variable in ctx.InputVariables.Where(iv => iv.Model == m)) {
           foreach (KeyValuePair<ModelingResult, double> variableResult in model.GetVariableResults(variable.Variable.Name)) {
@@ -355 +389 @@
           }
         }
+
         ctx.SubmitChanges();
       }

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

@@ -28 +28 @@
 namespace HeuristicLab.Modeling.Database {
   public interface IModelingDatabase {
+    bool ReadOnly { get; set; }
     void Connect();
     void EmptyDatabase();
@@ -33 +34 @@
 
     IEnumerable<IModel> GetAllModels();
+    IEnumerable<int> GetAllModelIds();
     IEnumerable<IVariable> GetAllVariables();
     IEnumerable<IResult> GetAllResults();
@@ -53 +55 @@
     IVariable GetVariable(string variableName);
 
+    IModel GetModel(int id);
     IPredictor GetModelPredictor(IModel model);
     void PersistPredictor(IModel model, IPredictor predictor);