Changeset 2285 for trunk/tools/CedmaDatabaseMerger

Timestamp:

08/13/09 17:28:07 (15 years ago)

Author:

gkronber

Message:

Worked on #722 (IModel should provide a Predict() method to get predicted values for an input vector).
At the same time removed parameter PunishmentFactor from GP algorithms (this parameter is internal to TreeEvaluators now).

Location:

trunk/tools/CedmaDatabaseMerger

Files:

• CedmaDatabaseMerger.csproj (modified) (1 diff)
• MergerForm.cs (modified) (5 diffs)

trunk/tools/CedmaDatabaseMerger/CedmaDatabaseMerger.csproj

@@ -30 +30 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>

trunk/tools/CedmaDatabaseMerger/MergerForm.cs

@@ -49 +49 @@
         importButton.Enabled = false;
         BackgroundWorker worker = new BackgroundWorker();
+        worker.WorkerReportsProgress = true;
         worker.DoWork += CreateDoWorkDelegate(worker, importFileName);
         worker.ProgressChanged += new ProgressChangedEventHandler(worker_ProgressChanged);
@@ -70 +71 @@
         DatabaseService sourceDatabase = new DatabaseService("Data Source=" + importFileName);
 
+        sourceDatabase.Connect();
         var models = sourceDatabase.GetAllModels();
+        var sourceDataset = sourceDatabase.GetDataset();
         int importCount = 0;
         foreach (HeuristicLab.Modeling.Database.IModel m in models) {
-          HeuristicLab.Modeling.Model model = new HeuristicLab.Modeling.Model();
+
+          HeuristicLab.Modeling.IAnalyzerModel model = new AnalyzerModel();
+          model.Predictor = (HeuristicLab.Modeling.IPredictor)PersistenceManager.RestoreFromGZip(sourceDatabase.GetModelData(m));
           model.TargetVariable = m.TargetVariable.Name;
-          model.Data = (IItem)PersistenceManager.RestoreFromGZip(sourceDatabase.GetModelData(m));
-          model.Dataset = sourceDatabase.GetDataset();
+          model.Dataset = sourceDataset;
           model.TrainingSamplesStart = m.TrainingSamplesStart;
           model.TrainingSamplesEnd = m.TrainingSamplesEnd;
@@ -83 +87 @@
           model.TestSamplesStart = m.TestSamplesStart;
           model.TestSamplesEnd = m.TestSamplesEnd;
+          model.Predictor.Predict(sourceDataset, 10, 20);
           //get all double properties to save as modelResult
           IEnumerable<PropertyInfo> modelResultInfos = model.GetType().GetProperties().Where(
@@ -88 +93 @@
           var modelResults = sourceDatabase.GetModelResults(m);
           foreach (IModelResult result in modelResults) {
-            PropertyInfo matchingPropInfo = modelResultInfos.First(x=>x.Name == result.Result.Name);
-            if(matchingPropInfo!=null) matchingPropInfo.SetValue(model, result.Value, null);
+            PropertyInfo matchingPropInfo = modelResultInfos.First(x => x.Name == result.Result.Name);
+            if (matchingPropInfo != null) matchingPropInfo.SetValue(model, result.Value, null);
           }
           var inputVariableResults = sourceDatabase.GetInputVariableResults(m);
           foreach (IInputVariableResult result in inputVariableResults) {
-            model.AddInputVariables(result.Variable.Name);
+            model.AddInputVariable(result.Variable.Name);
             if (result.Result.Name == "VariableEvaluationImpact") {
               model.SetVariableEvaluationImpact(result.Variable.Name, result.Value);
@@ -100 +105 @@
             } else throw new FormatException();
           }
-          
+
           destiationDatabase.Persist(model, m.Algorithm.Name, m.Algorithm.Description);
           worker.ReportProgress((++importCount * 100) / models.Count());
         }
+        sourceDatabase.Disconnect();
       };
     }