Changeset 7742

Timestamp:

04/19/12 20:39:44 (13 years ago)

Author:

ascheibe

Message:

#1174 worked on experiment upload view

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3

Files:

• HeuristicLab.Clients.OKB-3.3.csproj (modified) (1 diff)
• RunCreation/CreateFromExperimentMenuItem.cs (modified) (1 diff)
• RunCreation/Views/OKBExperimentUploadView.Designer.cs (modified) (3 diffs)
• RunCreation/Views/OKBExperimentUploadView.cs (modified) (6 diffs)
• RunCreation/Views/OKBRunConfigSelectionView.Designer.cs (deleted)
• RunCreation/Views/OKBRunConfigSelectionView.cs (deleted)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

@@ -360 +360 @@
       <DependentUpon>OKBProblemView.cs</DependentUpon>
     </Compile>
-    <Compile Include="RunCreation\Views\OKBRunConfigSelectionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RunCreation\Views\OKBRunConfigSelectionView.Designer.cs">
-      <DependentUpon>OKBRunConfigSelectionView.cs</DependentUpon>
-    </Compile>
     <Compile Include="RunCreation\Views\OKBRunView.cs">
       <SubType>UserControl</SubType>

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/CreateFromExperimentMenuItem.cs

@@ -40 +40 @@
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
       IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
-      ToolStripItem.Enabled = (activeView != null) && (activeView.Content != null) && (activeView.Content is Experiment) && !activeView.Locked && OKBRoles.CheckUserPermissions();
+      ToolStripItem.Enabled = (activeView != null) && (activeView.Content != null) && ((activeView.Content is Experiment) || (activeView.Content is RunCollection) || (activeView.Content is IOptimizer)) && !activeView.Locked && OKBRoles.CheckUserPermissions();
     }
 
     public override void Execute() {
       IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
-      Experiment experiment = activeView.Content as Experiment;
-      if (experiment != null) {
-        MainFormManager.MainForm.ShowContent(experiment, typeof(OKBExperimentUploadView));
-      }
+      MainFormManager.MainForm.ShowContent(activeView.Content, typeof(OKBExperimentUploadView));
     }
   }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/Views/OKBExperimentUploadView.Designer.cs

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
+      this.components = new System.ComponentModel.Container();
       this.btnUpload = new System.Windows.Forms.Button();
+      this.dataGridView = new System.Windows.Forms.DataGridView();
+      this.RunNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.AlgorithmNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.AlgorithmTypeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.OKBAlgorithmColumn = new System.Windows.Forms.DataGridViewComboBoxColumn();
+      this.ProblemNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.ProblemTypeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.OKBProblemColumn = new System.Windows.Forms.DataGridViewComboBoxColumn();
+      this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+      this.setColumnToThisValueToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+      this.contextMenu.SuspendLayout();
       this.SuspendLayout();
-      // 
-      // tableLayoutPanel
-      // 
-      this.tableLayoutPanel.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.tableLayoutPanel.AutoScroll = true;
-      this.tableLayoutPanel.BackColor = System.Drawing.SystemColors.Control;
-      this.tableLayoutPanel.ColumnCount = 1;
-      this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-      this.tableLayoutPanel.Location = new System.Drawing.Point(3, 3);
-      this.tableLayoutPanel.Name = "tableLayoutPanel";
-      this.tableLayoutPanel.RowCount = 1;
-      this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
-      this.tableLayoutPanel.Size = new System.Drawing.Size(460, 190);
-      this.tableLayoutPanel.TabIndex = 0;
       // 
       // btnUpload
@@ -55 +51 @@
       this.btnUpload.Click += new System.EventHandler(this.btnUpload_Click);
       // 
