Changeset 7741 for branches/OKB (trunk integration)

Timestamp:

04/18/12 20:01:42 (13 years ago)

Author:

ascheibe

Message:

#1174

• prevent uploading of double parameters/results that are NaN
• when adding a run don't generate duplicate binary datas

Location:

branches/OKB (trunk integration)

Files:

• HeuristicLab.Clients.OKB/3.3/RunCreation/OKBRun.cs (modified) (3 diffs)
• HeuristicLab.Services.OKB/3.3/RunCreation/Convert.cs (modified) (5 diffs)

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

@@ -190 +190 @@
     List<Value> ConvertToValues(IDictionary<string, IItem> items) {
       List<Value> values = new List<Value>();
+      bool add = true;
       foreach (var item in items) {
         Value value;
@@ -208 +209 @@
           v.Value = ((Data.PercentValue)item.Value).Value;
           value = v;
+          if (double.IsNaN(v.Value)) {
+            add = false;
+          }
         } else if (item.Value is Data.DoubleValue) {
           DoubleValue v = new DoubleValue();
           v.Value = ((Data.DoubleValue)item.Value).Value;
           value = v;
+          if (double.IsNaN(v.Value)) {
+            add = false;
+          }
         } else if (item.Value is Data.StringValue) {
           StringValue v = new StringValue();
@@ -225 +232 @@
           value = v;
         }
-        value.Name = item.Key;
-        value.DataType = new DataType();
-        value.DataType.Name = item.Value.GetType().Name;
-        value.DataType.TypeName = item.Value.GetType().AssemblyQualifiedName;
-        values.Add(value);
+        if (add) {
+          value.Name = item.Key;
+          value.DataType = new DataType();
+          value.DataType.Name = item.Value.GetType().Name;
+          value.DataType.TypeName = item.Value.GetType().AssemblyQualifiedName;
+          values.Add(value);
+        } else {
+          add = true;
+        }
       }
       return values;

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/RunCreation/Convert.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -58 +59 @@
     public static DA.Run ToEntity(DT.Run source, DA.OKBDataContext okb) {
       if (source == null) return null;
+
+      List<DA.BinaryData> binCache = new List<DA.BinaryData>();
+
       DA.Run entity = new DA.Run { Id = 0, AlgorithmId = source.AlgorithmId, ProblemId = source.ProblemId, CreatedDate = source.CreatedDate, UserId = source.UserId, ClientId = source.ClientId };
       foreach (var value in source.ParameterValues)
-        entity.Values.Add(Convert.ToEntity(value, entity, DA.ValueNameCategory.Parameter, okb));
+        entity.Values.Add(Convert.ToEntity(value, entity, DA.ValueNameCategory.Parameter, okb, binCache));
       foreach (var value in source.ResultValues)
-        entity.Values.Add(Convert.ToEntity(value, entity, DA.ValueNameCategory.Result, okb));
+        entity.Values.Add(Convert.ToEntity(value, entity, DA.ValueNameCategory.Result, okb, binCache));
       return entity;
     }
 
-    private static DA.Value ToEntity(DT.Value source, DA.Run run, DA.ValueNameCategory category, DA.OKBDataContext okb) {
+    private static DA.Value ToEntity(DT.Value source, DA.Run run, DA.ValueNameCategory category, DA.OKBDataContext okb, List<DA.BinaryData> binCache) {
       if (source == null) return null;
       var entity = new DA.Value();
@@ -97 +101 @@
       } else if (source is DT.BinaryValue) {
         entity.ValueName = Convert.ToEntity(source.Name, category, DA.ValueNameType.Binary, okb);
-        entity.BinaryData = Convert.ToEntity(((DT.BinaryValue)source).Value, okb);
+        entity.BinaryData = Convert.ToEntity(((DT.BinaryValue)source).Value, okb, binCache);
       } else {
         throw new ArgumentException("Unknown value type.", "source");
@@ -120 +124 @@
     }
 
-    private static DA.BinaryData ToEntity(byte[] data, DA.OKBDataContext okb) {
+    private static DA.BinaryData ToEntity(byte[] data, DA.OKBDataContext okb, List<DA.BinaryData> binCache) {
       if (data == null) return null;
       byte[] hash;
@@ -126 +130 @@
         hash = sha1.ComputeHash(data);
       }
+
+      var cachedBinaryData = binCache.Where(x => x.Hash.SequenceEqual(hash)).FirstOrDefault();
+      if (cachedBinaryData != null)
+        return cachedBinaryData;
+
       var entity = okb.BinaryDatas.Where(x => x.Hash.Equals(hash)).FirstOrDefault();
-      if (entity == null)
+      if (entity == null) {
         entity = new DA.BinaryData() { Id = 0, Data = data, Hash = hash };
+        binCache.Add(entity);
+      }
+
       return entity;
     }