Changeset 344 for trunk/sources/HeuristicLab.Functions

Timestamp:

06/26/08 14:59:06 (17 years ago)

Author:

gkronber

Message:

merged changes r338 r339 r340 r341 r342 r343 from the ticket-specific branch into the main trunk

Location:

trunk/sources/HeuristicLab.Functions

Files:

• BakedFunctionTree.cs (modified) (2 diffs)
• ModelAnalyzerExporter.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Functions/BakedFunctionTree.cs

@@ -286 +286 @@
         if(f.data.Count > 0) {
           XmlAttribute dataAttribute = document.CreateAttribute("Data");
-          dataAttribute.Value = GetString<double>(f.data);
+          dataAttribute.Value = GetString(f.data);
           entryNode.Attributes.Append(dataAttribute);
         }
@@ -311 +311 @@
     }
 
-    private string GetString<T>(IEnumerable<T> xs) where T : IConvertible {
+    private string GetString(IEnumerable<double> xs) {
       StringBuilder builder = new StringBuilder();
-      foreach(T x in xs) {
-        builder.Append(x.ToString(CultureInfo.InvariantCulture) + "; ");
+      foreach(double x in xs) {
+        builder.Append(x.ToString("r", CultureInfo.InvariantCulture) + "; ");
       }
       if(builder.Length > 0) builder.Remove(builder.Length - 2, 2);

trunk/sources/HeuristicLab.Functions/ModelAnalyzerExporter.cs

@@ -54 +54 @@
     public void Visit(Constant constant) {
       double value = ((ConstrainedDoubleData)currentBranch.GetLocalVariable(HeuristicLab.Functions.Constant.VALUE).Value).Data;
-      prefix += currentIndend + "[T]Constant(" + value + ";0;0)";
+      prefix += currentIndend + "[T]Constant(" + value.ToString("r") + ";0;0)";
     }
 
@@ -106 +106 @@
       double offset = ((ConstrainedIntData)currentBranch.GetLocalVariable(HeuristicLab.Functions.Variable.OFFSET).Value).Data;
 
-      prefix += currentIndend + "[T]Variable(" + weight + ";" + index + ";" + -offset + ")";
+      prefix += currentIndend + "[T]Variable(" + weight.ToString("r") + ";" + index + ";" + -offset + ")";
     }