+      // dataGridView
+      // 
+      this.dataGridView.AllowUserToAddRows = false;
+      this.dataGridView.AllowUserToDeleteRows = false;
+      this.dataGridView.AllowUserToOrderColumns = true;
+      this.dataGridView.AllowUserToResizeRows = false;
+      this.dataGridView.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.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+      this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+      this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.RunNameColumn,
+            this.AlgorithmNameColumn,
+            this.AlgorithmTypeColumn,
+            this.OKBAlgorithmColumn,
+            this.ProblemNameColumn,
+            this.ProblemTypeColumn,
+            this.OKBProblemColumn});
+      this.dataGridView.Location = new System.Drawing.Point(3, 3);
+      this.dataGridView.Name = "dataGridView";
+      this.dataGridView.Size = new System.Drawing.Size(460, 191);
+      this.dataGridView.TabIndex = 2;
+      this.dataGridView.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView_CellMouseClick);
+      // 
+      // RunNameColumn
+      // 
+      this.RunNameColumn.HeaderText = "Run Name";
+      this.RunNameColumn.Name = "RunNameColumn";
+      this.RunNameColumn.ReadOnly = true;
+      // 
+      // AlgorithmNameColumn
+      // 
+      this.AlgorithmNameColumn.HeaderText = "Algorithm Name";
+      this.AlgorithmNameColumn.Name = "AlgorithmNameColumn";
+      this.AlgorithmNameColumn.ReadOnly = true;
+      // 
+      // AlgorithmTypeColumn
+      // 
+      this.AlgorithmTypeColumn.HeaderText = "Algorithm Type";
+      this.AlgorithmTypeColumn.Name = "AlgorithmTypeColumn";
+      this.AlgorithmTypeColumn.ReadOnly = true;
+      // 
+      // OKBAlgorithmColumn
+      // 
+      this.OKBAlgorithmColumn.HeaderText = "OKB Algorithm";
+      this.OKBAlgorithmColumn.Name = "OKBAlgorithmColumn";
+      // 
+      // ProblemNameColumn
+      // 
+      this.ProblemNameColumn.HeaderText = "Problem Name";
+      this.ProblemNameColumn.Name = "ProblemNameColumn";
+      this.ProblemNameColumn.ReadOnly = true;
+      this.ProblemNameColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+      this.ProblemNameColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+      // 
+      // ProblemTypeColumn
+      // 
+      this.ProblemTypeColumn.HeaderText = "Problem Type";
+      this.ProblemTypeColumn.Name = "ProblemTypeColumn";
+      this.ProblemTypeColumn.ReadOnly = true;
+      this.ProblemTypeColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+      this.ProblemTypeColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+      // 
+      // OKBProblemColumn
+      // 
+      this.OKBProblemColumn.HeaderText = "OKB Problem";
+      this.OKBProblemColumn.Name = "OKBProblemColumn";
+      // 
+      // contextMenu
+      // 
+      this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.setColumnToThisValueToolStripMenuItem});
+      this.contextMenu.Name = "contextMenu";
+      this.contextMenu.Size = new System.Drawing.Size(202, 26);
+      // 
+      // setColumnToThisValueToolStripMenuItem
+      // 
+      this.setColumnToThisValueToolStripMenuItem.Name = "setColumnToThisValueToolStripMenuItem";
+      this.setColumnToThisValueToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
+      this.setColumnToThisValueToolStripMenuItem.Text = "Set column to this value";
+      this.setColumnToThisValueToolStripMenuItem.Click += new System.EventHandler(this.setColumnToThisValueToolStripMenuItem_Click);
+      // 
       // OKBExperimentUploadView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.dataGridView);
       this.Controls.Add(this.btnUpload);
-      this.Controls.Add(this.tableLayoutPanel);
       this.Name = "OKBExperimentUploadView";
       this.Size = new System.Drawing.Size(466, 229);
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+      this.contextMenu.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -69 +150 @@
     #endregion
 
-    private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
     private System.Windows.Forms.Button btnUpload;
+    private System.Windows.Forms.DataGridView dataGridView;
+    private System.Windows.Forms.DataGridViewTextBoxColumn RunNameColumn;
+    private System.Windows.Forms.DataGridViewTextBoxColumn AlgorithmNameColumn;
+    private System.Windows.Forms.DataGridViewTextBoxColumn AlgorithmTypeColumn;
+    private System.Windows.Forms.DataGridViewComboBoxColumn OKBAlgorithmColumn;
+    private System.Windows.Forms.DataGridViewTextBoxColumn ProblemNameColumn;
+    private System.Windows.Forms.DataGridViewTextBoxColumn ProblemTypeColumn;
+    private System.Windows.Forms.DataGridViewComboBoxColumn OKBProblemColumn;
+    private System.Windows.Forms.ContextMenuStrip contextMenu;
+    private System.Windows.Forms.ToolStripMenuItem setColumnToThisValueToolStripMenuItem;
   }
 }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/Views/OKBExperimentUploadView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.Clients.Access;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -34 +36 @@
   [View("OKBExperimentUpload View")]
   [Content(typeof(Experiment), false)]
