Changeset 4120 for branches/3.3-HiveMigration

Timestamp:

07/29/10 16:58:35 (14 years ago)

Author:

cneumuel

Message:

further improvement and stabilisation of HiveExperiment (#1115)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive

Files:

• HeuristicLab.Hive 3.3.sln (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive.Experiment.Views/3.3 (modified) (1 prop)
• HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLab.Hive.Experiment.Views-3.3.csproj (modified) (6 diffs)
• HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.Designer.cs (modified) (7 diffs)
• HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.cs (modified) (3 diffs)
• HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.resx (modified) (4 diffs)
• HeuristicLab.Hive.Experiment.Views/3.3/JobItemListView.Designer.cs (added)
• HeuristicLab.Hive.Experiment.Views/3.3/JobItemListView.cs (added)
• HeuristicLab.Hive.Experiment.Views/3.3/JobItemView.Designer.cs (added)
• HeuristicLab.Hive.Experiment.Views/3.3/JobItemView.cs (added)
• HeuristicLab.Hive.Experiment.Views/3.3/JobItemView.resx (added)
• HeuristicLab.Hive.Experiment.Views/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive.Experiment/3.3 (modified) (1 prop)
• HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj (modified) (1 diff)
• HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj.user (deleted)
• HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs (modified) (21 diffs)
• HeuristicLab.Hive.Experiment/3.3/JobItem.cs (added)
• HeuristicLab.Hive.Experiment/3.3/JobItemList.cs (added)
• HeuristicLab.Hive.Experiment/3.3/OptimizerJob.cs (modified) (1 diff)
• HeuristicLab.Hive.Experiment/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive.Experiment/3.3/ServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/JobManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.3/ContextFactory.cs (modified) (4 diffs)
• HeuristicLab.Hive/3.3 (modified) (1 prop)
• HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj (modified) (1 diff)
• HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj.user (deleted)
• HeuristicLab.Hive/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

@@ -154 +154 @@
     {C92AAC8C-4D88-449C-ABA5-2B935D769842}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     {C92AAC8C-4D88-449C-ABA5-2B935D769842}.Debug|x64.ActiveCfg = Debug|Any CPU
-    {C92AAC8C-4D88-449C-ABA5-2B935D769842}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {C92AAC8C-4D88-449C-ABA5-2B935D769842}.Debug|x86.ActiveCfg = Debug|x86
+    {C92AAC8C-4D88-449C-ABA5-2B935D769842}.Debug|x86.Build.0 = Debug|x86
     {C92AAC8C-4D88-449C-ABA5-2B935D769842}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {C92AAC8C-4D88-449C-ABA5-2B935D769842}.Release|Any CPU.Build.0 = Release|Any CPU

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs

@@ -57 +57 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4116")]
-[assembly: AssemblyFileVersion("3.3.0.4116")]
-[assembly: AssemblyBuildDate("2010/07/28 17:42:03")]
+[assembly: AssemblyVersion("3.3.0.4119")]
+[assembly: AssemblyFileVersion("3.3.0.4119")]
+[assembly: AssemblyBuildDate("2010/07/29 16:49:03")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Experiment.Views-3.3.csproj.user

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Experiment.Views-3.3.csproj.user

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLab.Hive.Experiment.Views-3.3.csproj

@@ -73 +73 @@
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Hive.Experiment.Views-3.3, Version=3.3.0.4111, Culture=neutral, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.4091, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Hive.Experiment.Views-3.3, Version=3.3.0.4119, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Hive.Server.Console-3.3">
       <HintPath>..\..\HeuristicLab.Hive.Server.Console\3.3\obj\Debug\HeuristicLab.Hive.Server.Console-3.3.dll</HintPath>
@@ -92 +93 @@
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
@@ -101 +103 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -113 +114 @@
       <DependentUpon>HiveExperimentView.cs</DependentUpon>
     </Compile>
+    <Compile Include="JobItemListView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="JobItemListView.Designer.cs">
+      <DependentUpon>JobItemListView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="JobItemView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="JobItemView.Designer.cs">
+      <DependentUpon>JobItemView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -120 +133 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
+      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
+      <Name>HeuristicLab.Hive.Contracts-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.Experiment\3.3\HeuristicLab.Hive.Experiment-3.3.csproj">
       <Project>{A84C0A25-13D0-40A6-924F-53556D9691DC}</Project>
       <Name>HeuristicLab.Hive.Experiment-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.3\HeuristicLab.Hive.JobBase-3.3.csproj">
+      <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
+      <Name>HeuristicLab.Hive.JobBase-3.3</Name>
     </ProjectReference>
   </ItemGroup>
@@ -128 +149 @@
     <EmbeddedResource Include="HiveExperimentView.resx">
       <DependentUpon>HiveExperimentView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="JobItemView.resx">
+      <DependentUpon>JobItemView.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

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

@@ -53 +53 @@
       this.loadExperimentButton = new System.Windows.Forms.Button();
       this.hiveStatusTabPage = new System.Windows.Forms.TabPage();
+      this.jobListView = new HeuristicLab.Hive.Experiment.Views.JobItemListView();
+      this.logTabPage = new System.Windows.Forms.TabPage();
+      this.logView = new HeuristicLab.Core.Views.LogView();
       this.startButton = new System.Windows.Forms.Button();
       this.stopButton = new System.Windows.Forms.Button();
@@ -66 +69 @@
       this.tabControl.SuspendLayout();
       this.experimentTabPage.SuspendLayout();
+      this.hiveStatusTabPage.SuspendLayout();
+      this.logTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -85 +90 @@
       this.tabControl.Controls.Add(this.experimentTabPage);
       this.tabControl.Controls.Add(this.hiveStatusTabPage);
-      this.tabControl.Location = new System.Drawing.Point(0, 135);
+      this.tabControl.Controls.Add(this.logTabPage);
+      this.tabControl.Location = new System.Drawing.Point(0, 99);
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(735, 359);
+      this.tabControl.Size = new System.Drawing.Size(735, 395);
       this.tabControl.TabIndex = 4;
       // 
@@ -100 +106 @@
       this.experimentTabPage.Name = "experimentTabPage";
       this.experimentTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.experimentTabPage.Size = new System.Drawing.Size(727, 333);
+      this.experimentTabPage.Size = new System.Drawing.Size(727, 369);
       this.experimentTabPage.TabIndex = 1;
       this.experimentTabPage.Text = "Experiment";
@@ -149 +155 @@
       // hiveStatusTabPage
       // 
+      this.hiveStatusTabPage.Controls.Add(this.jobListView);
       this.hiveStatusTabPage.Location = new System.Drawing.Point(4, 22);
       this.hiveStatusTabPage.Name = "hiveStatusTabPage";
       this.hiveStatusTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.hiveStatusTabPage.Size = new System.Drawing.Size(727, 333);
+      this.hiveStatusTabPage.Size = new System.Drawing.Size(727, 369);
       this.hiveStatusTabPage.TabIndex = 2;
       this.hiveStatusTabPage.Text = "HiveStatus";
       this.hiveStatusTabPage.UseVisualStyleBackColor = true;
+      // 
+      // jobListView
+      // 
+      this.jobListView.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.jobListView.Caption = "JobList View";
+      this.jobListView.Content = null;
+      this.jobListView.Location = new System.Drawing.Point(3, 6);
+      this.jobListView.Name = "jobListView";
+      this.jobListView.ReadOnly = false;
+      this.jobListView.Size = new System.Drawing.Size(721, 360);
+      this.jobListView.TabIndex = 0;
+      // 
+      // logTabPage
+      // 
+      this.logTabPage.Controls.Add(this.logView);
+      this.logTabPage.Location = new System.Drawing.Point(4, 22);
+      this.logTabPage.Name = "logTabPage";
+      this.logTabPage.Size = new System.Drawing.Size(727, 369);
+      this.logTabPage.TabIndex = 3;
+      this.logTabPage.Text = "Log";
+      this.logTabPage.UseVisualStyleBackColor = true;
+      // 
+      // logView
+      // 
+      this.logView.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.logView.Caption = "Log View";
+      this.logView.Content = null;
+      this.logView.Location = new System.Drawing.Point(3, 4);
+      this.logView.Name = "logView";
+      this.logView.ReadOnly = false;
+      this.logView.Size = new System.Drawing.Size(721, 362);
+      this.logView.TabIndex = 0;
       // 
       // startButton
@@ -300 +343 @@
       this.tabControl.ResumeLayout(false);
       this.experimentTabPage.ResumeLayout(false);
+      this.hiveStatusTabPage.ResumeLayout(false);
+      this.logTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -323 +368 @@
     private System.Windows.Forms.Button loadExperimentButton;
     private Core.Views.NamedItemView experimentNamedItemView;
+    private System.Windows.Forms.TabPage logTabPage;
+    private Core.Views.LogView logView;
+    private JobItemListView jobListView;
 
   }

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

@@ -81 +81 @@
         serverUrlTextBox.Text = Content.ServerUrl;
         experimentNamedItemView.Content = Content.Experiment;
+        logView.Content = Content.Log;
+        jobListView.Content = Content.JobItems;
       }
     }
