Changeset 6569 for branches/QAPAlgorithms/HeuristicLab.Problems.ExternalEvaluation.GP

Timestamp:

07/17/11 22:51:11 (13 years ago)

Author:

abeham

Message:

#1541

• updated to latest trunk version

Location:

branches/QAPAlgorithms

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.ExternalEvaluation.GP/3.3/HeuristicLabProblemsExternalEvaluationGPPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Properties/AssemblyInfo.frame (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation.GP/3.4/ExternalEvaluationSymbolicExpressionTreeStringFormatter.cs (modified) (4 diffs)
• HeuristicLab.Problems.ExternalEvaluation.GP/3.4/HeuristicLabProblemsExternalEvaluationGPPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation.GP/3.4/Properties/AssemblyInfo.frame (modified) (1 diff)

branches/QAPAlgorithms

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/QAPAlgorithms/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/HeuristicLabProblemsExternalEvaluationGPPlugin.cs.frame

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.ExternalEvaluation.GP {
-  [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/QAPAlgorithms/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/Properties/AssemblyInfo.frame

@@ -34 +34 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

branches/QAPAlgorithms/HeuristicLab.Problems.ExternalEvaluation.GP/3.4/ExternalEvaluationSymbolicExpressionTreeStringFormatter.cs

@@ -28 +28 @@
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using System;
+using System.Globalization;
 
 namespace HeuristicLab.Problems.ExternalEvaluation.GP {
@@ -57 +58 @@
       StringBuilder strBuilder = new StringBuilder();
       if (Indent) strBuilder.Append(' ', indentLength);
-      strBuilder.Append("(");
-      // internal nodes or leaf nodes?
-      if (node.Subtrees.Count() > 0) {
-        // symbol on same line as '('
+      if (node.Subtrees.Count() > 0) { // internal node
+        strBuilder.Append("(");
         if (node.Symbol is Addition) {
           strBuilder.AppendLine("+");
@@ -98 +97 @@
         // each subtree expression on a new line
         // and closing ')' also on new line
-
         foreach (var subtree in node.Subtrees) {
           strBuilder.AppendLine(FormatRecursively(subtree, indentLength + 2));
@@ -107 +105 @@
         if (node is VariableTreeNode) {
           var varNode = node as VariableTreeNode;
-          // symbol in the same line with as '(' and ')'
-          strBuilder.Append(";" + varNode.VariableName + ";" + varNode.Weight.ToString("E4"));
-          strBuilder.Append(")");
+          strBuilder.AppendFormat("(* {0} {1})", varNode.VariableName, varNode.Weight.ToString("g17", CultureInfo.InvariantCulture));
         } else if (node is ConstantTreeNode) {
           var constNode = node as ConstantTreeNode;
-          // symbol in the same line with as '(' and ')'
-          strBuilder.Append(";" + constNode.Value.ToString("E4"));
-          strBuilder.Append(")");
+          strBuilder.Append(constNode.Value.ToString("g17", CultureInfo.InvariantCulture));
         } else {
           throw new NotSupportedException("Formatting of symbol: " + node.Symbol + " not supported for external evaluation.");

branches/QAPAlgorithms/HeuristicLab.Problems.ExternalEvaluation.GP/3.4/HeuristicLabProblemsExternalEvaluationGPPlugin.cs.frame

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.ExternalEvaluation.GP {
-  [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP", "Provides a symbolic expression tree grammar and formatters for external evaluation problems.", "3.4.0.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.ExternalEvaluation.GP", "Provides a symbolic expression tree grammar and formatters for external evaluation problems.", "3.4.1.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.ExternalEvaluation.GP-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/QAPAlgorithms/HeuristicLab.Problems.ExternalEvaluation.GP/3.4/Properties/AssemblyInfo.frame

@@ -34 +34 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.0.$WCREV$")]
+[assembly: AssemblyFileVersion("3.4.1.$WCREV$")]

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates