Changeset 2275

Timestamp:

08/11/09 15:43:58 (15 years ago)

Author:

gkronber

Message:

• Fixed bugs in the SQL comact backend for HL.Modeling.
• Readded dispatching of stochastic algorithms in CEDMA dispatcher after it was deactivated unintentionally
• Show algorithm name as model attribute in CEDMA results.

#712.

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Core/3.3/Results.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Core/3.3/Results.cs

@@ -94 +94 @@
         modelEntry.Set("PersistedData", database.GetModelData(model));
         modelEntry.Set("TargetVariable", model.TargetVariable.Name);
+        modelEntry.Set("Algorithm", model.Algorithm.Name);
         Dictionary<HeuristicLab.Modeling.Database.IVariable, ResultsEntry> inputVariableResultsEntries =
           new Dictionary<HeuristicLab.Modeling.Database.IVariable, ResultsEntry>();
@@ -123 +124 @@
     private void LoadModelAttributes() {
       ordinalVariables = database.GetAllResults().Select(r => r.Name).ToArray();
-      categoricalVariables = new string[] { "TargetVariable" };
+      categoricalVariables = new string[] { "TargetVariable", "Algorithm" };
     }
 

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

@@ -60 +60 @@
         case LearningTask.Regression: {
             var regressionAlgos = algos.Where(a => (a as IClassificationAlgorithm) == null && (a as ITimeSeriesAlgorithm) == null);
-            selectedAlgorithm = ChooseDeterministic(targetVariable, inputVariables, regressionAlgos); //  ?? ChooseStochastic(regressionAlgos);
+            selectedAlgorithm = ChooseDeterministic(targetVariable, inputVariables, regressionAlgos) ?? ChooseStochastic(regressionAlgos);
             break;
           }

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

@@ -94 +94 @@
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
         ctx.ModelData.InsertOnSubmit(new ModelData(m, PersistenceManager.SaveToGZip(model.Data)));
+        ctx.SubmitChanges();
       }
 
@@ -124 +125 @@
         foreach (MethodInfo inputVariableResultInfo in inputVariableResultInfos) {
           Result result = GetOrCreateResult(inputVariableResultInfo.Name.Substring(3));
-          foreach (InputVariable variable in ctx.InputVariables.Where(iv => iv.Model == model)) {
+          foreach (InputVariable variable in ctx.InputVariables.Where(iv => iv.Model == m)) {
             double value = (double)inputVariableResultInfo.Invoke(model, new object[] { variable.Variable.Name });
             ctx.InputVariableResults.InsertOnSubmit(new InputVariableResult(variable, result, value));