Changeset 2371

Timestamp:

09/21/09 14:15:37 (15 years ago)

Author:

mkommend

Message:

added code for persisting of ModelType into the database (ticket #756)

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.2/EventArgs.cs (added)
• HeuristicLab.Common/3.2/HeuristicLab.Common-3.2.csproj (modified) (1 diff)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Model.cs (modified) (2 diffs)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database/3.2/IModel.cs (modified) (1 diff)
• HeuristicLab.Modeling/3.2/AnalyzerModel.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Common/3.2/HeuristicLab.Common-3.2.csproj

@@ -84 +84 @@
     </Compile>
     <Compile Include="EnumerableEventArgs.cs" />
+    <Compile Include="EventArgs.cs" />
     <Compile Include="HeuristicLabCommonPlugin.cs" />
     <Compile Include="NotificationDictionary.cs" />

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>);
     }
 
-    public Model(Variable targetVariable, Algorithm algorithm)
+    public Model(Variable targetVariable, Algorithm algorithm, ModelType modelType)
       : this() {
       this.targetVariableId = targetVariable.Id;
       this.algorithmId = algorithm.Id;
+      ModelType = modelType.ToString();
     }
 
@@ -94 +95 @@
     }
 
+    private string modelType;
+    [Column(Storage = "modelType", CanBeNull = false)]
+    public string ModelType {
+      get { return this.modelType; }
+      private set { this.modelType = value; }
+    }
+
+    ModelType IModel.ModelType {
+      get {
+        if (!Enum.IsDefined(typeof(ModelType), this.modelType))
+          throw new ArgumentException("ModelType " + modelType + " not declared.");
+        return (ModelType)Enum.Parse(typeof(ModelType), this.modelType);
+      }
+    }
+
     private string name;
     [Column(Storage = "name", CanBeNull = true)]

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

@@ -84 +84 @@
 
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
-        m = new Model(target, algo);
+        m = new Model(target, algo,model.Type);
         m.TrainingSamplesStart = model.TrainingSamplesStart;
         m.TrainingSamplesEnd = model.TrainingSamplesEnd;

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

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

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

@@ -31 +31 @@
     public AnalyzerModel() { } // for persistence
 
-    #region IModel Members
+    #region IAnalyzerModel Members
 
     private Dataset dataset;