Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/17/10 10:26:55 (14 years ago)
Author:
cneumuel
Message:
  • Refactored HL.Hive.Experiment. JobItems are not called HiveJobs and OptimizerJobs do not contain a hierarchy anymore.
  • Dynamic generation of jobs on a slave are not reflected on the client user interface.
  • Optimizer-Trees are now strictly synchronized with the HiveJob-Trees (also the ComputeInParallel property is taken into account when the Child HiveJobs are created)
  • Improved the way a class can report progress and lock the UI (IProgressReporter, IProgress, Progress, ProgressView)
  • Changes were made to the config-files, so that server and clients work with blade12.hpc.fh-hagenberg.at
  • Lots of small changes and bugfixes
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.Designer.cs

    r4368 r4423  
    5252      this.experimentNamedItemView = new HeuristicLab.Core.Views.NamedItemView();
    5353      this.viewExperimentButton = new System.Windows.Forms.Button();
    54       this.configurationTabPage = new System.Windows.Forms.TabPage();
    55       this.updateJobConfigTreeButton = new System.Windows.Forms.Button();
    5654      this.jobsTabPage = new System.Windows.Forms.TabPage();
    57       this.runsTabPage = new System.Windows.Forms.TabPage();
    58       this.runCollectionView = new HeuristicLab.Optimization.Views.RunCollectionView();
     55      this.hiveJobView = new HeuristicLab.Hive.Experiment.Views.HiveJobView();
    5956      this.logTabPage = new System.Windows.Forms.TabPage();
    6057      this.logView = new HeuristicLab.Core.Views.LogView();
     58      this.downloadExperimentButton = new System.Windows.Forms.Button();
    6159      this.startButton = new System.Windows.Forms.Button();
    6260      this.stopButton = new System.Windows.Forms.Button();
    … …  
    6967      this.disconnectButton = new System.Windows.Forms.Button();
    7068      this.reconnectButton = new System.Windows.Forms.Button();
    71       this.downloadExperimentButton = new System.Windows.Forms.Button();
    72       this.jobConfigView = new HeuristicLab.Hive.Experiment.Views.JobConfigView();
    73       this.jobItemView = new HeuristicLab.Hive.Experiment.Views.JobItemView();
     69      this.downloadExperimentPanel = new System.Windows.Forms.Panel();
    7470      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    7571      this.tabControl.SuspendLayout();
    7672      this.experimentTabPage.SuspendLayout();
    77       this.configurationTabPage.SuspendLayout();
    7873      this.jobsTabPage.SuspendLayout();
    79       this.runsTabPage.SuspendLayout();
    8074      this.logTabPage.SuspendLayout();
     75      this.downloadExperimentPanel.SuspendLayout();
    8176      this.SuspendLayout();
    8277      //
    … …  
    9792                  | System.Windows.Forms.AnchorStyles.Right)));
    9893      this.tabControl.Controls.Add(this.experimentTabPage);
    99       this.tabControl.Controls.Add(this.configurationTabPage);
    10094      this.tabControl.Controls.Add(this.jobsTabPage);
    101       this.tabControl.Controls.Add(this.runsTabPage);
    10295      this.tabControl.Controls.Add(this.logTabPage);
    10396      this.tabControl.Location = new System.Drawing.Point(0, 78);
    … …  
    109102      // experimentTabPage
    110103      //
    111       this.experimentTabPage.Controls.Add(this.downloadExperimentButton);
    112104      this.experimentTabPage.Controls.Add(this.openExperimentButton);
    113105      this.experimentTabPage.Controls.Add(this.newExperimentButton);
    … …  
    168160      this.viewExperimentButton.Click += new System.EventHandler(this.showExperimentButton_Click);
    169161      //
    170       // configurationTabPage
    171       //
    172       this.configurationTabPage.Controls.Add(this.jobConfigView);
    173       this.configurationTabPage.Controls.Add(this.updateJobConfigTreeButton);
    174       this.configurationTabPage.Location = new System.Drawing.Point(4, 22);
    175       this.configurationTabPage.Name = "configurationTabPage";
    176       this.configurationTabPage.Padding = new System.Windows.Forms.Padding(3);
    177       this.configurationTabPage.Size = new System.Drawing.Size(727, 390);
    178       this.configurationTabPage.TabIndex = 2;
    179       this.configurationTabPage.Text = "Configuration";
    180       this.configurationTabPage.UseVisualStyleBackColor = true;
    181       //
    182       // updateJobConfigTreeButton
    183       //
    184       this.updateJobConfigTreeButton.Location = new System.Drawing.Point(6, 6);
    185       this.updateJobConfigTreeButton.Name = "updateJobConfigTreeButton";
    186       this.updateJobConfigTreeButton.Size = new System.Drawing.Size(199, 23);
    187       this.updateJobConfigTreeButton.TabIndex = 1;
    188       this.updateJobConfigTreeButton.Text = "Update Config Tree from Experiment";
    189       this.updateJobConfigTreeButton.UseVisualStyleBackColor = true;
    190       this.updateJobConfigTreeButton.Click += new System.EventHandler(this.updateJobConfigTreeButton_Click);
    191       //
    192162      // jobsTabPage
    193163      //
    194       this.jobsTabPage.Controls.Add(this.jobItemView);
     164      this.jobsTabPage.Controls.Add(this.hiveJobView);
    195165      this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
    196166      this.jobsTabPage.Name = "jobsTabPage";
    … …  
    200170      this.jobsTabPage.UseVisualStyleBackColor = true;
    201171      //
    202       // runsTabPage
    203       //
    204       this.runsTabPage.Controls.Add(this.runCollectionView);
    205       this.runsTabPage.Location = new System.Drawing.Point(4, 22);
    206       this.runsTabPage.Name = "runsTabPage";
    207       this.runsTabPage.Size = new System.Drawing.Size(727, 390);
    208       this.runsTabPage.TabIndex = 4;
    209       this.runsTabPage.Text = "Runs";
    210       this.runsTabPage.UseVisualStyleBackColor = true;
    211       //
    212       // runCollectionView
    213       //
    214       this.runCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     172      // hiveJobView
     173      //
     174      this.hiveJobView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    215175                  | System.Windows.Forms.AnchorStyles.Left)
    216176                  | System.Windows.Forms.AnchorStyles.Right)));
    217       this.runCollectionView.Caption = "RunCollection View";
    218       this.runCollectionView.Content = null;
    219       this.runCollectionView.Location = new System.Drawing.Point(0, 3);
    220       this.runCollectionView.Name = "runCollectionView";
    221       this.runCollectionView.ReadOnly = false;
    222       this.runCollectionView.Size = new System.Drawing.Size(727, 366);
    223       this.runCollectionView.TabIndex = 0;
     177      this.hiveJobView.Caption = "HiveJob View";
     178      this.hiveJobView.Content = null;
     179      this.hiveJobView.Location = new System.Drawing.Point(2, 3);
     180      this.hiveJobView.Name = "hiveJobView";
     181      this.hiveJobView.ReadOnly = true;
     182      this.hiveJobView.Size = new System.Drawing.Size(722, 384);
     183      this.hiveJobView.TabIndex = 0;
    224184      //
    225185      // logTabPage
    … …  
    245205      this.logView.Size = new System.Drawing.Size(721, 362);
    246206      this.logView.TabIndex = 0;
     207      //
     208      // downloadExperimentButton
     209      //
     210      this.downloadExperimentButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     211                  | System.Windows.Forms.AnchorStyles.Right)));
     212      this.downloadExperimentButton.Image = ((System.Drawing.Image)(resources.GetObject("downloadExperimentButton.Image")));
     213      this.downloadExperimentButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
     214      this.downloadExperimentButton.Location = new System.Drawing.Point(44, 22);
     215      this.downloadExperimentButton.Name = "downloadExperimentButton";
     216      this.downloadExperimentButton.Size = new System.Drawing.Size(164, 54);
     217      this.downloadExperimentButton.TabIndex = 17;
     218      this.downloadExperimentButton.Text = "Download Experiment";
     219      this.toolTip.SetToolTip(this.downloadExperimentButton, "Reconnect to Hive");
     220      this.downloadExperimentButton.UseVisualStyleBackColor = true;
     221      this.downloadExperimentButton.Click += new System.EventHandler(this.downloadExperimentButton_Click);
    247222      //
    248223      // startButton
    … …  
    360335      this.reconnectButton.Click += new System.EventHandler(this.reconnectButton_Click);
    361336      //
    362       // downloadExperimentButton
    363       //
    364       this.downloadExperimentButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    365                   | System.Windows.Forms.AnchorStyles.Right)));
    366       this.downloadExperimentButton.Enabled = false;
    367       this.downloadExperimentButton.Location = new System.Drawing.Point(2, 123);
    368       this.downloadExperimentButton.Name = "downloadExperimentButton";
    369       this.downloadExperimentButton.Size = new System.Drawing.Size(725, 24);
    370       this.downloadExperimentButton.TabIndex = 17;
    371       this.downloadExperimentButton.Text = "Download Experiment";
    372       this.toolTip.SetToolTip(this.downloadExperimentButton, "Reconnect to Hive");
    373       this.downloadExperimentButton.UseVisualStyleBackColor = true;
    374       this.downloadExperimentButton.Click += new System.EventHandler(this.downloadExperimentButton_Click);
    375       //
    376       // jobConfigView
    377       //
    378       this.jobConfigView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    379                   | System.Windows.Forms.AnchorStyles.Left)
    380                   | System.Windows.Forms.AnchorStyles.Right)));
    381       this.jobConfigView.Caption = "JobConfigView";
    382       this.jobConfigView.Content = null;
    383       this.jobConfigView.Location = new System.Drawing.Point(3, 35);
    384       this.jobConfigView.Name = "jobConfigView";
    385       this.jobConfigView.ReadOnly = false;
    386       this.jobConfigView.Size = new System.Drawing.Size(721, 352);
    387       this.jobConfigView.TabIndex = 2;
    388       //
    389       // jobItemView
    390       //
    391       this.jobItemView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    392                   | System.Windows.Forms.AnchorStyles.Left)
    393                   | System.Windows.Forms.AnchorStyles.Right)));
    394       this.jobItemView.Caption = "JobItem View";
    395       this.jobItemView.Content = null;
    396       this.jobItemView.Location = new System.Drawing.Point(2, 3);
    397       this.jobItemView.Name = "jobItemView";
    398       this.jobItemView.ReadOnly = true;
    399       this.jobItemView.Size = new System.Drawing.Size(722, 384);
    400       this.jobItemView.TabIndex = 0;
     337      // downloadExperimentPanel
     338      //
     339      this.downloadExperimentPanel.Controls.Add(this.downloadExperimentButton);
     340      this.downloadExperimentPanel.Location = new System.Drawing.Point(331, 3);
     341      this.downloadExperimentPanel.Name = "downloadExperimentPanel";
     342      this.downloadExperimentPanel.Size = new System.Drawing.Size(250, 80);
     343      this.downloadExperimentPanel.TabIndex = 18;
    401344      //
    402345      // HiveExperimentView
    … …  
    404347      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    405348      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     349      this.Controls.Add(this.downloadExperimentPanel);
    406350      this.Controls.Add(this.tabControl);
    407351      this.Controls.Add(this.disconnectButton);
    … …  
    432376      this.Controls.SetChildIndex(this.nameTextBox, 0);
    433377      this.Controls.SetChildIndex(this.descriptionTextBox, 0);
     378      this.Controls.SetChildIndex(this.downloadExperimentPanel, 0);
    434379      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    435380      this.tabControl.ResumeLayout(false);
    436381      this.experimentTabPage.ResumeLayout(false);
    437       this.configurationTabPage.ResumeLayout(false);
    438382      this.jobsTabPage.ResumeLayout(false);
    439       this.runsTabPage.ResumeLayout(false);
    440383      this.logTabPage.ResumeLayout(false);
     384      this.downloadExperimentPanel.ResumeLayout(false);
    441385      this.ResumeLayout(false);
    442386      this.PerformLayout();
    … …  
    453397    private System.Windows.Forms.TextBox executionTimeTextBox;
    454398    private System.Windows.Forms.Button pauseButton;
    455     private System.Windows.Forms.TabPage configurationTabPage;
    456399    private System.Windows.Forms.Label resourceIdsLabel;
    457400    private System.Windows.Forms.TextBox resourceIdsTextBox;
    … …  
    464407    protected System.Windows.Forms.Button openExperimentButton;
    465408    protected System.Windows.Forms.Button newExperimentButton;
    466     private System.Windows.Forms.TabPage runsTabPage;
    467     private Optimization.Views.RunCollectionView runCollectionView;
    468     private System.Windows.Forms.Button updateJobConfigTreeButton;
    469409    private System.Windows.Forms.TabPage jobsTabPage;
    470     private JobItemView jobItemView;
    471     private JobConfigView jobConfigView;
    472410    private System.Windows.Forms.Button downloadExperimentButton;
     411    private System.Windows.Forms.Panel downloadExperimentPanel;
     412    private HiveJobView hiveJobView;
    473413
    474414  }
Note: See TracChangeset for help on using the changeset viewer.