Changeset 5536 for branches/HeuristicLab.Hive-3.4/sources

Timestamp:

02/22/11 14:22:12 (14 years ago)

Author:

cneumuel

Message:

#1233

• fixed minor bug in ConfigManager
• added configs for services.heuristiclab.com

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/app - services.config (added)
• HeuristicLab.Clients.Hive.Slave/3.4/ConfigManager.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/app - services.config (added)
• HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/app - services.config (added)

branches/HeuristicLab.Hive-3.4/sources

@@ -2 +2 @@
 HeuristicLab.Hive-3.4.suo
 TestResults
+PrecompiledWeb

@@ -2 +2 @@
 HeuristicLab.Hive-3.4.suo
 TestResults
+PrecompiledWeb

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj

@@ -81 +81 @@
       <SubType>Designer</SubType>
     </None>
+    <None Include="app - F005PC.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ConfigManager.cs

@@ -136 +136 @@
     }
 
+    /// <summary>
+    /// MegaBytes
+    /// </summary>
     private static int? GetPhysicalMemory() {
-      int? res = GetWMIValue("Win32_ComputerSystem", "TotalPhysicalMemory");
+      long? res = GetWMIValue("Win32_ComputerSystem", "TotalPhysicalMemory");
       if (res != null)
-        return res / 1024 / 1024;
+        return (int)(res / 1024 / 1024);
       else
         return null;
     }
 
+    /// <summary>
+    /// Mhz
+    /// </summary>
     private static int? GetCpuSpeed() {
-      return GetWMIValue("Win32_Processor", "MaxClockSpeed");
+      return (int)GetWMIValue("Win32_Processor", "MaxClockSpeed");
     }
 
-    private static int? GetWMIValue(string Class, string Property) {
-      ManagementClass mgtClass = new ManagementClass(Class);
+    private static long? GetWMIValue(string clazz, string property) {
+      ManagementClass mgtClass = new ManagementClass(clazz);
       ManagementObjectCollection mgtCol = mgtClass.GetInstances();
 
       foreach (ManagementObject mgtObj in mgtCol) {
         foreach (var prop in mgtObj.Properties) {
-          if (prop.Value != null && prop.Name == Property) {
+          if (prop.Value != null && prop.Name == property) {
             try {
-              return int.Parse(prop.Value.ToString());
+              return long.Parse(prop.Value.ToString());
             }
             catch {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

@@ -125 +125 @@
     <Compile Include="WcfService.cs" />
     <None Include="app.config" />
+    <None Include="app - F005PC.config" />
     <None Include="HeuristicLabClientsHiveSlavePlugin.cs.frame" />
     <Compile Include="HeuristicLabClientsHiveSlavePlugin.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -113 +113 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="app - F005PC.config" />
     <None Include="HeuristicLabClientsHivePlugin.cs.frame" />
     <Compile Include="Administration\HiveAdministrationClient.cs" />

@@ -2 +2 @@
 HeuristicLab.Hive-3.4.suo
 TestResults
+PrecompiledWeb