Changeset 7671 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Timestamp:

03/30/12 10:17:16 (12 years ago)

Author:

mkommend

Message:

#1722: Minor configurations changes in variable condition symbol

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Files:

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

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableCondition.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  [Item("Variable Condition", "Represents a condition that tests a given variable.")]
+  [Item("Variable Condition", "Represents a condition that tests a given variable against a specified threshold.")]
   public sealed class VariableCondition : Symbol {
     #region properties
@@ -182 +182 @@
       variableNames = new List<string>();
 
-      slopeInitializerMu = 1.0;
-      slopeInitializerSigma = 0.05;
+      slopeInitializerMu = 0.0;
+      slopeInitializerSigma = 0.0;
       slopeManipulatorMu = 0.0;
-      slopeManipulatorSigma = 0.05;
+      slopeManipulatorSigma = 0.0;
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableConditionTreeNode.cs

@@ -88 +88 @@
 
     public override string ToString() {
-      return variableName + " > " + threshold.ToString("E4") + Environment.NewLine +
-        "slope: " + slope.ToString("E4");
+      if (slope.IsAlmost(0.0))
+        return variableName + " > " + threshold.ToString("E4") + Environment.NewLine +
+          "slope: " + slope.ToString("E4");
+      else
+        return variableName + " > " + threshold.ToString("E4");
     }
   }