Changeset 7554 for branches/OKB (trunk integration)

Timestamp:

03/05/12 22:33:19 (13 years ago)

Author:

ascheibe

Message:

#1174 improved access service handling to work with Hive

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation

Files:

• OKBAlgorithm.cs (modified) (5 diffs)
• OKBRun.cs (modified) (4 diffs)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs

@@ -25 +25 @@
 using System.IO;
 using System.Linq;
+using HeuristicLab.Clients.Access;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -149 +150 @@
 
     #region Persistence Properties
+    [Storable]
+    private Guid UserId;
+
     [Storable(Name = "AlgorithmId")]
     private long StorableAlgorithmId {
@@ -186 +190 @@
       runs = cloner.Clone(original.runs);
       storeRunsAutomatically = original.storeRunsAutomatically;
+      UserId = original.UserId;
       RegisterRunsEvents();
     }
@@ -195 +200 @@
       runs = new RunCollection();
       storeRunsAutomatically = true;
+      UserId = UserInformation.Instance.User.Id;
       RegisterRunsEvents();
     }
@@ -381 +387 @@
       foreach (IRun run in e.Items) {
         if (problem != null) {
-          OKBRun okbRun = new OKBRun(AlgorithmId, problem.ProblemId, run);
+          OKBRun okbRun = new OKBRun(AlgorithmId, problem.ProblemId, run, UserId);
           runs.Add(okbRun);
           if (StoreRunsAutomatically) {

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBRun.cs

@@ -80 +80 @@
 
     #region Persistence Properties
+    [Storable]
+    private Guid UserId;
+
     [Storable(Name = "Stored")]
     private bool StorableStored {
@@ -110 +113 @@
       createdDate = original.createdDate;
       stored = original.stored;
-    }
-    public OKBRun(long algorithmId, long problemId, IRun run)
+      UserId = original.UserId;
+    }
+    public OKBRun(long algorithmId, long problemId, IRun run, Guid userId)
       : base(run) {
       this.algorithmId = algorithmId;
@@ -117 +121 @@
       this.createdDate = DateTime.Now;
       this.stored = false;
+      this.UserId = userId;
     }
 
@@ -130 +135 @@
       run.ProblemId = problemId;
       //TODO: should there be some error handling? at this point it should already be checked that the user and client are registred
-      run.UserId = UserInformation.Instance.User.Id;
+      run.UserId = UserId;
       run.ClientId = ClientInformation.Instance.ClientInfo.Id;
       run.CreatedDate = createdDate;