Changeset 4929 for branches/OKB/HeuristicLab.Clients.OKB-3.3/OKBClient.cs

Timestamp:

11/25/10 02:51:45 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

File:

• branches/OKB/HeuristicLab.Clients.OKB-3.3/OKBClient.cs (modified) (6 diffs)

branches/OKB/HeuristicLab.Clients.OKB-3.3/OKBClient.cs

@@ -323 +323 @@
 
     #region Run Methods
-    public bool AddRun(long algorithmId, long problemId, HeuristicLab.Optimization.Run run) {
-      try {
-        IAlgorithm algorithm = run.Algorithm;
+    public bool AddRun(long algorithmId, long problemId, IAlgorithm algorithm) {
+      try {
         IProblem problem = algorithm.Problem;
 
@@ -346 +345 @@
         r.ClientId = Guid.NewGuid();
         r.FinishedDate = DateTime.Now;
-        r.RandomSeed = ((IntValue)((IValueParameter)run.Parameters["Seed"]).Value).Value;
+        r.RandomSeed = ((IntValue)((IValueParameter)algorithm.Parameters["Seed"]).Value).Value;
         r.ResultValues = resultValues.ToArray();
         r.Store();
@@ -361 +360 @@
       List<AlgorithmParameterValue> values = new List<AlgorithmParameterValue>();
       foreach (IValueParameter param in item.Parameters.OfType<IValueParameter>()) {
-        if (param.GetsCollected && (param.Value != null)) {
+        if (param.GetsCollected && (param.Value != null) && (param.Name != "Seed")) {
           AlgorithmParameter p = parameters.FirstOrDefault(x => x.Name == prefix + param.Name);
           if (p == null) {
@@ -376 +375 @@
           value.AlgorithmParameterId = p.Id;
           value.DataTypeId = ConvertToDataType(param.Value.GetType()).Id;
+          values.Add(value);
         }
 
@@ -424 +424 @@
           value.ProblemParameterId = p.Id;
           value.DataTypeId = ConvertToDataType(param.Value.GetType()).Id;
+          values.Add(value);
         }
 
@@ -457 +458 @@
       List<ResultValue> values = new List<ResultValue>();
       foreach (IResult result in algorithm.Results) {
-        if ((result.Value != null) && (results.FirstOrDefault(x => x.Name == result.Name) == null)) {
-          Result r = new Result();
-          r.Name = result.Name;
-          r.Alias = result.Name;
-          r.Description = result.Description;
-          r.AlgorithmId = algorithmId;
-          r.DataTypeId = ConvertToDataType(result.DataType).Id;
-          r.Store();
-          results.Add(r);
+        if (result.Value != null) {
+          Result r = results.FirstOrDefault(x => x.Name == result.Name);
+          if (r == null) {
+            r = new Result();
+            r.Name = result.Name;
+            r.Alias = result.Name;
+            r.Description = result.Description;
+            r.AlgorithmId = algorithmId;
+            r.DataTypeId = ConvertToDataType(result.DataType).Id;
+            r.Store();
+            results.Add(r);
+          }
+          ResultValue value = CreateResultValue(result.Value);
+          value.ResultId = r.Id;
+          value.DataTypeId = ConvertToDataType(result.Value.GetType()).Id;
+          values.Add(value);
         }
       }
       return values;
     }
-    private ResultValue CreateResiötValue(IItem item) {
+    private ResultValue CreateResultValue(IItem item) {
       if (item is BoolValue) {
         ResultBoolValue value = new ResultBoolValue();