@@ -104 +106 @@
         Content.Prepare();
       }
-      SetEnabledStateOfExecutableButtons();
+      SetEnabledStateOfControls();
     }
 
@@ -189 +191 @@
         stopButton.Enabled = (Content.ExecutionState == ExecutionState.Started) || (Content.ExecutionState == ExecutionState.Paused);
         resetButton.Enabled = Content.ExecutionState != ExecutionState.Started;
+        
       }
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.resx

@@ -128 +128 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
-        CwsBbQSEtwAAALZJREFUOE9j/P//PwNFAGQAOi7bn+2GTRybGIZmkKKEGRH/iTUEpwGWZfpEGYLVgKgp
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
+        CwgBwL2l2gAAALZJREFUOE9j/P//PwNFAGQAOi7bn+2GTRybGIZmkKKEGRH/iTUEpwGWZfpEGYLVgKgp
         Qf833Fr8nxhDsBoQPMEbZDtRhmA1wKfLGWwACEctCsDrEqwGODZb/M/YEAvWbNus/1+nWOG/RBo3iFZD
         jwmsBpjX6KFo5k9gwaoZnIawxa1eqTLcZnyacRqgki8FdjYhzTgNkM4QJEozTgNEkjlx+pmoQMQW2rjy
@@ -138 +138 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
-        CwsBbQSEtwAAAXJJREFUOE+tkj1IQmEYhWsoaIi2xmhpiYSgKFoiCMLJJYSEJiEI0mgIyqjA6vaLUKIU
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
+        CwgBwL2l2gAAAXJJREFUOE+tkj1IQmEYhWsoaIi2xmhpiYSgKFoiCMLJJYSEJiEI0mgIyqjA6vaLUKIU
         iZlJKKUoWEbZDzVYCYlQYVxcNDIoRND8ud7idD83C27g7YNvPM8573nfcgBlgh4BCPmCxIX0Qtx/ATTu
         Lyy78ph3ZKC2pTBlSWB86w2jhleMrD9jWB9N/jQsSkDEj5FPPERZ+J7yOL5j4PYzsPsYGL1piKR7nL64
