Changeset 2355 for trunk

Timestamp:

09/15/09 09:47:38 (15 years ago)

Author:

mkommend

Message:

stored model metadata into modeling.database
changed analyzermodel to use dictionary of string, object (ticket #731)

Location:

trunk/sources

Files:

• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/MetaData.cs (added)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/ModelMetaData.cs (added)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (3 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/HeuristicLab.Modeling.Database-3.2.csproj (modified) (1 diff)
• HeuristicLab.Modeling.Database/3.2/IMetaData.cs (added)
• HeuristicLab.Modeling.Database/3.2/IModelMetaData.cs (added)
• HeuristicLab.Modeling.Database/3.2/IModelingDatabase.cs (modified) (2 diffs)
• HeuristicLab.Modeling/3.2/AnalyzerModel.cs (modified) (1 diff)
• HeuristicLab.Modeling/3.2/IAnalyzerModel.cs (modified) (2 diffs)

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

@@ -56 +56 @@
       DataLoadOptions dlo = new DataLoadOptions();
       dlo.LoadWith<ModelResult>(mr => mr.Result);
+      dlo.LoadWith<ModelMetaData>(mmd => mmd.MetaData);
       dlo.LoadWith<InputVariableResult>(ir => ir.Variable);
       dlo.LoadWith<InputVariableResult>(ir => ir.Result);
       dlo.LoadWith<Model>(m => m.TargetVariable);
-      dlo.LoadWith<Model>(m => m.Algorithm);
+      dlo.LoadWith<Model>(m => m.Algorithm);      
       ctx.LoadOptions = dlo;
     }
@@ -117 +118 @@
 
       // code to store meta-information for models (gkronber (8.9.09))
-      //using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
-      //  foreach (KeyValuePair<string, double> pair in model.MetaData) {
-      //    MetaData metaData = GetOrCreateMetaData(pair.Key);
-      //    ctx.ModelMetaData.InsertOnSubmit(new ModelMetaData(m, metaData, pair.Value));
-      //  }
-      //  ctx.SubmitChanges();
-      //}
+      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+        foreach (KeyValuePair<string, double> pair in model.MetaData) {
+          MetaData metaData = GetOrCreateMetaData(pair.Key);
+          ctx.ModelMetaData.InsertOnSubmit(new ModelMetaData(m, metaData, pair.Value));
+        }
+        ctx.SubmitChanges();
+      }
 
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
@@ -267 +268 @@
     #endregion
 
+    #region ModelMetaData
+    public IEnumerable<IModelMetaData> GetModelMetaData(IModel model) {
+      var metadata = from md in ctx.ModelMetaData
+                     where md.Model == model
+                     select md;
+      return metadata.ToList().Cast<IModelMetaData>();
+    }
+    #endregion
+
+    #region MetaData
+    public IEnumerable<IMetaData> GetAllMetaData() {
+      return ctx.MetaData.ToList().Cast<IMetaData>();
+    }
+
+    public MetaData GetOrCreateMetaData(string name) {
+      MetaData metadata;
+      using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
+        var md = from r in ctx.MetaData
+                      where r.Name == name
+                      select r;
+        if (md.Count() == 0) {
+          metadata = new MetaData(name);
+          ctx.MetaData.InsertOnSubmit(metadata);
+          ctx.SubmitChanges();
+        } else if (md.Count() == 1)
+          metadata = md.Single();
+        else
+          throw new ArgumentException("Could not get metadata. More than one metadata with the name " + name + " are saved in database.");
+      }
+      return metadata;
+    }
+
+    #endregion
+
     #region Model
     public IEnumerable<IModel> GetAllModels() {

trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj

@@ -121 +121 @@
     <Compile Include="DataObjects\InputVariable.cs" />
     <Compile Include="DataObjects\InputVariableResult.cs" />
+    <Compile Include="DataObjects\MetaData.cs" />
     <Compile Include="DataObjects\Model.cs" />
     <Compile Include="DataObjects\ModelData.cs" />
+    <Compile Include="DataObjects\ModelMetaData.cs" />
     <Compile Include="HeuristicLabModelingDatabaseSQLServerCompactPlugin.cs" />
     <Compile Include="ModelingDataContext.cs" />

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

@@ -66 +66 @@
     }
 
+    public Table<ModelMetaData> ModelMetaData {
+      get { return GetTable<ModelMetaData>(); }
+    }
+
+    public Table<MetaData> MetaData {
+      get { return GetTable<MetaData>(); }
+    }
+
     public Table<InputVariable> InputVariables {
       get { return GetTable<InputVariable>(); }

trunk/sources/HeuristicLab.Modeling.Database/3.2/HeuristicLab.Modeling.Database-3.2.csproj

@@ -82 +82 @@
     <Compile Include="IInputVariableResult.cs" />
     <Compile Include="IAlgorithm.cs" />
+    <Compile Include="IMetaData.cs" />
+    <Compile Include="IModelMetaData.cs" />
     <Compile Include="IProblem.cs" />
     <Compile Include="IVariable.cs" />

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

@@ -36 +36 @@
 
     IEnumerable<IModel> GetAllModels();
-    IEnumerable<IResult> GetAllResults();
+    IEnumerable<IResult> GetAllResults();    
     IEnumerable<IResult> GetAllResultsForInputVariables();
+    IEnumerable<IMetaData> GetAllMetaData();
     IEnumerable<IAlgorithm> GetAllAlgorithms();
        
@@ -45 +46 @@
     IEnumerable<IModelResult> GetModelResults(IModel model);
     IEnumerable<IInputVariableResult> GetInputVariableResults(IModel model);
+    IEnumerable<IModelMetaData> GetModelMetaData(IModel model);
 
     void Connect();

trunk/sources/HeuristicLab.Modeling/3.2/AnalyzerModel.cs

@@ -74 +74 @@
     }
 
-    private Dictionary<string, object> metadata = new Dictionary<string, object>();
-    public IEnumerable<KeyValuePair<string, object>> MetaData {
+    private Dictionary<string, double> metadata = new Dictionary<string, double>();
+    public IEnumerable<KeyValuePair<string, double>> MetaData {
       get { return metadata; }
     }
 
-    public void SetMetaData(string name, object value) {
+    public void SetMetaData(string name, double value) {
       metadata.Add(name, value);
     }
 
-    public object GetMetaData(string name) {
+    public double GetMetaData(string name) {
       return metadata[name];
     }

trunk/sources/HeuristicLab.Modeling/3.2/IAnalyzerModel.cs

@@ -33 +33 @@
     IEnumerable<string> InputVariables { get; }
     IEnumerable<KeyValuePair<string, double>> Results { get; }
-    IEnumerable<KeyValuePair<string, object>> MetaData { get; }
+    IEnumerable<KeyValuePair<string, double>> MetaData { get; }
     int TrainingSamplesStart { get; set; }
     int TrainingSamplesEnd { get; set; }
@@ -42 +42 @@
     void SetResult(string name, double value);
     double GetResult(string name);
-    void SetMetaData(string name, object data);
-    object GetMetaData(string name);
+    void SetMetaData(string name, double data);
+    double GetMetaData(string name);
     double GetVariableEvaluationImpact(string variableName);
     double GetVariableQualityImpact(string variableName);