Changeset 5796 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols

Timestamp:

03/22/11 16:45:46 (14 years ago)

Author:

mkommend

Message:

#1418: Merged trunk changes into branch.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols

Files:

• VariableCondition.cs (modified) (1 diff)
• VariableConditionTreeNode.cs (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableCondition.cs

@@ -144 +144 @@
     #region persistence and cloning
     [StorableConstructor]
-    private VariableCondition(bool deserializing) : base(deserializing) { }
+    private VariableCondition(bool deserializing)
+      : base(deserializing) {
+      variableNames = new List<string>();
+    }
     private VariableCondition(VariableCondition original, Cloner cloner)
       : base(original, cloner) {

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableConditionTreeNode.cs

@@ -88 +88 @@
 
     public override string ToString() {
-      return variableName + " > " + threshold.ToString("E4") + Environment.NewLine +
-        "slope: " + slope.ToString("E4");
+      string thresholdString = threshold > 0 ? "+" + threshold.ToString("E4") : threshold.ToString("E4");
+      return "Sigmoid " + "(" + slope.ToString("E4") + ", " + variableName + thresholdString + ")";
     }
   }