Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/12/11 13:43:05 (14 years ago)
Author:
cneumuel
Message:

#1233

  • changed relationship between Job and HiveExperiment. There is no more HiveExperiment.RootJobId, instead there is Job.HiveExperimentId.
  • One HiveExperiment can now have multiple Experiments.
  • TreeView supports multiple root nodes
  • HiveEngine creates a HiveExperiment for each set of jobs, so jobs cannot be without an parent experiment anymore (no more loose jobs)
  • updated ExperimentManager binaries
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive-3.4/sources

    • Property svn:ignore

      •  

        old new  
        44PrecompiledWeb
        55CreateEventLogSources
         6WindowsFormsTestProject

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4

    • Property svn:ignore

      •  

        old new  
        22obj
        33HeuristicLab.HiveEngine-3.4.csproj.vs10x
         4HeuristicLabHiveEnginePlugin.cs

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/Views/HiveEngineView.Designer.cs

    r5958 r6006  
    3030      this.label1 = new System.Windows.Forms.Label();
    3131      this.executionTimeOnHiveTextBox = new System.Windows.Forms.TextBox();
     32      this.tabControl = new System.Windows.Forms.TabControl();
     33      this.jobsTabPage = new System.Windows.Forms.TabPage();
     34      this.hiveExperimentListView = new HeuristicLab.Clients.Hive.Views.HiveExperimentListView();
     35      this.logTabPage = new System.Windows.Forms.TabPage();
     36      this.logView = new HeuristicLab.Core.Views.LogView();
     37      this.executionTimeLabel = new System.Windows.Forms.Label();
     38      this.executionTimeTextBox = new System.Windows.Forms.TextBox();
     39      this.useLocalPluginsCheckBox = new System.Windows.Forms.CheckBox();
     40      this.tabControl.SuspendLayout();
     41      this.jobsTabPage.SuspendLayout();
     42      this.logTabPage.SuspendLayout();
    3243      this.SuspendLayout();
    33       //
    34       // executionTimeTextBox
    35       //
    36       this.executionTimeTextBox.Size = new System.Drawing.Size(623, 20);
    37       //
    38       // logView
    39       //
    40       this.logView.Location = new System.Drawing.Point(0, 78);
    41       this.logView.Size = new System.Drawing.Size(715, 469);
    4244      //
    4345      // resourceIdsLabel
    … …  
    5759      this.resourceIdsTextBox.Location = new System.Drawing.Point(189, 52);
    5860      this.resourceIdsTextBox.Name = "resourceIdsTextBox";
    59       this.resourceIdsTextBox.Size = new System.Drawing.Size(526, 20);
     61      this.resourceIdsTextBox.Size = new System.Drawing.Size(405, 20);
    6062      this.resourceIdsTextBox.TabIndex = 4;
    6163      this.resourceIdsTextBox.Text = "HEAL";
    … …  
    9799      this.executionTimeOnHiveTextBox.Name = "executionTimeOnHiveTextBox";
    98100      this.executionTimeOnHiveTextBox.ReadOnly = true;
    99       this.executionTimeOnHiveTextBox.Size = new System.Drawing.Size(586, 20);
     101      this.executionTimeOnHiveTextBox.Size = new System.Drawing.Size(577, 20);
    100102      this.executionTimeOnHiveTextBox.TabIndex = 8;
     103      //
     104      // tabControl
     105      //
     106      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     107                  | System.Windows.Forms.AnchorStyles.Left)
     108                  | System.Windows.Forms.AnchorStyles.Right)));
     109      this.tabControl.Controls.Add(this.jobsTabPage);
     110      this.tabControl.Controls.Add(this.logTabPage);
     111      this.tabControl.Location = new System.Drawing.Point(3, 78);
     112      this.tabControl.Name = "tabControl";
     113      this.tabControl.SelectedIndex = 0;
     114      this.tabControl.Size = new System.Drawing.Size(700, 460);
     115      this.tabControl.TabIndex = 9;
     116      //
     117      // jobsTabPage
     118      //
     119      this.jobsTabPage.Controls.Add(this.hiveExperimentListView);
     120      this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
     121      this.jobsTabPage.Name = "jobsTabPage";
     122      this.jobsTabPage.Padding = new System.Windows.Forms.Padding(3);
     123      this.jobsTabPage.Size = new System.Drawing.Size(692, 434);
     124      this.jobsTabPage.TabIndex = 0;
     125      this.jobsTabPage.Text = "Jobs";
     126      this.jobsTabPage.UseVisualStyleBackColor = true;
     127      //
     128      // hiveExperimentListView
     129      //
     130      this.hiveExperimentListView.Caption = "HiveExperimentList View";
     131      this.hiveExperimentListView.Content = null;
     132      this.hiveExperimentListView.Dock = System.Windows.Forms.DockStyle.Fill;
     133      this.hiveExperimentListView.Location = new System.Drawing.Point(3, 3);
     134      this.hiveExperimentListView.Name = "hiveExperimentListView";
     135      this.hiveExperimentListView.ReadOnly = false;
     136      this.hiveExperimentListView.Size = new System.Drawing.Size(686, 428);
     137      this.hiveExperimentListView.TabIndex = 0;
     138      //
     139      // logTabPage
     140      //
     141      this.logTabPage.Controls.Add(this.logView);
     142      this.logTabPage.Location = new System.Drawing.Point(4, 22);
     143      this.logTabPage.Name = "logTabPage";
     144      this.logTabPage.Padding = new System.Windows.Forms.Padding(3);
     145      this.logTabPage.Size = new System.Drawing.Size(692, 434);
     146      this.logTabPage.TabIndex = 1;
     147      this.logTabPage.Text = "Log";
     148      this.logTabPage.UseVisualStyleBackColor = true;
     149      //
     150      // logView
     151      //
     152      this.logView.Caption = "SlaveView";
     153      this.logView.Content = null;
     154      this.logView.Dock = System.Windows.Forms.DockStyle.Fill;
     155      this.logView.Location = new System.Drawing.Point(3, 3);
     156      this.logView.Name = "logView";
     157      this.logView.ReadOnly = false;
     158      this.logView.Size = new System.Drawing.Size(686, 428);
     159      this.logView.TabIndex = 0;
     160      //
     161      // executionTimeLabel
     162      //
     163      this.executionTimeLabel.AutoSize = true;
     164      this.executionTimeLabel.Location = new System.Drawing.Point(4, 6);
     165      this.executionTimeLabel.Name = "executionTimeLabel";
     166      this.executionTimeLabel.Size = new System.Drawing.Size(83, 13);
     167      this.executionTimeLabel.TabIndex = 10;
     168      this.executionTimeLabel.Text = "Execution Time:";
     169      //
     170      // executionTimeTextBox
     171      //
     172      this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     173                  | System.Windows.Forms.AnchorStyles.Left)
     174                  | System.Windows.Forms.AnchorStyles.Right)));
     175      this.executionTimeTextBox.Location = new System.Drawing.Point(129, 3);
     176      this.executionTimeTextBox.Name = "executionTimeTextBox";
     177      this.executionTimeTextBox.ReadOnly = true;
     178      this.executionTimeTextBox.Size = new System.Drawing.Size(577, 20);
     179      this.executionTimeTextBox.TabIndex = 11;
     180      //
     181      // useLocalPluginsCheckBox
     182      //
     183      this.useLocalPluginsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     184      this.useLocalPluginsCheckBox.AutoSize = true;
     185      this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(600, 55);
     186      this.useLocalPluginsCheckBox.Name = "useLocalPluginsCheckBox";
     187      this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(103, 17);
     188      this.useLocalPluginsCheckBox.TabIndex = 12;
     189      this.useLocalPluginsCheckBox.Text = "useLocalPlugins";
     190      this.useLocalPluginsCheckBox.UseVisualStyleBackColor = true;
     191      this.useLocalPluginsCheckBox.CheckedChanged += new System.EventHandler(this.useLocalPluginsCheckBox_CheckedChanged);
    101192      //
    102193      // HiveEngineView
    … …  
    104195      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    105196      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     197      this.Controls.Add(this.useLocalPluginsCheckBox);
     198      this.Controls.Add(this.executionTimeTextBox);
     199      this.Controls.Add(this.executionTimeLabel);
     200      this.Controls.Add(this.tabControl);
    106201      this.Controls.Add(this.label1);
    107202      this.Controls.Add(this.executionTimeOnHiveTextBox);
    … …  
    111206      this.Controls.Add(this.resourceIdsTextBox);
    112207      this.Name = "HiveEngineView";
    113       this.Size = new System.Drawing.Size(715, 550);
    114       this.Controls.SetChildIndex(this.resourceIdsTextBox, 0);
    115       this.Controls.SetChildIndex(this.resourceIdsLabel, 0);
    116       this.Controls.SetChildIndex(this.priorityLabel, 0);
    117       this.Controls.SetChildIndex(this.priorityTextBox, 0);
    118       this.Controls.SetChildIndex(this.logView, 0);
    119       this.Controls.SetChildIndex(this.executionTimeLabel, 0);
    120       this.Controls.SetChildIndex(this.executionTimeTextBox, 0);
    121       this.Controls.SetChildIndex(this.executionTimeOnHiveTextBox, 0);
    122       this.Controls.SetChildIndex(this.label1, 0);
     208      this.Size = new System.Drawing.Size(706, 541);
     209      this.tabControl.ResumeLayout(false);
     210      this.jobsTabPage.ResumeLayout(false);
     211      this.logTabPage.ResumeLayout(false);
    123212      this.ResumeLayout(false);
    124213      this.PerformLayout();
    … …  
    134223    private System.Windows.Forms.Label label1;
    135224    protected System.Windows.Forms.TextBox executionTimeOnHiveTextBox;
     225    private System.Windows.Forms.TabControl tabControl;
     226    private System.Windows.Forms.TabPage jobsTabPage;
     227    private System.Windows.Forms.TabPage logTabPage;
     228    private System.Windows.Forms.Label executionTimeLabel;
     229    protected System.Windows.Forms.TextBox executionTimeTextBox;
     230    private System.Windows.Forms.CheckBox useLocalPluginsCheckBox;
     231    private HeuristicLab.Core.Views.LogView logView;
     232    private Clients.Hive.Views.HiveExperimentListView hiveExperimentListView;
    136233  }
    137234}

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/Views/HiveEngineView.cs

    r5958 r6006  
    11using System;
    2 using System.Collections.Generic;
    3 using System.ComponentModel;
    4 using System.Drawing;
    5 using System.Data;
    6 using System.Linq;
    7 using System.Text;
     2using HeuristicLab.Core.Views;
    83using HeuristicLab.MainForm;
    9 using HeuristicLab.Optimization.Views;
    10 using HeuristicLab.Core.Views;
    114
    125namespace HeuristicLab.HiveEngine.Views {
    136  [View("Hive Engine View")]
    147  [Content(typeof(HiveEngine), IsDefaultView = true)]
    15   public sealed partial class HiveEngineView : EngineView {
     8  public sealed partial class HiveEngineView : ItemView {
    169    public new HiveEngine Content {
    1710      get { return (HiveEngine)base.Content; }
    … …  
    2417
    2518    protected override void DeregisterContentEvents() {
     19      Content.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
    2620      Content.ExecutionTimeOnHiveChanged -= new EventHandler(Content_ExecutionTimeOnHiveChanged);
    2721      base.DeregisterContentEvents();
    … …  
    3024    protected override void RegisterContentEvents() {
    3125      base.RegisterContentEvents();
     26      Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
    3227      Content.ExecutionTimeOnHiveChanged += new EventHandler(Content_ExecutionTimeOnHiveChanged);
    3328    }
    3429
    3530    #region Event Handlers (Content)
     31    private void Content_ExecutionStateChanged(object sender, EventArgs e) {
     32      if (InvokeRequired) {
     33        Invoke(new EventHandler(Content_ExecutionStateChanged), sender, e);
     34      } else {
     35        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
     36      }
     37    }
     38
    3639    private void Content_ExecutionTimeOnHiveChanged(object sender, EventArgs e) {
    3740      if (InvokeRequired) {
    … …  
    4952        priorityTextBox.Text = string.Empty;
    5053        executionTimeOnHiveTextBox.Text = string.Empty;
     54        useLocalPluginsCheckBox.Checked = false;
     55        hiveExperimentListView.Content = null;
     56        logView.Content = null;
    5157      } else {
    52         resourceIdsTextBox.Text = Content.ResourceIds;
     58        resourceIdsTextBox.Text = Content.ResourceNames;
    5359        priorityTextBox.Text = Content.Priority.ToString();
    5460        executionTimeOnHiveTextBox.Text = Content.ExecutionTimeOnHive.ToString();
     61        useLocalPluginsCheckBox.Checked = Content.UseLocalPlugins;
     62        hiveExperimentListView.Content = Content.HiveExperiments;
     63        logView.Content = Content.Log;
    5564      }
    5665    }
    … …  
    6271        resourceIdsTextBox.ReadOnly = this.ReadOnly;
    6372        priorityTextBox.ReadOnly = this.ReadOnly;
     73        useLocalPluginsCheckBox.Enabled = !this.ReadOnly;
    6474      } else {
    6575        resourceIdsTextBox.ReadOnly = false;
    6676        priorityTextBox.ReadOnly = false;
     77        useLocalPluginsCheckBox.Enabled = false;
    6778      }
    6879    }
    … …  
    7081    #region Event Handlers (child controls)
    7182    private void resourceIdsTextBox_TextChanged(object sender, EventArgs e) {
    72       Content.ResourceIds = resourceIdsTextBox.Text;
     83      Content.ResourceNames = resourceIdsTextBox.Text;
    7384    }
    74     #endregion
    7585
    7686    private void priorityTextBox_TextChanged(object sender, EventArgs e) {
    7787      Content.Priority = int.Parse(priorityTextBox.Text);
    7888    }
     89
     90    private void useLocalPluginsCheckBox_CheckedChanged(object sender, EventArgs e) {
     91      Content.UseLocalPlugins = useLocalPluginsCheckBox.Checked;
     92    }
     93    #endregion
     94
     95
    7996  }
    8097}
Note: See TracChangeset for help on using the changeset viewer.