@@ -151 +151 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
-        CwsBbQSEtwAAAYNJREFUOE9j/P//PwNFAGQAJZgizWDXI9veu/nvfxhuW/vtf+OKz/9rF7//XzHv1f+S
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
+        CwgBwL2l2gAAAYNJREFUOE9j/P//PwNFAGQAJZgizWDXI9veu/nvfxhuW/vtf+OKz/9rF7//XzHv1f+S
         2c//F0x//L901mOgFoSrUQzo2vDr/6aT3/6vPPTl/4I9n/5ffvDzf+/ad/+bl74BG5I3/cV/3dBVuA0A
         2bri4Jf/83Z9+n/ryS+Qwv8NS978L5378n/O1Of/k3qf/Vf1W4TbAJCT5+z49P/hyx9gzSBQMvvl/6wp
@@ -164 +164 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
-        CwsBbQSEtwAAAMZJREFUOE9j/P//PwNFAGQAJZgizWDXU2I7VgN6N//937Xh1/+8qY8+gRSg89EtxHAB
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
+        CwgBwL2l2gAAAMZJREFUOE9j/P//PwNFAGQAJZgizWDXU2I7VgN6N//937Xh1/+8qY8+gRSg89EtxHAB
         SPPVh3/+64auAqr9z4DOJ2hA29pv/289/f1f1W8R2AB0PkEDGld8/n/54e//cm6zwAag8wkaULv4/f8T
         13//F7ObBDYAnU/QgIp5r/7vvvDzP79ZN9gAdD5BA0pmP/+//uTP/5wGrWAD0PkEDSiY/vj/gj2f/7Pq

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/Properties/AssemblyInfo.cs

