Changeset 4760


Ignore:
Timestamp:
11/09/10 16:16:02 (8 years ago)
Author:
cneumuel
Message:

#1260

  • finished renaming of Hive.Experiment to Hive.ExperimentManager
  • renamed HiveClient to HiveExperimentManager
  • restructured menuitems in optimizer
Location:
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive
Files:
8 added
8 deleted
38 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs

    r4755 r4760  
    5858// [assembly: AssemblyVersion("1.0.*")]
    5959[assembly: AssemblyVersion("3.3.0.0")]
    60 [assembly: AssemblyFileVersion("3.3.0.4751")]
     60[assembly: AssemblyFileVersion("3.3.0.4755")]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4710 r4760  
    5757Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Calendar-3.3", "HeuristicLab.Calendar\3.3\HeuristicLab.Calendar-3.3.csproj", "{D17A4D6A-4CAA-4470-8A19-F42463C021FD}"
    5858EndProject
    59 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Experiment-3.3", "HeuristicLab.Hive.Experiment\3.3\HeuristicLab.Hive.Experiment-3.3.csproj", "{A84C0A25-13D0-40A6-924F-53556D9691DC}"
    60   ProjectSection(ProjectDependencies) = postProject
    61     {898B31CF-81DC-453B-AEB3-BDF83197A7EE} = {898B31CF-81DC-453B-AEB3-BDF83197A7EE}
    62   EndProjectSection
    63 EndProject
    64 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Experiment.Views-3.3", "HeuristicLab.Hive.Experiment.Views\3.3\HeuristicLab.Hive.Experiment.Views-3.3.csproj", "{4F15BEA2-F494-4584-A0E5-6BA85377B313}"
    65 EndProject
    6659Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Tracing-3.3", "HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj", "{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}"
    6760EndProject
     
    10295    VWDPort = "3220"
    10396  EndProjectSection
     97EndProject
     98Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.ExperimentManager-3.3", "HeuristicLab.Hive.ExperimentManager\3.3\HeuristicLab.Hive.ExperimentManager-3.3.csproj", "{A84C0A25-13D0-40A6-924F-53556D9691DC}"
     99EndProject
     100Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.ExperimentManager.Views-3.3", "HeuristicLab.Hive.ExperimentManager.Views\3.3\HeuristicLab.Hive.ExperimentManager.Views-3.3.csproj", "{4F15BEA2-F494-4584-A0E5-6BA85377B313}"
    104101EndProject
    105102Global
     
    269266    {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Release|x64.ActiveCfg = Release|Any CPU
    270267    {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Release|x86.ActiveCfg = Release|Any CPU
    271     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    272     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
    273     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    274     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|Mixed Platforms.Build.0 = Debug|x86
    275     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x64.ActiveCfg = Debug|x64
    276     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x64.Build.0 = Debug|x64
    277     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x86.ActiveCfg = Debug|x86
    278     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x86.Build.0 = Debug|x86
    279     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
    280     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.Build.0 = Release|Any CPU
    281     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Mixed Platforms.ActiveCfg = Release|x86
    282     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Mixed Platforms.Build.0 = Release|x86
    283     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|x64.ActiveCfg = Release|x86
    284     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|x86.ActiveCfg = Release|x86
    285     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|x86.Build.0 = Release|x86
    286     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    287     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|Any CPU.Build.0 = Debug|Any CPU
    288     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    289     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|Mixed Platforms.Build.0 = Debug|x86
    290     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x64.ActiveCfg = Debug|x64
    291     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x64.Build.0 = Debug|x64
    292     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x86.ActiveCfg = Debug|x86
    293     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x86.Build.0 = Debug|x86
    294     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.ActiveCfg = Release|Any CPU
    295     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.Build.0 = Release|Any CPU
    296     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Mixed Platforms.ActiveCfg = Release|x86
    297     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Mixed Platforms.Build.0 = Release|x86
    298     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|x64.ActiveCfg = Release|x86
    299     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|x86.ActiveCfg = Release|x86
    300     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|x86.Build.0 = Release|x86
    301268    {CDAD2510-299C-4FA2-B351-9D71A5AF20B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    302269    {CDAD2510-299C-4FA2-B351-9D71A5AF20B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    405372    {590AD383-846B-48FF-8D06-B0AA1B328102}.Release|x64.ActiveCfg = Debug|Any CPU
    406373    {590AD383-846B-48FF-8D06-B0AA1B328102}.Release|x86.ActiveCfg = Debug|Any CPU
     374    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     375    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
     376    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     377    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|Mixed Platforms.Build.0 = Debug|x64
     378    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x64.ActiveCfg = Debug|x64
     379    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x64.Build.0 = Debug|x64
     380    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x86.ActiveCfg = Debug|x86
     381    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x86.Build.0 = Debug|x86
     382    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
     383    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.Build.0 = Release|Any CPU
     384    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Mixed Platforms.ActiveCfg = Release|x64
     385    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Mixed Platforms.Build.0 = Release|x64
     386    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|x64.ActiveCfg = Release|x64
     387    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|x64.Build.0 = Release|x64
     388    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|x86.ActiveCfg = Release|x86
     389    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|x86.Build.0 = Release|x86
     390    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     391    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|Any CPU.Build.0 = Debug|Any CPU
     392    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     393    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|Mixed Platforms.Build.0 = Debug|x64
     394    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x64.ActiveCfg = Debug|x64
     395    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x64.Build.0 = Debug|x64
     396    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x86.ActiveCfg = Debug|x86
     397    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x86.Build.0 = Debug|x86
     398    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.ActiveCfg = Release|Any CPU
     399    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.Build.0 = Release|Any CPU
     400    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Mixed Platforms.ActiveCfg = Release|x64
     401    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Mixed Platforms.Build.0 = Release|x64
     402    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|x64.ActiveCfg = Release|x64
     403    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|x64.Build.0 = Release|x64
     404    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|x86.ActiveCfg = Release|x86
     405    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|x86.Build.0 = Release|x86
    407406  EndGlobalSection
    408407  GlobalSection(SolutionProperties) = preSolution
     
    418417    {21187322-52DD-4243-80A4-A85F0263E63B} = {84899895-AC52-4053-8A91-61753EF8E0A8}
    419418    {C92AAC8C-4D88-449C-ABA5-2B935D769842} = {84899895-AC52-4053-8A91-61753EF8E0A8}
     419    {CDAD2510-299C-4FA2-B351-9D71A5AF20B7} = {84899895-AC52-4053-8A91-61753EF8E0A8}
    420420    {A84C0A25-13D0-40A6-924F-53556D9691DC} = {84899895-AC52-4053-8A91-61753EF8E0A8}
    421421    {4F15BEA2-F494-4584-A0E5-6BA85377B313} = {84899895-AC52-4053-8A91-61753EF8E0A8}
    422     {CDAD2510-299C-4FA2-B351-9D71A5AF20B7} = {84899895-AC52-4053-8A91-61753EF8E0A8}
    423422    {9076697B-C151-46CD-95BC-1D059492B478} = {BD1DE6F6-A188-4D1F-9681-BA7104818370}
    424423    {D17A4D6A-4CAA-4470-8A19-F42463C021FD} = {BD1DE6F6-A188-4D1F-9681-BA7104818370}
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/ConnectionSetupView.Designer.cs

    r4755 r4760  
    1919 */
    2020#endregion
    21 namespace HeuristicLab.Hive.Experiment.Views {
     21namespace HeuristicLab.Hive.ExperimentManager.Views {
    2222  partial class ConnectionSetupView {
    2323    /// <summary>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/ConnectionSetupView.cs

    r4755 r4760  
    2323using System.Windows.Forms;
    2424
    25 namespace HeuristicLab.Hive.Experiment.Views {
     25namespace HeuristicLab.Hive.ExperimentManager.Views {
    2626  internal partial class ConnectionSetupView : Form {
    2727    public ConnectionSetupView() {
    2828      InitializeComponent();
    2929
    30       userTextBox.Text = HeuristicLab.Hive.Experiment.Properties.Settings.Default.HiveUsername;
    31       passwordTextBox.Text = HeuristicLab.Hive.Experiment.Properties.Settings.Default.HivePassword;
     30      userTextBox.Text = HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.HiveUsername;
     31      passwordTextBox.Text = HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.HivePassword;
    3232      savePasswordCheckbox.Checked = !string.IsNullOrEmpty(passwordTextBox.Text);
    3333    }
     
    3636      if (!savePasswordCheckbox.Checked) {
    3737        // make sure we don't save username or password
    38         HeuristicLab.Hive.Experiment.Properties.Settings.Default.HiveUsername = string.Empty;
    39         HeuristicLab.Hive.Experiment.Properties.Settings.Default.HivePassword = string.Empty;
     38        HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.HiveUsername = string.Empty;
     39        HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.HivePassword = string.Empty;
    4040        // save
    41         HeuristicLab.Hive.Experiment.Properties.Settings.Default.Save();
     41        HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.Save();
    4242        // set user name and password for current process
    43         HeuristicLab.Hive.Experiment.Properties.Settings.Default.HiveUsername = userTextBox.Text;
    44         HeuristicLab.Hive.Experiment.Properties.Settings.Default.HivePassword = passwordTextBox.Text;
     43        HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.HiveUsername = userTextBox.Text;
     44        HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.HivePassword = passwordTextBox.Text;
    4545      } else {
    46         HeuristicLab.Hive.Experiment.Properties.Settings.Default.HiveUsername = userTextBox.Text;
    47         HeuristicLab.Hive.Experiment.Properties.Settings.Default.HivePassword = passwordTextBox.Text;
    48         HeuristicLab.Hive.Experiment.Properties.Settings.Default.Save();
     46        HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.HiveUsername = userTextBox.Text;
     47        HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.HivePassword = passwordTextBox.Text;
     48        HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.Save();
    4949      }
    5050      Close();
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/ControlExtensions.cs

    r4424 r4760  
    2222using System;
    2323
    24 namespace HeuristicLab.Hive.Experiment.Views {
     24namespace HeuristicLab.Hive.ExperimentManager.Views {
    2525  public static class ControlExtensions {
    2626    public static void InvokeIfRequired(this System.Windows.Forms.Control c, Action<System.Windows.Forms.Control> action) {
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentListView.Designer.cs

    r4368 r4760  
    1 namespace HeuristicLab.Hive.Experiment.Views {
     1namespace HeuristicLab.Hive.ExperimentManager.Views {
    22  partial class HiveExperimentListView {
    33    /// <summary>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentListView.cs

    r4424 r4760  
    2626using HeuristicLab.MainForm;
    2727
    28 namespace HeuristicLab.Hive.Experiment.Views {
     28namespace HeuristicLab.Hive.ExperimentManager.Views {
    2929  [View("HiveExperimentList View")]
    3030  [Content(typeof(HiveExperimentList), true)]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.Designer.cs

    r4710 r4760  
    2020#endregion
    2121
    22 namespace HeuristicLab.Hive.Experiment.Views {
     22namespace HeuristicLab.Hive.ExperimentManager.Views {
    2323  partial class HiveExperimentView {
    2424    /// <summary>
     
    5353      this.viewExperimentButton = new System.Windows.Forms.Button();
    5454      this.jobsTabPage = new System.Windows.Forms.TabPage();
    55       this.hiveJobView = new HeuristicLab.Hive.Experiment.Views.HiveJobView();
     55      this.hiveJobView = new HeuristicLab.Hive.ExperimentManager.Views.HiveJobView();
    5656      this.logTabPage = new System.Windows.Forms.TabPage();
    5757      this.logView = new HeuristicLab.Core.Views.LogView();
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.cs

    r4424 r4760  
    2929using HeuristicLab.PluginInfrastructure;
    3030
    31 namespace HeuristicLab.Hive.Experiment.Views {
     31namespace HeuristicLab.Hive.ExperimentManager.Views {
    3232  /// <summary>
    3333  /// The base class for visual representations of items.
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveJobListView.Designer.cs

    r4423 r4760  
    1 namespace HeuristicLab.Hive.Experiment.Views {
     1namespace HeuristicLab.Hive.ExperimentManager.Views {
    22  partial class HiveJobListView {
    33    /// <summary>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveJobListView.cs

    r4424 r4760  
    2525using HeuristicLab.MainForm;
    2626
    27 namespace HeuristicLab.Hive.Experiment.Views {
     27namespace HeuristicLab.Hive.ExperimentManager.Views {
    2828  [View("JobItemList View")]
    2929  [Content(typeof(HiveJobList), true)]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveJobView.Designer.cs

    r4557 r4760  
    1 namespace HeuristicLab.Hive.Experiment.Views {
     1namespace HeuristicLab.Hive.ExperimentManager.Views {
    22  partial class HiveJobView {
    33    /// <summary>
     
    5353      this.jobIdTextBox = new System.Windows.Forms.TextBox();
    5454      this.childJobsTabPage = new System.Windows.Forms.TabPage();
    55       this.childHiveJobView = new HeuristicLab.Hive.Experiment.Views.HiveJobListView();
     55      this.childHiveJobView = new HeuristicLab.Hive.ExperimentManager.Views.HiveJobListView();
    5656      this.runsTabPage = new System.Windows.Forms.TabPage();
    5757      this.logTabPage = new System.Windows.Forms.TabPage();
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveJobView.cs

    r4557 r4760  
    2525using HeuristicLab.MainForm;
    2626
    27 namespace HeuristicLab.Hive.Experiment.Views {
     27namespace HeuristicLab.Hive.ExperimentManager.Views {
    2828  [View("HiveJob View")]
    2929  [Content(typeof(HiveJob), true)]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/MenuItems/ConnectionSetupMenuItem.cs

    r4424 r4760  
    2121
    2222using System.Collections.Generic;
    23 using HeuristicLab.Hive.Experiment.Views;
     23using HeuristicLab.Hive.ExperimentManager.Views;
     24using System.Windows.Forms;
     25using HeuristicLab.MainForm;
    2426
    2527namespace HeuristicLab.Optimizer.MenuItems {
    26   internal class ConnectionSetupMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     28  public class ConnectionSetupMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
    2729    public override string Name {
    28       get { return "&Connection Setup"; }
     30      get { return "Set &Username / Password..."; }
    2931    }
    3032    public override IEnumerable<string> Structure {
    31       get { return new string[] { "&Hive Infrastructure" }; }
     33      get { return new string[] { "&Services", "&Hive" }; }
    3234    }
    3335    public override System.Drawing.Image Image {
     
    3739    }
    3840    public override void Execute() {
    39       new ConnectionSetupView().Show();
     41      using (var dialog = new ConnectionSetupView()) {
     42        dialog.ShowDialog((IWin32Window)MainFormManager.MainForm);
     43      }
    4044    }
    4145    public override int Position {
    42       get { return 1600; }
     46      get { return 10000; }
    4347    }
    4448  }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/ProgressView.Designer.cs

    r4368 r4760  
    11using HeuristicLab.MainForm.WindowsForms;
    2 namespace HeuristicLab.Hive.Experiment.Views {
     2namespace HeuristicLab.Hive.ExperimentManager.Views {
    33  partial class ProgressView : View {
    44    /// <summary>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/ProgressView.cs

    r4424 r4760  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Hive.Experiment.Views {
     26namespace HeuristicLab.Hive.ExperimentManager.Views {
    2727  public partial class ProgressView : HeuristicLab.MainForm.WindowsForms.View {
    2828    private ContentView parentView;
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/Properties/Resources.Designer.cs

    r4710 r4760  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab.Hive.Experiment.Views.Properties {
     11namespace HeuristicLab.Hive.ExperimentManager.Views.Properties {
    1212    using System;
    1313   
     
    4040            get {
    4141                if (object.ReferenceEquals(resourceMan, null)) {
    42                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Hive.Experiment.Views.Properties.Resources", typeof(Resources).Assembly);
     42                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Hive.ExperimentManager.Views.Properties.Resources", typeof(Resources).Assembly);
    4343                    resourceMan = temp;
    4444                }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Exceptions/AddJobToHiveException.cs

    r4424 r4760  
    2222using System;
    2323
    24 namespace HeuristicLab.Hive.Experiment {
     24namespace HeuristicLab.Hive.ExperimentManager {
    2525  class AddJobToHiveException : Exception {
    2626    public AddJobToHiveException(string message) : base(message) { }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Exceptions/JobResultPollingException.cs

    r4424 r4760  
    2222using System;
    2323
    24 namespace HeuristicLab.Hive.Experiment {
     24namespace HeuristicLab.Hive.ExperimentManager {
    2525  class JobResultPollingException : Exception {
    2626    public JobResultPollingException(string message) : base(message) { }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Exceptions/OptimizerNotFoundException.cs

    r4750 r4760  
    2222using System;
    2323
    24 namespace HeuristicLab.Hive.Experiment {
     24namespace HeuristicLab.Hive.ExperimentManager {
    2525  class OptimizerNotFoundException : Exception {
    2626    public OptimizerNotFoundException(string message) : base(message) { }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveClient.cs

    r4755 r4760  
    3030using HeuristicLab.Common;
    3131
    32 namespace HeuristicLab.Hive.Experiment {
    33   [Item("Hive Client", "Connects to Hive and lists all submitted experiments by the current user.")]
    34   [Creatable("Hive")]
    35   public class HiveClient : Item, IProgressReporter {
     32namespace HeuristicLab.Hive.ExperimentManager {
     33  [Item("Hive Experiment Manager", "Connects to Hive and lists all submitted experiments by the current user.")]
     34  public class HiveExperimentManager : Item, IProgressReporter {
    3635    private static object locker = new object();
    3736    private bool currentlyUpdating;
     
    8382    }
    8483
    85     public HiveClient() {
     84    public HiveExperimentManager() {
    8685      this.log = new Log();
    8786    }
    88     protected HiveClient(HiveClient original, Cloner cloner)
     87    protected HiveExperimentManager(HiveExperimentManager original, Cloner cloner)
    8988      : base(original, cloner) {
    9089      this.log = cloner.Clone(original.Log);
     
    9291    }
    9392    public override IDeepCloneable Clone(Cloner cloner) {
    94       return new HiveClient(this, cloner);
     93      return new HiveExperimentManager(this, cloner);
    9594    }
    9695
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveExperiment.cs

    r4755 r4760  
    3030using HeuristicLab.Hive.Contracts.Interfaces;
    3131using HeuristicLab.Hive.Contracts.ResponseObjects;
    32 using HeuristicLab.Hive.Experiment.Jobs;
     32using HeuristicLab.Hive.ExperimentManager.Jobs;
    3333using HeuristicLab.Hive.Tracing;
    3434
    35 namespace HeuristicLab.Hive.Experiment {
     35namespace HeuristicLab.Hive.ExperimentManager {
    3636  /// <summary>
    3737  /// An experiment which contains multiple batch runs of algorithms.
     
    114114    public HiveExperiment()
    115115      : base(itemName, itemDescription) {
    116       this.ResourceIds = HeuristicLab.Hive.Experiment.Properties.Settings.Default.ResourceIds;
     116      this.ResourceIds = HeuristicLab.Hive.ExperimentManager.Properties.Settings.Default.ResourceIds;
    117117      this.log = new Log();
    118118      InitTimer();
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveExperimentList.cs

    r4755 r4760  
    2525using HeuristicLab.Common;
    2626
    27 namespace HeuristicLab.Hive.Experiment {
     27namespace HeuristicLab.Hive.ExperimentManager {
    2828  [Item("HiveExperiment List", "Represents a list of hive experiments.")]
    2929  [StorableClass]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveJob.cs

    r4755 r4760  
    2828using HeuristicLab.Core;
    2929using HeuristicLab.Hive.Contracts.BusinessObjects;
    30 using HeuristicLab.Hive.Experiment.Jobs;
     30using HeuristicLab.Hive.ExperimentManager.Jobs;
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333
    34 namespace HeuristicLab.Hive.Experiment {
     34namespace HeuristicLab.Hive.ExperimentManager {
    3535  [Item("Hive Job", "Represents a hive job.")]
    3636  [StorableClass]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveJobList.cs

    r4755 r4760  
    2525using HeuristicLab.Common;
    2626
    27 namespace HeuristicLab.Hive.Experiment {
     27namespace HeuristicLab.Hive.ExperimentManager {
    2828  [Item("Hive Job List", "Represents a list of hive jobs.")]
    2929  [StorableClass]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/JobResultPoller.cs

    r4424 r4760  
    2828using HeuristicLab.Hive.Contracts.ResponseObjects;
    2929
    30 namespace HeuristicLab.Hive.Experiment {
     30namespace HeuristicLab.Hive.ExperimentManager {
    3131  internal class JobResultPoller {
    3232    private bool stopRequested { get; set; }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Jobs/JobList.cs

    r4755 r4760  
    2626using HeuristicLab.Common;
    2727
    28 namespace HeuristicLab.Hive.Experiment.Jobs {
     28namespace HeuristicLab.Hive.ExperimentManager.Jobs {
    2929  [Item("IJob List", "Represents a list of Hive Job Objects.")]
    3030  [StorableClass]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Jobs/OptimizerJob.cs

    r4755 r4760  
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    30 namespace HeuristicLab.Hive.Experiment.Jobs {
     30namespace HeuristicLab.Hive.ExperimentManager.Jobs {
    3131  [Item("Optimizer Job", "Represents Job which executes a IOptimizer object.")]
    3232  [StorableClass]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Progress/IProgress.cs

    r4424 r4760  
    2222using System;
    2323
    24 namespace HeuristicLab.Hive.Experiment {
     24namespace HeuristicLab.Hive.ExperimentManager {
    2525  public interface IProgress {
    2626    string Status { get; set; }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Progress/IProgressReporter.cs

    r4424 r4760  
    2222using System;
    2323
    24 namespace HeuristicLab.Hive.Experiment {
     24namespace HeuristicLab.Hive.ExperimentManager {
    2525  public interface IProgressReporter {
    2626    IProgress Progress { get; }
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Progress/Progress.cs

    r4424 r4760  
    2222using System;
    2323
    24 namespace HeuristicLab.Hive.Experiment {
     24namespace HeuristicLab.Hive.ExperimentManager {
    2525  public class Progress : IProgress {
    2626    private string status;
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Properties/AssemblyInfo.frame

    r4171 r4760  
    2828// set of attributes. Change these attribute values to modify the information
    2929// associated with an assembly.
    30 [assembly: AssemblyTitle("HeuristicLab.Hive.Experiment")]
     30[assembly: AssemblyTitle("HeuristicLab.Hive.ExperimentManager")]
    3131[assembly: AssemblyDescription("HeuristicLab experiment for distributed computation")]
    3232[assembly: AssemblyConfiguration("")]
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Properties/Settings.Designer.cs

    r4755 r4760  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab.Hive.Experiment.Properties {
     11namespace HeuristicLab.Hive.ExperimentManager.Properties {
    1212   
    1313   
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/Properties/Settings.settings

    r4755 r4760  
    11<?xml version='1.0' encoding='utf-8'?>
    2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Hive.Experiment.Properties" GeneratedClassName="Settings">
     2<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Hive.ExperimentManager.Properties" GeneratedClassName="Settings">
    33  <Profiles />
    44  <Settings>
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/ServiceLocator.cs

    r4755 r4760  
    2222using HeuristicLab.Hive.Contracts;
    2323using HeuristicLab.Hive.Contracts.Interfaces;
    24 using HeuristicLab.Hive.Experiment.Properties;
     24using HeuristicLab.Hive.ExperimentManager.Properties;
    2525
    26 namespace HeuristicLab.Hive.Experiment {
     26namespace HeuristicLab.Hive.ExperimentManager {
    2727  internal class ServiceLocator {
    2828    private static ServiceLocator instance = null;
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/app.config

    r4755 r4760  
    33  <configSections>
    44    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5      <section name="HeuristicLab.Hive.ExperimentManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    56      <section name="HeuristicLab.Hive.Experiment.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    67    </sectionGroup>
    78  </configSections>
    89  <userSettings>
     10    <HeuristicLab.Hive.ExperimentManager.Properties.Settings>
     11      <setting name="ResourceIds" serializeAs="String">
     12        <value>HEAL</value>
     13      </setting>
     14      <setting name="HiveUsername" serializeAs="String">
     15        <value>cneumuel</value>
     16      </setting>
     17      <setting name="HivePassword" serializeAs="String">
     18        <value />
     19      </setting>
     20    </HeuristicLab.Hive.ExperimentManager.Properties.Settings>
    921    <HeuristicLab.Hive.Experiment.Properties.Settings>
    1022      <setting name="ResourceIds" serializeAs="String">
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt

    r4710 r4760  
    1313HeuristicLab.Hive.Slave.ExecutionEngine\3.3:HeuristicLab.Hive.Slave.ExecutionEngine-3.3.dll
    1414
    15 HeuristicLab.Hive.Experiment\3.3:HeuristicLab.Hive.Experiment-3.3.dll
    16 HeuristicLab.Hive.Experiment.Views\3.3:HeuristicLab.Hive.Experiment.Views-3.3.dll
     15HeuristicLab.Hive.ExperimentManager\3.3:HeuristicLab.Hive.ExperimentManager-3.3.dll
     16HeuristicLab.Hive.ExperimentManager.Views\3.3:HeuristicLab.Hive.ExperimentManager.Views-3.3.dll
    1717HeuristicLab.Hive.JobBase\3.3:HeuristicLab.Hive.JobBase-3.3.dll
    1818
  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd

    r4710 r4760  
    11
    22
    3 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Experiment\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
     3ConfigMerger "%SolutionDir%HeuristicLab.Hive.ExperimentManager\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    44ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server.Core\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    55ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server.Console\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
Note: See TracChangeset for help on using the changeset viewer.