Changeset 12930

Timestamp:

09/02/15 07:50:58 (10 years ago)

Author:

ascheibe

Message:

#2355 adapted MetaOpt branch to changes from r12926

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.Designer.cs (modified) (8 diffs)
• HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.cs (modified) (4 diffs)
• HeuristicLab.HiveEngine/3.3/HiveEngine.cs (modified) (4 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.Designer.cs

@@ -38 +38 @@
       this.executionTimeLabel = new System.Windows.Forms.Label();
       this.executionTimeTextBox = new System.Windows.Forms.TextBox();
-      this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
       this.tabControl.SuspendLayout();
       this.jobsTabPage.SuspendLayout();
@@ -55 +54 @@
       // resourceIdsTextBox
       // 
-      this.resourceIdsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.resourceIdsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.resourceIdsTextBox.Location = new System.Drawing.Point(189, 52);
       this.resourceIdsTextBox.Name = "resourceIdsTextBox";
-      this.resourceIdsTextBox.Size = new System.Drawing.Size(428, 20);
+      this.resourceIdsTextBox.Size = new System.Drawing.Size(517, 20);
       this.resourceIdsTextBox.TabIndex = 4;
       this.resourceIdsTextBox.Text = "HEAL";
@@ -94 +93 @@
       // executionTimeOnHiveTextBox
       // 
-      this.executionTimeOnHiveTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.executionTimeOnHiveTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.executionTimeOnHiveTextBox.Location = new System.Drawing.Point(129, 26);
       this.executionTimeOnHiveTextBox.Name = "executionTimeOnHiveTextBox";
@@ -105 +104 @@
       // tabControl
       // 
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.tabControl.Controls.Add(this.jobsTabPage);
       this.tabControl.Controls.Add(this.logTabPage);
@@ -135 +134 @@
       this.hiveExperimentListView.Name = "hiveExperimentListView";
       this.hiveExperimentListView.ReadOnly = false;
+      this.hiveExperimentListView.ShowDetails = true;
       this.hiveExperimentListView.Size = new System.Drawing.Size(686, 428);
       this.hiveExperimentListView.TabIndex = 0;
@@ -171 +171 @@
       // executionTimeTextBox
       // 
-      this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.executionTimeTextBox.Location = new System.Drawing.Point(129, 3);
       this.executionTimeTextBox.Name = "executionTimeTextBox";
@@ -180 +180 @@
       this.executionTimeTextBox.TabIndex = 11;
       // 
-      // isPrivilegedCheckBox
-      // 
-      this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.isPrivilegedCheckBox.AutoSize = true;
-      this.isPrivilegedCheckBox.Location = new System.Drawing.Point(623, 54);
-      this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";
-      this.isPrivilegedCheckBox.Size = new System.Drawing.Size(80, 17);
-      this.isPrivilegedCheckBox.TabIndex = 13;
-      this.isPrivilegedCheckBox.Text = "IsPrivileged";
-      this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
-      this.isPrivilegedCheckBox.Validated += new System.EventHandler(this.isPrivilegedCheckBox_Validated);
-      // 
       // HiveEngineView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.isPrivilegedCheckBox);
       this.Controls.Add(this.executionTimeTextBox);
       this.Controls.Add(this.executionTimeLabel);
@@ -231 +218 @@
     private HeuristicLab.Core.Views.LogView logView;
     private RefreshableHiveJobListView hiveExperimentListView;
-    private System.Windows.Forms.CheckBox isPrivilegedCheckBox;
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine.Views/3.3/HiveEngineView.cs

@@ -73 +73 @@
         priorityTextBox.Text = string.Empty;
         executionTimeOnHiveTextBox.Text = string.Empty;
-        isPrivilegedCheckBox.Checked = false;
         hiveExperimentListView.Content = null;
         logView.Content = null;
@@ -80 +79 @@
         priorityTextBox.Text = Content.Priority.ToString();
         executionTimeOnHiveTextBox.Text = Content.ExecutionTimeOnHive.ToString();
-        isPrivilegedCheckBox.Checked = Content.IsPrivileged;
         hiveExperimentListView.Content = Content.Jobs;
         logView.Content = Content.Log;
@@ -92 +90 @@
         resourceIdsTextBox.ReadOnly = this.ReadOnly;
         priorityTextBox.ReadOnly = this.ReadOnly;
-        isPrivilegedCheckBox.Enabled = Content.IsAllowedPrivileged;
       } else {
         resourceIdsTextBox.ReadOnly = false;
         priorityTextBox.ReadOnly = false;
-        isPrivilegedCheckBox.Enabled = false;
       }
     }
@@ -108 +104 @@
       Content.Priority = int.Parse(priorityTextBox.Text);
     }
-
-    private void isPrivilegedCheckBox_Validated(object sender, EventArgs e) {
-      Content.IsPrivileged = isPrivilegedCheckBox.Checked;
-    }
     #endregion
   }

branches/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

@@ -92 +92 @@
     }
 
-    public bool IsAllowedPrivileged { get; set; }
-
     #region constructors and cloning
     public HiveEngine() {
@@ -99 +97 @@
       this.Priority = 0;
       this.log = new ThreadSafeLog();
-      this.IsAllowedPrivileged = HiveServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
     }
 
@@ -288 +285 @@
         log.LogException(e);
         throw e;
-      } finally {
+      }
+      finally {
         DisposeJob(refreshableJob);
       }
@@ -299 +297 @@
         hiveExperiment.DateCreated = DateTime.Now;
         hiveExperiment.ResourceNames = this.ResourceNames;
-        hiveExperiment.IsPrivileged = this.IsPrivileged;
         var refreshableHiveExperiment = new RefreshableJob(hiveExperiment);
         refreshableHiveExperiment.IsDownloadable = false; // download happens automatically so disable button