+  [Content(typeof(RunCollection), false)]
+  [Content(typeof(IOptimizer), false)]
   public partial class OKBExperimentUploadView : ItemView {
-    public new Experiment Content {
-      get { return (Experiment)base.Content; }
-      set { base.Content = value; }
-    }
-
-    private ProgressView progressView;
-    List<OKBRunConfigSelectionView> runConfigViews = new List<OKBRunConfigSelectionView>();
+    public new IItem Content {
+      get { return base.Content; }
+      set {
+        base.Content = value;
+      }
+    }
+
+    private const string algorithmTypeParameterName = "Algorithm Type";
+    private const string problemTypeParameterName = "Problem Type";
+    private const string algorithmNameParameterName = "Algorithm Name";
+    private const string problemNameParameterName = "Problem Name";
+    private const int algorithmColumnIndex = 3;
+    private const int problemColumnIndex = 6;
+
+    private List<IRun> runs = new List<IRun>();
     private List<Problem> problems = new List<Problem>();
     private List<Algorithm> algorithms = new List<Algorithm>();
+    Algorithm selectedAlgorithm = null;
+    Problem selectedProblem = null;
+    private ProgressView progressView;
 
     public OKBExperimentUploadView() {
       InitializeComponent();
-      tableLayoutPanel.RowCount = 0;
     }
 
@@ -55 +69 @@
         ClearRuns();
       } else {
+        if (Content is Experiment) {
+          runs.AddRange((Content as Experiment).Runs);
+        } else if (Content is RunCollection) {
+          runs.AddRange((Content as RunCollection));
+        } else if (Content is IOptimizer) {
+          runs.AddRange((Content as IOptimizer).Runs);
+        }
+
         DisplayRuns();
       }