@@ -55 +55 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.3.0.4116")]
-[assembly: AssemblyFileVersion("3.3.0.4116")]
-[assembly: AssemblyBuildDate("2010/07/28 17:42:56")]
+[assembly: AssemblyVersion("3.3.0.4119")]
+[assembly: AssemblyFileVersion("3.3.0.4119")]
+[assembly: AssemblyBuildDate("2010/07/29 16:49:22")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Experiment-3.3.csproj.user

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Experiment-3.3.csproj.user

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj

@@ -96 +96 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="JobItemList.cs" />
+    <Compile Include="JobItem.cs" />
     <Compile Include="OptimizerJob.cs" />
     <Compile Include="HeuristicLabHiveExperimentPlugin.cs" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -54 +54 @@
     private const int resultPollingIntervalMs = 10000;
 
+    private object locker = new object();
     private const int maxSnapshotRetries = 20;
-
-    [Storable]
-    private IDictionary<Guid, IOptimizer> sentOptimizers = null;
-
-    private object locker = new object();
-    private DateTime startTime;
+    private System.Timers.Timer timer;
+    private bool pausePending, stopPending;
+    private DateTime lastUpdateTime;
+
+    [Storable]
+    private IDictionary<Guid, IOptimizer> pendingOptimizers = new Dictionary<Guid, IOptimizer>();
+
+    [Storable]
+    private JobItemList jobItems;
+    public JobItemList JobItems {
+      get { return jobItems; }
+    }
+    
 
     [Storable]
@@ -66 +74 @@
     public string ServerUrl {
       get { return serverUrl; }
-      set { serverUrl = value; OnServerUrlChanged(); }
+      set {
+        if (serverUrl != value) {
+          serverUrl = value; 
+          OnServerUrlChanged();
+        }
+      }
     }
 
@@ -73 +86 @@
     public string ResourceIds {
       get { return resourceIds; }
-      set { resourceIds = value; OnResourceIdsChanged(); }
+      set {
+        if (resourceIds != value) {
+          resourceIds = value; 
+          OnResourceIdsChanged();
+        }
+      }
     }
 
@@ -80 +98 @@
     public HeuristicLab.Optimization.Experiment Experiment {
       get { return experiment; }
-      set { experiment = value; OnExperimentChanged(); }
+      set {
+        if (experiment != value) {
+          experiment = value;
+          OnExperimentChanged();
+        }
+      }
+    }
+
+    [Storable]
+    private ILog log;
+    public ILog Log {
+      get { return log; }
     }
 
@@ -92 +121 @@
       this.ServerUrl = HeuristicLab.Hive.Experiment.Properties.Settings.Default.HiveServerUrl;
       this.ResourceIds = HeuristicLab.Hive.Experiment.Properties.Settings.Default.ResourceIds;
+      this.log = new Log();
+      pausePending = stopPending = false;
+      jobItems = new JobItemList();
+      InitTimer();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
+      log.LogMessage("I am beeing cloned");
       HiveExperiment clone = (HiveExperiment)base.Clone(cloner);
       clone.resourceIds = this.resourceIds;
@@ -101 +135 @@
       clone.executionState = this.executionState;
       clone.executionTime = this.executionTime;
-      clone.sentOptimizers = new Dictionary<Guid, IOptimizer>();
-      foreach (var pair in this.sentOptimizers)
-        clone.sentOptimizers[pair.Key] = (IOptimizer)cloner.Clone(pair.Value);
+      clone.pendingOptimizers = new Dictionary<Guid, IOptimizer>();
+      foreach (var pair in this.pendingOptimizers)
+        clone.pendingOptimizers[pair.Key] = (IOptimizer)cloner.Clone(pair.Value);
+      clone.log = (ILog)cloner.Clone(log);
+      clone.stopPending = this.stopPending;
+      clone.pausePending = this.pausePending;
+      clone.jobItems = (JobItemList)cloner.Clone(jobItems);
       return clone;
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      InitTimer();
+      log.LogMessage("I was deserialized.");
+    }
+
+    private void InitTimer() {
+      timer = new System.Timers.Timer(100);
+      timer.AutoReset = true;
+      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
+    }
+
+    private void timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) {
+      DateTime now = DateTime.Now;
+      ExecutionTime += now - lastUpdateTime;
+      lastUpdateTime = now;
     }
 
