Changeset 1449 for trunk/sources/HeuristicLab.Hive.Client.Core/ConfigurationManager

Timestamp:

03/27/09 14:04:47 (16 years ago)

Author:

svonolfe

Message:

Refactored DAL (now using GUIDs as IDs instead of longs) (#527)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/ConfigurationManager/ConfigManager.cs (modified) (4 diffs)

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

@@ -55 +55 @@
 
       if (Settings.Default.Guid == Guid.Empty) {
-        hardwareInfo.ClientId = Guid.NewGuid();
-        Settings.Default.Guid = hardwareInfo.ClientId;
+        hardwareInfo.Id = Guid.NewGuid();
+        Settings.Default.Guid = hardwareInfo.Id;
         Settings.Default.Save();
       } else
-        hardwareInfo.ClientId = Settings.Default.Guid;
+        hardwareInfo.Id = Settings.Default.Guid;
       
       hardwareInfo.NrOfCores = Environment.ProcessorCount;
@@ -102 +102 @@
       //Todo: Locking
       StatusCommons st = new StatusCommons();
-      st.ClientGuid = hardwareInfo.ClientId;
+      st.ClientGuid = hardwareInfo.Id;
       
       st.Status = WcfService.Instance.ConnState;
@@ -111 +111 @@
       st.JobsFetched = ClientStatusInfo.JobsFetched;      
 
-      Dictionary<long, Executor> engines = Core.GetExecutionEngines();
+      Dictionary<Guid, Executor> engines = Core.GetExecutionEngines();
       st.Jobs = new List<JobStatus>();
 
       lock (engines) {
-        foreach (KeyValuePair<long, Executor> kvp in engines) {
+        foreach (KeyValuePair<Guid, Executor> kvp in engines) {
           Executor e = kvp.Value;
           st.Jobs.Add(new JobStatus { JobId = e.JobId, Progress = e.Progress, Since = e.CreationTime });
@@ -123 +123 @@
     }
 
-    public Dictionary<long, double> GetProgressOfAllJobs() {
-      Dictionary<long,double> prog = new Dictionary<long,double>();
-      Dictionary<long, Executor> engines = Core.GetExecutionEngines();
+    public Dictionary<Guid, double> GetProgressOfAllJobs() {
+      Dictionary<Guid, double> prog = new Dictionary<Guid, double>();
+      Dictionary<Guid, Executor> engines = Core.GetExecutionEngines();
       lock (engines) {
-        foreach (KeyValuePair<long, Executor> kvp in engines) {
+        foreach (KeyValuePair<Guid, Executor> kvp in engines) {
           Executor e = kvp.Value;
           prog[e.JobId] = e.Progress;