Changeset 1761 for trunk/sources

Timestamp:

05/08/09 13:27:14 (16 years ago)

Author:

gkronber

Message:

added progress calculation to hive-engine (just reads variable "Progress" vom global scope) #545 (Engine which can be executed in the Hive)

Location:

trunk/sources/HeuristicLab.Hive.Engine/3.2

Files:

• HeuristicLab.Hive.Engine-3.2.csproj (modified) (1 diff)
• Job.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Engine/3.2/HeuristicLab.Hive.Engine-3.2.csproj

@@ -106 +106 @@
       <Name>HeuristicLab.DataAccess-3.2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">
+      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
+      <Name>HeuristicLab.Data-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>

trunk/sources/HeuristicLab.Hive.Engine/3.2/Job.cs

@@ -27 +27 @@
 using HeuristicLab.Hive.JobBase;
 using System.Xml;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Hive.Engine {
@@ -68 +69 @@
 
     public double Progress {
-      get { return 0.0; }
+      get {
+        DoubleData progress = Engine.GlobalScope.GetVariableValue<DoubleData>("Progress", false,
+          false);
+        return progress == null ? 0.0 : progress.Data;
+      }
       set { throw new NotSupportedException(); }
     }