Changeset 2422 for trunk/sources

Timestamp:

10/08/09 16:25:57 (15 years ago)

Author:

gkronber

Message:

Fixed bugs in CEDMA cockpit:

• Runs were started for target variables that are turned off
• Runs were started for deterministic algorithms with the same setting (when using time series settings)

#676 Cockpit for the CEDMA Server to control algorithm settings

Location:

trunk/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• DispatcherView.Designer.cs (modified) (4 diffs)
• GridExecuter.cs (modified) (1 diff)
• ProblemSpecification.cs (modified) (2 diffs)
• SimpleDispatcher.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/DispatcherView.Designer.cs

@@ -30 +30 @@
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.learningTaskGroupBox = new System.Windows.Forms.GroupBox();
+      this.setAlgorithmDefault = new System.Windows.Forms.Button();
       this.autoregressiveLabel = new System.Windows.Forms.Label();
       this.classificationRadioButton = new System.Windows.Forms.RadioButton();
@@ -51 +52 @@
       this.testLabel = new System.Windows.Forms.Label();
       this.setAllButton = new System.Windows.Forms.Button();
-      this.setAlgorithmDefault = new System.Windows.Forms.Button();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
@@ -149 +149 @@
       this.learningTaskGroupBox.Text = "Learning task";
       // 
+      // setAlgorithmDefault
+      // 
+      this.setAlgorithmDefault.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.setAlgorithmDefault.Location = new System.Drawing.Point(6, 292);
+      this.setAlgorithmDefault.Name = "setAlgorithmDefault";
+      this.setAlgorithmDefault.Size = new System.Drawing.Size(96, 23);
+      this.setAlgorithmDefault.TabIndex = 36;
+      this.setAlgorithmDefault.Text = "Use as default";
+      this.setAlgorithmDefault.UseVisualStyleBackColor = true;
+      this.setAlgorithmDefault.Click += new System.EventHandler(this.setAlgorithmDefault_Click);
+      // 
       // autoregressiveLabel
       // 
@@ -369 +380 @@
       this.setAllButton.UseVisualStyleBackColor = true;
       this.setAllButton.Click += new System.EventHandler(this.setAllButton_Click);
-      // 
-      // setAlgorithmDefault
-      // 
-      this.setAlgorithmDefault.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.setAlgorithmDefault.Location = new System.Drawing.Point(6, 292);
-      this.setAlgorithmDefault.Name = "setAlgorithmDefault";
-      this.setAlgorithmDefault.Size = new System.Drawing.Size(96, 23);
-      this.setAlgorithmDefault.TabIndex = 36;
-      this.setAlgorithmDefault.Text = "Use as default";
-      this.setAlgorithmDefault.UseVisualStyleBackColor = true;
-      this.setAlgorithmDefault.Click += new System.EventHandler(this.setAlgorithmDefault_Click);
       // 
       // DispatcherView

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

@@ -101 +101 @@
               try {
                 IEngine finishedEngine = jobManager.EndExecuteEngine(finishedResult);
-                SetResults(finishedEngine.GlobalScope, finishedAlgorithm.Engine.GlobalScope);
-                StoreResults(finishedAlgorithm);
+                 SetResults(finishedEngine.GlobalScope, finishedAlgorithm.Engine.GlobalScope);
+                 StoreResults(finishedAlgorithm);
               }
               catch (Exception badEx) {

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

@@ -108 +108 @@
       LearningTask = original.LearningTask;
       TargetVariable = original.TargetVariable;
+      MinTimeOffset = original.MinTimeOffset;
+      MaxTimeOffset = original.MaxTimeOffset;
+      AutoRegressive = original.AutoRegressive;
       TrainingSamplesStart = original.TrainingSamplesStart;
       TrainingSamplesEnd = original.TrainingSamplesEnd;
@@ -153 +156 @@
         LearningTask.GetHashCode() |
         TargetVariable.GetHashCode() |
+        MinTimeOffset.GetHashCode() |
+        MaxTimeOffset.GetHashCode() |
+        AutoRegressive.GetHashCode() |
         TrainingSamplesStart.GetHashCode() |
         TrainingSamplesEnd.GetHashCode() |

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

@@ -122 +122 @@
     public HeuristicLab.Modeling.IAlgorithm GetNextJob() {
       lock (locker) {
-        if (activeVariables.Count > 0) {
-          string[] targetVariables = activeVariables.Keys.ToArray();
+        if (activeVariables.Where(x => x.Value == true).Count() > 0) {
+          string[] targetVariables = (from pair in activeVariables
+                                      where pair.Value == true
+                                      select pair.Key).ToArray();
           string targetVariable = SelectTargetVariable(targetVariables);
           HeuristicLab.Modeling.IAlgorithm selectedAlgorithm = SelectAndConfigureAlgorithm(targetVariable);
@@ -145 +147 @@
       if (selectedAlgorithm != null) {
         // create a clone of the algorithm template before setting the parameters
-        selectedAlgorithm = (HeuristicLab.Modeling.IAlgorithm)selectedAlgorithm.Clone(); 
+        selectedAlgorithm = (HeuristicLab.Modeling.IAlgorithm)selectedAlgorithm.Clone();
         SetProblemParameters(selectedAlgorithm, problemSpecifications[targetVariable]);
         if (!(selectedAlgorithm is IStochasticAlgorithm))
@@ -188 +190 @@
         timeSeriesAlgo.MinTimeOffset = spec.MinTimeOffset;
         timeSeriesAlgo.MaxTimeOffset = spec.MaxTimeOffset;
-        timeSeriesAlgo.TrainingSamplesStart = spec.TrainingSamplesStart - spec.MinTimeOffset +1 ; // first possible index is 1 because of differential symbol
+        timeSeriesAlgo.TrainingSamplesStart = spec.TrainingSamplesStart - spec.MinTimeOffset + 1; // first possible index is 1 because of differential symbol
         if (spec.AutoRegressive) {
           allowedFeatures.Add(spec.Dataset.GetVariableIndex(spec.TargetVariable));
@@ -224 +226 @@
     public void EnableAlgorithm(string targetVariable, HeuristicLab.Modeling.IAlgorithm algo) {
       if (!algorithms.ContainsKey(targetVariable)) algorithms.Add(targetVariable, new List<HeuristicLab.Modeling.IAlgorithm>());
-      if(!algorithms[targetVariable].Contains(algo))
-      algorithms[targetVariable].Add(algo);
+      if (!algorithms[targetVariable].Contains(algo))
+        algorithms[targetVariable].Add(algo);
     }