@@ -135 +191 @@
       get { return executionTime; }
       private set {
-        executionTime = value;
-        OnExecutionTimeChanged();
+        if (executionTime != value) {
+          executionTime = value;
+          OnExecutionTimeChanged();
+        }
       }
     }
@@ -145 +203 @@
 
     public void Prepare() {
-      // [chn] needed?
       if (experiment != null) {
         experiment.Prepare();
+        this.ExecutionState = Core.ExecutionState.Prepared;
         OnPrepared();
       }
@@ -153 +211 @@
 
     public void Start() {
-      this.startTime = DateTime.Now;
+      OnStarted();
+      lastUpdateTime = DateTime.Now;
       this.ExecutionState = Core.ExecutionState.Started;
-      IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(ServerUrl);
-
-      sentOptimizers = new Dictionary<Guid, IOptimizer>();
-      IEnumerable<string> groups = ResourceGroups;
-
-      foreach (IOptimizer optimizer in Experiment.Optimizers) {
-        SerializedJob serializedJob = CreateSerializedJob(optimizer);
-        ResponseObject<JobDto> response = executionEngineFacade.AddJobWithGroupStrings(serializedJob, groups);
-        sentOptimizers.Add(response.Obj.Id, optimizer);
-        StartResultPollingThread(response.Obj);
-      }
+      Thread t = new Thread(() => {
+        IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(ServerUrl);
+
+        pendingOptimizers = new Dictionary<Guid, IOptimizer>();
+        IEnumerable<string> groups = ResourceGroups;
+
+        foreach (IOptimizer optimizer in GetOptimizers(false)) {
+          SerializedJob serializedJob = CreateSerializedJob(optimizer);
+          ResponseObject<JobDto> response = executionEngineFacade.AddJobWithGroupStrings(serializedJob, groups);
+          pendingOptimizers.Add(response.Obj.Id, optimizer);
+          StartResultPollingThread(response.Obj);
+
+          JobItem jobItem = new JobItem() {
+            JobDto = response.Obj,
+            LatestSnapshot = new ResponseObject<SerializedJob>() {
+              Obj = serializedJob,
+              StatusMessage = "Initial Snapshot",
+              Success = true
+            }
+          };
+          jobItems.Add(jobItem);
+
+          log.LogMessage("Sent job to server (jobId: " + response.Obj.Id + ")");
+        }
+      });
+      t.Start();
+    }
+
+    /// <summary>
+    /// Returns all optimizers in the current Experiment
+    /// </summary>
+    /// <param name="flatout">if false only top level optimizers are returned, if true the optimizer-tree is flatted</param>
+    /// <returns></returns>
+    private IEnumerable<IOptimizer> GetOptimizers(bool flatout) {
+      if (!flatout) {
+        return experiment.Optimizers;
+      } else {
+        throw new NotImplementedException();
+      }
+    }
+
+    private void ReplaceOptimizer(IOptimizer originalOptimizer, IOptimizer newOptimizer) {
+      int originalOptimizerIndex = experiment.Optimizers.IndexOf(originalOptimizer);
+      experiment.Optimizers[originalOptimizerIndex] = newOptimizer;
     }
 
@@ -171 +263 @@
       // todo
     }
-
-    private bool abortRequested;
-
+    
     #endregion
 
