Changeset 749

Timestamp:

11/13/08 16:48:36 (16 years ago)

Author:

kgrading

Message:

startet #358

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Common/JobBase.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.ExecutionEngine (added)
• HeuristicLab.Hive.Client.ExecutionEngine/ExecutionEnginePlugin.cs (added)
• HeuristicLab.Hive.Client.ExecutionEngine/HeuristicLab.Hive.Client.ExecutionEngine.csproj (added)
• HeuristicLab.Hive.Client.ExecutionEngine/HeuristicLab.snk (added)
• HeuristicLab.Hive.Client.ExecutionEngine/Properties (added)
• HeuristicLab.Hive.Client.ExecutionEngine/Properties/AssemblyInfo.frame (added)
• HeuristicLab.sln (modified) (2 diffs)
• HeuristicLab/CopyAssemblies.cmd (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Common/JobBase.cs

@@ -6 +6 @@
 
 namespace HeuristicLab.Hive.Client.Common {
+
+  public delegate void Callback();
+
   abstract public class JobBase {
 
+    public event Callback JobAborted;
+
     private Thread thread = null;
+    
     public int Progress { get; set; }
-    
+    private bool abort = false;
+    private bool running = false;
 
     abstract public void Run();
@@ -17 +24 @@
       thread = new Thread(new ThreadStart(Run));
       thread.Start();
+      running = true;
     }
-    public JobBase() {
+
+    public void Stop() {
+      abort = true;        
+    }
+
+    public JobBase() {    
     }
   }

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -39 +39 @@
       TestJob job = new TestJob();
       job.Start();
-      
-
+         
       MessageQueue queue = MessageQueue.GetInstance();
 

trunk/sources/HeuristicLab.sln

@@ -125 +125 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Settings", "HeuristicLab.Settings\HeuristicLab.Settings.csproj", "{1446E01A-0948-4E72-A77C-FD13FD63C3E3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Client.ExecutionEngine", "HeuristicLab.Hive.Client.ExecutionEngine\HeuristicLab.Hive.Client.ExecutionEngine.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}"
 EndProject
 Global
@@ -573 +575 @@
     {1446E01A-0948-4E72-A77C-FD13FD63C3E3}.Release|Any CPU.Build.0 = Release|Any CPU
     {1446E01A-0948-4E72-A77C-FD13FD63C3E3}.Release|x86.ActiveCfg = Release|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|Any CPU.Build.0 = Release|Any CPU
+    {1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab/CopyAssemblies.cmd

@@ -69 +69 @@
 copy %1\HeuristicLab.Hive.Client.Common\%2\HeuristicLab.Hive.Client.Common-3.2.dll .\plugins
 copy %1\HeuristicLab.Hive.Client.Console\%2\HeuristicLab.Hive.Client.Console-3.2.dll .\plugins
+copy %1\HeuristicLab.Hive.Client.ExecutionEngine\%2\HeuristicLab.Hive.Client.ExecutionEngine-3.2.dll .\plugins