Changeset 4239 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols

Timestamp:

08/17/10 08:19:31 (14 years ago)

Author:

gkronber

Message:

Merged improvements of symbolic simplifier (revisions: r4220, r4226, r4235:4238) back into trunk. #1026

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.3/Symbolic/Symbols/VariableTreeNode.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableTreeNode.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -80 +81 @@
 
     public override string ToString() {
-      return weight.ToString("E4") + " " + variableName;
+      if (weight.IsAlmost(1.0)) return variableName;
+      else return weight.ToString("E4") + " " + variableName;
     }
   }