@@ -219 +309 @@
           Thread.Sleep(resultPollingIntervalMs);
           lock (locker) {
-            if (abortRequested) return;
-
+            if (stopPending) return;
+            
             ResponseObject<SerializedJob> response = executionEngineFacade.GetLastSerializedResult(job.Id, false, false);
-
+            log.LogMessage("Received response for job: " + response.StatusMessage + " (jobId: " + job.Id + ")");
+            
+            
             // loop while 
             // 1. the user doesn't request an abort 
@@ -229 +321 @@
             // 4. the result that we get from the server is a snapshot and not the final result
             if (response.Success && response.Obj != null && response.StatusMessage != ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE) {
-
-              // [chn] todo: deserialization into interface is not possible! how to find out correct static type?
               restoredObject = XmlParser.Deserialize<IJob>(new MemoryStream(response.Obj.SerializedJobData));
             }
@@ -236 +326 @@
         } while (restoredObject == null || restoredObject.ExecutionState != Core.ExecutionState.Stopped);
 
+        log.LogMessage("Job finished (jobId: " + job.Id + ")");
         // job retrieved... replace the existing optimizers with the finished one
-        IOptimizer originalOptimizer = sentOptimizers[job.Id];
+        IOptimizer originalOptimizer = pendingOptimizers[job.Id];
         IOptimizer restoredOptimizer = ((OptimizerJob)restoredObject).Optimizer;
 
