Changeset 2382 for trunk/sources/HeuristicLab.Modeling.Database

Timestamp:

09/23/09 14:05:28 (15 years ago)

Author:

mkommend

Message:

refactored modeling database to enable the change of models (ticket #759)

Location:

trunk/sources/HeuristicLab.Modeling.Database/3.2

Files:

• HeuristicLab.Modeling.Database-3.2.csproj (modified) (1 diff)
• IInputVariableResult.cs (modified) (1 diff)
• IModel.cs (modified) (1 diff)
• IModelMetaData.cs (modified) (1 diff)
• IModelResult.cs (modified) (1 diff)
• IModelingDatabase.cs (modified) (1 diff)

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

@@ -84 +84 @@
     <Compile Include="IMetaData.cs" />
     <Compile Include="IModelMetaData.cs" />
-    <Compile Include="IProblem.cs" />
     <Compile Include="IVariable.cs" />
     <Compile Include="IInputVariable.cs" />

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

@@ -30 +30 @@
     IVariable Variable { get; }
     IResult Result { get; }
-    double Value { get; }
+    double Value { get; set; }
   }
 }

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

@@ -36 +36 @@
     int ValidationSamplesEnd { get; }
     int TestSamplesStart { get; }
-    int TestSamplesEnd { get; }
+    int TestSamplesEnd { get; }    
   }
 }

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

@@ -29 +29 @@
     IMetaData MetaData { get; }
     IModel Model { get; }
-    double Value { get; }
+    double Value { get; set; }
   }
 }

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

@@ -29 +29 @@
     IResult Result { get; }
     IModel Model { get; }
-    double Value { get; }
+    double Value { get; set; }
   }
 }

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

@@ -28 +28 @@
 namespace HeuristicLab.Modeling.Database {
   public interface IModelingDatabase {
-    IModel Persist(HeuristicLab.Modeling.IAlgorithm algorithm);
-    IModel Persist(HeuristicLab.Modeling.IAnalyzerModel model, string algorithmName, string algorithmDescription);
-    IProblem PersistProblem(Dataset dataset);
-
-    void UpdateModel(IModel model);
-    void UpdateModelData(IModel model, byte[] modelData);
+    void Connect();
+    void EmptyDatabase();
+    void Disconnect();
 
     IEnumerable<IModel> GetAllModels();
-    IEnumerable<IResult> GetAllResults();    
+    IEnumerable<IVariable> GetAllVariables();
+    IEnumerable<IResult> GetAllResults();
     IEnumerable<IResult> GetAllResultsForInputVariables();
     IEnumerable<IMetaData> GetAllMetaData();
     IEnumerable<IAlgorithm> GetAllAlgorithms();
-       
+
+    IModel Persist(HeuristicLab.Modeling.IAlgorithm algorithm);
+    IModel Persist(HeuristicLab.Modeling.IAnalyzerModel model, string algorithmName, string algorithmDescription);
+
+    IModel CreateModel(ModelType modelType, IAlgorithm algorithm, IVariable targetVariable,
+     int trainingSamplesStart, int trainingSamplesEnd, int validationSamplesStart, int validationSamplesEnd, int testSamplesStart, int testSamplesEnd);
+    IModel CreateModel(string modelName, ModelType modelType, IAlgorithm algorithm, IVariable targetVariable,
+      int trainingSamplesStart, int trainingSamplesEnd, int validationSamplesStart, int validationSamplesEnd, int testSamplesStart, int testSamplesEnd);
+    void PersistModel(IModel model);
+    void DeleteModel(IModel model);
+
     Dataset GetDataset();
-    byte[] GetModelData(IModel model);
+    void PersistProblem(Dataset dataset);
+    IVariable GetVariable(string variableName);
+
     IPredictor GetModelPredictor(IModel model);
+    void PersistPredictor(IModel model, IPredictor predictor);
+
+    IAlgorithm GetOrPersistAlgorithm(string algorithmName);
+
+    IResult GetOrPersistResult(string resultName);
+    IMetaData GetOrPersistMetaData(string metaDataName);
+
     IEnumerable<IModelResult> GetModelResults(IModel model);
     IEnumerable<IInputVariableResult> GetInputVariableResults(IModel model);
     IEnumerable<IModelMetaData> GetModelMetaData(IModel model);
 
-    void Connect();
-    void EmptyDatabase();
-    void Disconnect();
+    IModelResult CreateModelResult(IModel model, IResult result, double value);
+    void PersistModelResults(IModel model, IEnumerable<IModelResult> modelResults);
+    IInputVariableResult CreateInputVariableResult(IInputVariable inputVariable, IResult result, double value);
+    void PersistInputVariableResults(IModel model, IEnumerable<IInputVariableResult> inputVariableResults);
+    IModelMetaData CreateModelMetaData(IModel model, IMetaData metadata, double value);
+    void PersistModelMetaData(IModel model, IEnumerable<IModelMetaData> modelMetaData);
   }
 }