@@ -84 +106 @@
 
     private void CreateUI() {
-      problems.AddRange(RunCreationClient.Instance.Problems);
-      algorithms.AddRange(RunCreationClient.Instance.Algorithms);
-
-      foreach (var run in Content.Runs) {
-        OKBRunConfigSelectionView orcsv = new OKBRunConfigSelectionView(run, algorithms, problems);
-        orcsv.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
-        runConfigViews.Add(orcsv);
-        tableLayoutPanel.Controls.Add(orcsv);
+      if (problems.Count == 0)
+        problems.AddRange(RunCreationClient.Instance.Problems);
+      if (algorithms.Count == 0)
+        algorithms.AddRange(RunCreationClient.Instance.Algorithms);
+
+      IItem algorithmType;
+      IItem problemType;
+      IItem algorithmName;
+      IItem problemName;
+
+      DataGridViewComboBoxColumn cmbAlgorithm = dataGridView.Columns[algorithmColumnIndex] as DataGridViewComboBoxColumn;
+      cmbAlgorithm.DataSource = algorithms;
+      cmbAlgorithm.DisplayMember = "Name";
+
+      DataGridViewComboBoxColumn cmbProblem = dataGridView.Columns[problemColumnIndex] as DataGridViewComboBoxColumn;
+      cmbProblem.DataSource = problems;
+      cmbProblem.DisplayMember = "Name";
+
+      foreach (IRun run in runs) {
+        int idx = dataGridView.Rows.Add(run.Name);
+        DataGridViewRow curRow = dataGridView.Rows[idx];
+        curRow.Tag = run;
+
+        if (run.Parameters.TryGetValue(algorithmTypeParameterName, out algorithmType)) {
+          HeuristicLab.Data.StringValue algStr = algorithmType as HeuristicLab.Data.StringValue;
+          if (algStr != null) {
+            curRow.Cells[1].Value = algStr;
+          }
+        }
+
+        if (run.Parameters.TryGetValue(algorithmNameParameterName, out algorithmName)) {
+          HeuristicLab.Data.StringValue algStr = algorithmName as HeuristicLab.Data.StringValue;
+          if (algStr != null) {
+            curRow.Cells[2].Value = algStr;
+          }
+        }
+
+        if (run.Parameters.TryGetValue(problemTypeParameterName, out problemType)) {
+          HeuristicLab.Data.StringValue prbStr = problemType as HeuristicLab.Data.StringValue;
+          if (prbStr != null) {
+            curRow.Cells[4].Value = prbStr;
+          }
+        }
+
+        if (run.Parameters.TryGetValue(problemNameParameterName, out problemName)) {
+          HeuristicLab.Data.StringValue prbStr = problemName as HeuristicLab.Data.StringValue;
+          if (prbStr != null) {
+            curRow.Cells[5].Value = prbStr;
+          }
+        }
       }
     }
 
     private void ClearRuns() {
-      foreach (var runConfigView in runConfigViews) {
-        runConfigView.Hide();
-        tableLayoutPanel.Controls.Remove(runConfigView);
-        runConfigView.Dispose();
-      }
-      runConfigViews.Clear();
+      dataGridView.Rows.Clear();
+      runs.Clear();
     }
 
@@ -137 +197 @@
       prog.Status = "Uploading runs to OKB...";
       prog.ProgressValue = 0;
-      double count = runConfigViews.Count(x => x.UploadToOKB());
+      double count = dataGridView.Rows.Count;
       int i = 0;
 
       SetProgressView(prog);
-      foreach (var runConfigView in runConfigViews) {
-        if (runConfigView.UploadToOKB()) {
-          OKBRun run = new OKBRun(runConfigView.GetSelectedAlgorithm().Id, runConfigView.GetSelectedProblem().Id, runConfigView.ExperimentRun, UserInformation.Instance.User.Id);
-          run.Store();
-          i++;
-          prog.ProgressValue = ((double)i) / count;
-        }
+      foreach (DataGridViewRow row in dataGridView.Rows) {
+        selectedAlgorithm = algorithms.Where(x => x.Name == row.Cells[algorithmColumnIndex].Value.ToString()).FirstOrDefault();
+        selectedProblem = problems.Where(x => x.Name == row.Cells[problemColumnIndex].Value.ToString()).FirstOrDefault();
+        if (selectedAlgorithm == null || selectedProblem == null) {
+          throw new ArgumentException("Can't retrieve the algorithm/problem to upload");
+        }
+
+        OKBRun run = new OKBRun(selectedAlgorithm.Id, selectedProblem.Id, row.Tag as IRun, UserInformation.Instance.User.Id);
+        run.Store();
+        i++;
+        prog.ProgressValue = ((double)i) / count;
       }
       FinishProgressView();
@@ -175 +239 @@
       }
     }
+
+    private void dataGridView_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) {
+      if (e.Button == System.Windows.Forms.MouseButtons.Right && dataGridView[e.ColumnIndex, e.RowIndex].Value != null) {
+        string curVal = dataGridView[e.ColumnIndex, e.RowIndex].Value.ToString();
+        selectedAlgorithm = algorithms.Where(x => x.Name == curVal).FirstOrDefault();
+        selectedProblem = problems.Where(x => x.Name == curVal).FirstOrDefault();
+
+        if (selectedAlgorithm != null || selectedProblem != null) {
+          Point pos = this.PointToClient(Cursor.Position);
+          contextMenu.Show(this, pos);
+        }
+      }
+    }
+
+    private void setColumnToThisValueToolStripMenuItem_Click(object sender, EventArgs e) {
+      if (selectedAlgorithm != null) {
+        for (int i = 0; i < dataGridView.Rows.Count; i++) {
+          var row = dataGridView.Rows[i];
+          row.Cells[algorithmColumnIndex].Value = selectedAlgorithm.Name;
+        }
+      } else if (selectedProblem != null) {
+        for (int i = 0; i < dataGridView.Rows.Count; i++) {
+          var row = dataGridView.Rows[i];
+          row.Cells[problemColumnIndex].Value = selectedProblem.Name;
+        }
+      }
+      selectedAlgorithm = null;
+      selectedProblem = null;
+    }
   }
 }