Changeset 2258 for trunk/sources/HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs

Timestamp:

08/07/09 16:50:07 (15 years ago)

Author:

gkronber

Message:

• Reimplemented method to read a list of already executed algorithms and configurations from the results DB
• Fixed a bug in the GridExecuter
• Added a button in the dispatcher view to speed up configuration of input variables

#712

File:

• trunk/sources/HeuristicLab.CEDMA.Server/3.3/SimpleDispatcher.cs (modified) (3 diffs)

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;
           }
@@ -99 +99 @@
 
     private void PopulateFinishedRuns() {
-      //Dictionary<Entity, Entity> processedModels = new Dictionary<Entity, Entity>();
-      //var datasetBindings = store
-      //  .Query(
-      //  "?Dataset <" + Ontology.InstanceOf + "> <" + Ontology.TypeDataSet + "> .", 0, 1)
-      //  .Select(x => (Entity)x.Get("Dataset"));
-
-      //if (datasetBindings.Count() > 0) {
-      //  var datasetEntity = datasetBindings.ElementAt(0);
-
-      //  DataSet ds = new DataSet(store, datasetEntity);
-      //  var result = store
-      //    .Query(
-      //    "?Model <" + Ontology.TargetVariable + "> ?TargetVariable ." + Environment.NewLine +
-      //    "?Model <" + Ontology.Name + "> ?AlgoName .",
-      //    0, 1000)
-      //    .Select(x => new Resource[] { (Literal)x.Get("TargetVariable"), (Literal)x.Get("AlgoName"), (Entity)x.Get("Model") });
-
-      //  foreach (Resource[] row in result) {
-      //    Entity model = ((Entity)row[2]);
-      //    if (!processedModels.ContainsKey(model)) {
-      //      processedModels.Add(model, model);
-
-      //      string targetVariable = (string)((Literal)row[0]).Value;
-      //      string algoName = (string)((Literal)row[1]).Value;
-      //      int targetVariableIndex = ds.Problem.Dataset.GetVariableIndex(targetVariable);
-
-      //      var inputVariableLiterals = store
-      //        .Query(
-      //          "<" + model.Uri + "> <" + Ontology.HasInputVariable + "> ?InputVariable ." + Environment.NewLine +
-      //          "?InputVariable <" + Ontology.Name + "> ?Name .",
-      //          0, 1000)
-      //        .Select(x => (Literal)x.Get("Name"))
-      //        .Select(l => (string)l.Value)
-      //        .Distinct();
-
-      //      List<int> inputVariables = new List<int>();
-      //      foreach (string variableName in inputVariableLiterals) {
-      //        int variableIndex = ds.Problem.Dataset.GetVariableIndex(variableName);
-      //        inputVariables.Add(variableIndex);
-      //      }
-      //      if (!AlgorithmFinishedOrDispatched(targetVariableIndex, inputVariables.ToArray(), algoName)) {
-      //        AddDispatchedRun(targetVariableIndex, inputVariables.ToArray(), algoName);
-      //      }
-      //    }
-      //  }
-      //}
+      var dispatchedAlgos = from model in Database.GetAllModels()
+                            select new { 
+                              TargetVariable = model.TargetVariable.Name, 
+                              Algorithm = model.Algorithm.Name, 
+                              Inputvariables = Database.GetInputVariableResults(model).Select(x => x.Variable.Name).Distinct() };
+      foreach (var algo in dispatchedAlgos) {
+        AddDispatchedRun(algo.TargetVariable, algo.Inputvariables, algo.Algorithm);
+      }
     }
 
@@ -180 +142 @@
     }
 
+    private void AddDispatchedRun(string targetVariable, IEnumerable<string> inputVariables, string algorithm) {
+      AddDispatchedRun(
+        Problem.Dataset.GetVariableIndex(targetVariable), 
+        inputVariables.Select(x => Problem.Dataset.GetVariableIndex(x)).ToArray(), 
+        algorithm);
+    }
+
     private void AddDispatchedRun(int targetVariable, int[] inputVariables, string algoName) {
       if (!finishedAndDispatchedRuns.ContainsKey(targetVariable)) {