Changeset 13550 for trunk/sources/HeuristicLab.Clients.OKB/3.3

Timestamp:

01/19/16 08:38:56 (8 years ago)

Author:

abeham

Message:

#2560: changed characteristic calculator to output IItem instead of double

Location:

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation

Files:

• RunCreationClient.cs (modified) (2 diffs)
• ServiceClient/BoolValue.cs (modified) (2 diffs)
• ServiceClient/DoubleValue.cs (modified) (1 diff)
• ServiceClient/FloatValue.cs (modified) (1 diff)
• ServiceClient/IntValue.cs (modified) (1 diff)
• ServiceClient/LongValue.cs (modified) (1 diff)
• ServiceClient/PercentValue.cs (modified) (1 diff)
• ServiceClient/StringValue.cs (modified) (1 diff)
• ServiceClient/TimeSpanValue.cs (modified) (1 diff)
• ServiceClient/Value.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/RunCreationClient.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using HeuristicLab.Clients.Common;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Clients.OKB.RunCreation {
@@ -114 +117 @@
     #endregion
 
+    #region OKB-Item Conversion
+    public IItem ConvertToItem(Value value) {
+      if (value is BinaryValue) {
+        IItem item = null;
+        var binaryValue = (BinaryValue)value;
+        if (binaryValue.Value != null) {
+          using (var stream = new MemoryStream(binaryValue.Value)) {
+            try {
+              item = XmlParser.Deserialize<IItem>(stream);
+            } catch (Exception) { }
+            stream.Close();
+          }
+        }
+        return item ?? new Data.StringValue(value.DataType.Name);
+      } else if (value is BoolValue) {
+        return new Data.BoolValue(((BoolValue)value).Value);
+      } else if (value is FloatValue) {
+        return new Data.DoubleValue(((FloatValue)value).Value);
+      } else if (value is PercentValue) {
+        return new Data.PercentValue(((PercentValue)value).Value);
+      } else if (value is DoubleValue) {
+        return new Data.DoubleValue(((DoubleValue)value).Value);
+      } else if (value is IntValue) {
+        return new Data.IntValue((int)((IntValue)value).Value);
+      } else if (value is LongValue) {
+        return new Data.IntValue((int)((LongValue)value).Value);
+      } else if (value is StringValue) {
+        return new Data.StringValue(((StringValue)value).Value);
+      } else if (value is TimeSpanValue) {
+        return new Data.TimeSpanValue(TimeSpan.FromSeconds((long)((TimeSpanValue)value).Value));
+      }
+      return null;
+    }
+
+    public Value ConvertToValue(IItem item, string name) {
+      Value result = null;
+      if (item is ValueTypeValue<bool>) {
+        var boolValue = (ValueTypeValue<bool>)item;
+        result = new BoolValue() { Value = boolValue.Value };
+      } else if (item is ValueTypeValue<int>) {
+        var intValue = (ValueTypeValue<int>)item;
+        result = new IntValue() { Value = intValue.Value };
+      } else if (item is ValueTypeValue<long>) {
+        var longValue = (ValueTypeValue<long>)item;
+        result = new LongValue() { Value = longValue.Value };
+      } else if (item is ValueTypeValue<float>) {
+        var floatValue = (ValueTypeValue<float>)item;
+        result = new FloatValue() { Value = floatValue.Value };
+      } else if (item is ValueTypeValue<double>) {
+        var doubleValue = (ValueTypeValue<double>)item;
+        if (item is Data.PercentValue) result = new PercentValue() { Value = doubleValue.Value };
+        else result = new DoubleValue() { Value = doubleValue.Value };
+      } else if (item is ValueTypeValue<TimeSpan>) {
+        var timeSpanValue = (ValueTypeValue<TimeSpan>)item;
+        result = new TimeSpanValue() { Value = (long)timeSpanValue.Value.TotalSeconds };
+      } else if (item is Data.StringValue) {
+        var stringValue = (Data.StringValue)item;
+        result = new StringValue() { Value = stringValue.Value };
+      }
+      if (result == null) {
+        var binaryValue = new BinaryValue {
+          DataType = new DataType() {
+            Name = item.GetType().Name,
+            TypeName = item.GetType().AssemblyQualifiedName
+          }
+        };
+        using (var memStream = new MemoryStream()) {
+          XmlGenerator.Serialize(item, memStream);
+          binaryValue.Value = memStream.ToArray();
+        }
+        result = binaryValue;
+      }
+      result.Name = name;
+      return result;
+    }
+    #endregion
+
     #region Events
     public event EventHandler Refreshing;

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/BoolValue.cs

@@ -24 +24 @@
 namespace HeuristicLab.Clients.OKB.RunCreation {
   public partial class BoolValue {
+
     public BoolValue() {
       DataType = new DataType() {
@@ -31 +32 @@
     }
 
-    public override string ToString() {
+    public override string GetValue() {
       return Value.ToString(CultureInfo.CurrentCulture.NumberFormat);
     }

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/DoubleValue.cs

@@ -31 +31 @@
     }
 
-    public override string ToString() {
+    public override string GetValue() {
       return Value.ToString(CultureInfo.CurrentCulture.NumberFormat);
     }

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/FloatValue.cs

@@ -31 +31 @@
     }
 
-    public override string ToString() {
+    public override string GetValue() {
       return Value.ToString(CultureInfo.CurrentCulture.NumberFormat);
     }

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/IntValue.cs

@@ -31 +31 @@
     }
 
-    public override string ToString() {
+    public override string GetValue() {
       return Value.ToString(CultureInfo.CurrentCulture.NumberFormat);
     }

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/LongValue.cs

@@ -31 +31 @@
     }
 
-    public override string ToString() {
+    public override string GetValue() {
       return Value.ToString(CultureInfo.CurrentCulture.NumberFormat);
     }

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/PercentValue.cs

@@ -31 +31 @@
     }
 
-    public override string ToString() {
-      return (100 * Value).ToString(CultureInfo.CurrentCulture.NumberFormat) + "%";
+    public override string GetValue() {
+      return Value.ToString(CultureInfo.CurrentCulture.NumberFormat);
     }
   }

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/StringValue.cs

@@ -30 +30 @@
     }
 
-    public override string ToString() {
+    public override string GetValue() {
       return Value;
     }

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/TimeSpanValue.cs

@@ -31 +31 @@
     }
 
-    public override string ToString() {
-      return Value.ToString(CultureInfo.CurrentCulture.DateTimeFormat);
+    public override string GetValue() {
+      return Value.ToString(CultureInfo.CurrentCulture.NumberFormat);
     }
   }

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/Value.cs

@@ -26 +26 @@
 namespace HeuristicLab.Clients.OKB.RunCreation {
   public partial class Value {
+    public virtual string GetValue() {
+      return string.Empty;
+    }
+
     public static Value Create(string name, string strValue, string type) {
       switch (type) {