Changeset 4423 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3

Timestamp:

09/17/10 10:26:55 (14 years ago)

Author:

cneumuel

Message:

• Refactored HL.Hive.Experiment. JobItems are not called HiveJobs and OptimizerJobs do not contain a hierarchy anymore.
• Dynamic generation of jobs on a slave are not reflected on the client user interface.
• Optimizer-Trees are now strictly synchronized with the HiveJob-Trees (also the ComputeInParallel property is taken into account when the Child HiveJobs are created)
• Improved the way a class can report progress and lock the UI (IProgressReporter, IProgress, Progress, ProgressView)
• Changes were made to the config-files, so that server and clients work with blade12.hpc.fh-hagenberg.at
• Lots of small changes and bugfixes

Location:

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3

Files:

• AddUserForm.Designer.cs (deleted)
• AddUserForm.cs (deleted)
• AddUserForm.resx (deleted)
• HiveServerManagementConsole.cs (modified) (5 diffs)
• app.config (modified) (1 diff)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

@@ -345 +345 @@
       foreach (ResourceDto resource in clientGroup.Resources) {
         if (resource is SlaveDto) {
-          int percentageUsage = CapacityRam(((SlaveDto)resource).NrOfCores, ((SlaveDto)resource).NrOfFreeCores);
+          int percentageUsage;
+          if (((SlaveDto)resource).NrOfCores.HasValue && ((SlaveDto)resource).NrOfFreeCores.HasValue) {
+            percentageUsage = CapacityRam(((SlaveDto)resource).NrOfCores.Value, ((SlaveDto)resource).NrOfFreeCores.Value);
+          } else {
+            percentageUsage = 0;
+          }
+
           int usage = 3;
           if ((((SlaveDto)resource).State != SlaveState.Offline) &&
@@ -427 +433 @@
 
       lblJobName.Text = job.Id.ToString();
-      if (job.Percentage != null) {
-        progressJob.Value = (int)(currentJob.Percentage * 100);
-        lblProgress.Text = (int)(currentJob.Percentage * 100) + "% calculated";
-      }
+
+      progressJob.Value = (int)(currentJob.ExecutionTime.TotalDays % 1) * progressJob.Maximum;
+      lblProgress.Text = currentJob.ExecutionTime.ToString();
 
       ListViewItem lvi = new ListViewItem();
@@ -443 +448 @@
       lvJobDetails.Items.Add(lvi);
 
-      if (job.ParentJob != null) {
+      if (job.ParentJobId != null) {
         lvi = null;
         lvi = new ListViewItem();
         lvi.Text = "Parent job:";
-        lvi.SubItems.Add(job.ParentJob.ToString());
+        lvi.SubItems.Add(job.ParentJobId.ToString());
         lvJobDetails.Items.Add(lvi);
       }
@@ -497 +502 @@
 
       if (currentSlave != null) {
-        int percentageUsage = CapacityRam(currentSlave.NrOfCores, currentSlave.NrOfFreeCores);
+        int percentageUsage;
+        if (currentSlave.NrOfCores.HasValue && currentSlave.NrOfFreeCores.HasValue) {
+          percentageUsage = CapacityRam(currentSlave.NrOfCores.Value, currentSlave.NrOfFreeCores.Value);
+        } else {
+          percentageUsage = 0;
+        }
         int usage = 3;
         if ((currentSlave.State != SlaveState.Offline) && (currentSlave.State != SlaveState.NullState)) {
@@ -807 +817 @@
             if (job.State != JobState.Offline) {
               if ((!IsEqual(job.Slave, jobold.Slave)) || (job.State != jobold.State)
-                   || (job.Percentage != jobold.Percentage)) {
+                   || (job.ExecutionTime != jobold.ExecutionTime)) {
                 change = true;
               }

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/app.config

@@ -35 +35 @@
     </bindings>
     <client>
-      <endpoint address="http://localhost:9000/ServerConsoleService" behaviorConfiguration="ServerConsoleBehaviour"
+      <endpoint address="http://blade12.hpc.fh-hagenberg.at:9000/ServerConsoleService" behaviorConfiguration="ServerConsoleBehaviour"
           binding="wsHttpBinding" bindingConfiguration="ServerConsoleHttpEndpoint"
           contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" name="ServerConsoleHttpEndpoint">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=" />
+          <certificate encodedValue="AwAAAAEAAAAUAAAA0FkTGjOA2/0cZmFlIwFildV5a/ogAAAAAQAAACgCAAAwggIkMIIBkaADAgECAhCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQAwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MB4XDTEwMDkxNTE0MjkyNFoXDTM5MTIzMTIzNTk1OVowJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN/VsuexELvneBS+KjIT4z1oj8VwitpZJDhCVxVM1hBVAXRJ9qE0zwFwen6KWRXKMx0wZvm47CdkENO0krsqfliQRKb0hcMin+37X8u1Xk51qebV3M0kUAEpsRT6RehQD41+iGe1GmIaLksCEYaH80wPWI7F3N/tN+5svizD0sfQIDAQABo1swWTBXBgNVHQEEUDBOgBBJWfbAcVJ+egMO9eh/uP3hoSgwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0ghCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQADgYEApOwttaruQRFtS8SWslEDt+aKzIUnfKrJ+7U7Fml5+QT7G4+5bXnfOs5gcWKDQyyap9y3AJpjPnGaLzwb/8LwlqKXePRQvOW44O5JLwOTo3TD4ZPKANuBblD7J7TYGyXKTUQcytfQl1uOxELWNBj4IpUEbR1C/S4RmupMivLNQoA=" />
         </identity>
       </endpoint>