-        int originalOptimizerIndex = experiment.Optimizers.IndexOf(originalOptimizer);
-        experiment.Optimizers[originalOptimizerIndex] = restoredOptimizer;
-        sentOptimizers.Remove(job.Id);
-
-        if (sentOptimizers.Count == 0) {
+        ReplaceOptimizer(originalOptimizer, restoredOptimizer);
+        pendingOptimizers.Remove(job.Id);
+
+        if (pendingOptimizers.Count == 0) {
           // finished
           this.ExecutionState = Core.ExecutionState.Stopped;
@@ -254 +344 @@
       t.Start();
     }
-
-
+    
     #region Required Plugin Search
     /// <summary>
@@ -351 +440 @@
     public event EventHandler ExecutionStateChanged;
     private void OnExecutionStateChanged() {
+      log.LogMessage("ExecutionState changed to " + executionState.ToString());
       EventHandler handler = ExecutionStateChanged;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -359 +449 @@
     public event EventHandler Started;
     private void OnStarted() {
+      log.LogMessage("Started");
+      timer.Start();
       EventHandler handler = Started;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -365 +457 @@
     public event EventHandler Stopped;
     private void OnStopped() {
+      timer.Stop();
+      log.LogMessage("Stopped");
       EventHandler handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -371 +465 @@
     public event EventHandler Paused;
     private void OnPaused() {
+      timer.Stop();
+      log.LogMessage("Paused");
       EventHandler handler = Paused;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -377 +473 @@
     public event EventHandler Prepared;
     protected virtual void OnPrepared() {
+      log.LogMessage("Prepared");
       EventHandler handler = Prepared;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -389 +486 @@
     public event EventHandler ExperimentChanged;
     protected virtual void OnExperimentChanged() {
+      log.LogMessage("Experiment changed");
       EventHandler handler = ExperimentChanged;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -399 +497 @@
     }
 
-
     #endregion
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/OptimizerJob.cs

@@ -10 +10 @@
 namespace HeuristicLab.Hive.Experiment {
   [StorableClass]
-  class OptimizerJob : IJob {
+  public class OptimizerJob : IJob {
 
     [Storable]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/Properties/AssemblyInfo.cs

@@ -55 +55 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.3.0.4116")]
-[assembly: AssemblyFileVersion("3.3.0.4116")]
-[assembly: AssemblyBuildDate("2010/07/28 17:42:02")]
+[assembly: AssemblyVersion("3.3.0.4119")]
+[assembly: AssemblyFileVersion("3.3.0.4119")]
+[assembly: AssemblyBuildDate("2010/07/29 16:49:01")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/ServiceLocator.cs

@@ -31 +31 @@
   internal class ServiceLocator {
     internal static IExecutionEngineFacade CreateExecutionEngineFacade(string url) {
-      ChannelFactory<IExecutionEngineFacade> factory =
-        new ChannelFactory<IExecutionEngineFacade>(
+      ChannelFactory<IExecutionEngineFacade> factory = new ChannelFactory<IExecutionEngineFacade>(
           WcfSettings.GetStreamedBinding(),
           new EndpointAddress(url));
-
       return factory.CreateChannel();
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj

@@ -91 +91 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Core-3.3">

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs

@@ -11 +11 @@
 namespace HeuristicLab.Hive.Server.ServerConsole {
   public class JobDataFetcher {
-    public List<State> PollStates { get; set; }    
+    private List<State> pollStates;
+
+    public IEnumerable<State> PollStates {
+      get { return pollStates; }
+    } 
 
     public event EventHandler NewDataAvailable;
 
     private System.Timers.Timer timer;
+
+    private static object locker = new object();
 
     public List<JobDto> CachedJobs { get; set; }
@@ -39 +45 @@
 
     public JobDataFetcher(IEnumerable<State> states, int nrOfEntries) {
-      PollStates = new List<State>();
+      pollStates = new List<State>();
       CachedJobs = new List<JobDto>();
       NrOfEntriesOnPage = nrOfEntries;
       CurrentPage = 0;
-      PollStates.AddRange(states);
+      pollStates.AddRange(states);
       timer = new System.Timers.Timer();
       timer.Interval = 5000;
@@ -70 +76 @@
       // [chn] Exception occured here: PollStates enumeration changed!
       // todo: make access to PollStates thread-safe!
-      foreach (State stat in PollStates) {
-        ResponseList<JobDto> resList = ServiceLocator.GetJobManager().GetAllJobsWithFilter(stat, CurrentPage * NrOfEntriesOnPage,
-                                                            NrOfEntriesOnPage);
-        if (resList.Success) {
-          if (resList.List.Count == 0) {
-            if (CurrentPage > 0) {
-              CurrentPage--;
+      // * added lock on locker -> didn't help
+      // * made public property PollStates an IEnumerable to be immutable -> lets see
+      lock (locker) {
+        foreach (State stat in PollStates) {
+          ResponseList<JobDto> resList = ServiceLocator.GetJobManager().GetAllJobsWithFilter(stat, CurrentPage * NrOfEntriesOnPage,
+                                                              NrOfEntriesOnPage);
+          if (resList.Success) {
+            if (resList.List.Count == 0) {
+              if (CurrentPage > 0) {
+                CurrentPage--;
+              }
+            } else {
+              CachedJobs = new List<JobDto>();
+              CachedJobs.AddRange(resList.List);
             }
-          } else {
-            CachedJobs = new List<JobDto>();
-            CachedJobs.AddRange(resList.List);
           }
         }
+        if (NewDataAvailable != null)
+          NewDataAvailable(this, new EventArgs());
       }
-      if (NewDataAvailable != null)
-        NewDataAvailable(this, new EventArgs());
     }
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ExecutionEngineFacade.cs

@@ -70 +70 @@
     }
 
+    public ResponseObject<JobDto> GetJobById(Guid jobId) {
+      using (contextFactory.GetContext()) {
+        return jobManager.GetJobById(jobId);
+      }
+    }
     #endregion
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

@@ -58 +58 @@
     }
 
-
     private void CheckForDeadJobs() {
       Logger.Info("Searching for dead Jobs");
@@ -231 +230 @@
     }
 
+    // [chn] [refactor] why does this method handle 3 different cases? wouldn't 3 methods be easier?
     //Requested means: there MUST be a job result which gets sent back
     public ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot) {
-      ResponseObject<SerializedJob> response =
-        new ResponseObject<SerializedJob>();
+      ResponseObject<SerializedJob> response = new ResponseObject<SerializedJob>();
 
       JobDto job = DaoLocator.JobDao.FindById(jobId);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Properties/AssemblyInfo.cs

@@ -55 +55 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4116")]
-[assembly: AssemblyFileVersion("3.3.0.4116")]
-[assembly: AssemblyBuildDate("2010/07/28 17:42:06")]
+[assembly: AssemblyVersion("3.3.0.4119")]
+[assembly: AssemblyFileVersion("3.3.0.4119")]
+[assembly: AssemblyBuildDate("2010/07/29 16:49:08")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/ContextFactory.cs

@@ -23 +23 @@
   /// </summary>
   class ContextFactory : IContextFactory {
-    private static IDictionary<object, HiveDataContext> contexts = new Dictionary<object, HiveDataContext>();
-    private static IDictionary<object, TransactionScope> transactions = new Dictionary<object, TransactionScope>();
+    private static object locker = new object();
+    private static IDictionary<int, HiveDataContext> contexts = new Dictionary<int, HiveDataContext>();
+    private static IDictionary<int, TransactionScope> transactions = new Dictionary<int, TransactionScope>();
 
     private static IContextFactory instance = null;
@@ -42 +43 @@
 
     public IDisposable GetContext(bool withTransaction) {
-      Logger.Debug("opening transaction");
-      object obj = Thread.CurrentThread;
+      lock (locker) {
+        Logger.Debug("opening transaction");
+        int threadId = Thread.CurrentThread.ManagedThreadId;
 
-      if (contexts.ContainsKey(obj)) {
-        throw new DataAccessException("Context for this Thread already defined");
+        if (contexts.ContainsKey(threadId)) {
+          throw new DataAccessException("Context for this Thread already defined");
+        }
+
+        Logger.Debug("creating context");
+        DisposableHiveDataContext context = CreateContext();
+        context.OnDisposing += new EventHandler(context_OnDisposing);
+        contexts.Add(threadId, context);
+
+        if (withTransaction) {
+          TransactionScope transaction = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE });
+          Logger.Debug("creating  transaction");
+
+          transactions.Add(threadId, transaction);
+        }
+        return context;
       }
-
-      Logger.Debug("creating context");
-      DisposableHiveDataContext context = CreateContext();
-      context.OnDisposing += new EventHandler(context_OnDisposing);
-      contexts.Add(obj, context);
-
-      if (withTransaction) {
-        TransactionScope transaction = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE });
-        Logger.Debug("creating  transaction");
-        
-        transactions.Add(obj, transaction);
-      }
-      return context;
     }
 
@@ -74 +77 @@
     public void RollbackTransaction() {
       Logger.Debug("rolling back transaction");
-      object obj = Thread.CurrentThread;
+      int threadId = Thread.CurrentThread.ManagedThreadId;
 
-      TransactionScope transaction = transactions[obj];
+      TransactionScope transaction = transactions[threadId];
       transaction.Dispose();
     }
 
     public void RemoveContext() {
-      Logger.Debug("removing context");
-      object obj = Thread.CurrentThread;
+      lock (locker) {
+        Logger.Debug("removing context");
+        int threadId = Thread.CurrentThread.ManagedThreadId;
 
-      contexts.Remove(obj);
-      // context gets disposed implicitly, when it is used as IDisposable
+        contexts.Remove(threadId);
+        // context gets disposed implicitly, when it is used as IDisposable
+      }
     }
 
     public void RemoveAndCompleteTransaction() {
-      Logger.Debug("completing transaction");
-      object obj = Thread.CurrentThread;
+      lock (locker) {
+        Logger.Debug("completing transaction");
+        int threadId = Thread.CurrentThread.ManagedThreadId;
 
-      // context does not always have an associated transaction
-      if (transactions.ContainsKey(obj)) {
-        transactions[obj].Complete();
-        transactions[obj].Dispose();
-        transactions.Remove(obj);
+        // context does not always have an associated transaction
+        if (transactions.ContainsKey(threadId)) {
+          transactions[threadId].Complete();
+          transactions[threadId].Dispose();
+          transactions.Remove(threadId);
+        }
       }
     }
@@ -102 +109 @@
     public DataContext CurrentContext {
       get {
-        object obj = Thread.CurrentThread;
-        if (contexts.ContainsKey(obj)) {
-          return contexts[obj];
+        int threadId = Thread.CurrentThread.ManagedThreadId;
+        if (contexts.ContainsKey(threadId)) {
+          return contexts[threadId];
         } else {
           return null;

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive-3.3.csproj.user

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive-3.3.csproj.user

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj

@@ -41 +41 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\x86\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Properties/AssemblyInfo.cs

@@ -51 +51 @@
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.0.4116")]
-[assembly: AssemblyFileVersion("3.3.0.4116")]
+[assembly: AssemblyVersion("3.3.0.4119")]
+[assembly: AssemblyFileVersion("3.3.0.4119")]

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Experiment.Views-3.3.csproj.user

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive.Experiment-3.3.csproj.user

@@ -1 +1 @@
 bin
 obj
+HeuristicLab.Hive-3.3.csproj.user