Changeset 15132 for stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableTreeNodeBase.cs

Timestamp:

07/06/17 10:22:27 (7 years ago)

Author:

gkronber

Message:

#2650: merged r14827, r14829:14832 from trunk to stable

File:

• stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableTreeNodeBase.cs (modified) (1 diff)

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableTreeNodeBase.cs

@@ -79 +79 @@
       }
 
-      if (Symbol.VariableChangeProbability >= 1.0 || random.NextDouble() < Symbol.VariableChangeProbability) {
-        var oldName = variableName;
+      if (Symbol.VariableChangeProbability >= 1.0) {
+        // old behaviour for backwards compatibility
+        #region Backwards compatible code, remove with 3.4
 #pragma warning disable 612, 618
         variableName = Symbol.VariableNames.SelectRandom(random);
 #pragma warning restore 612, 618
+        #endregion
+      } else if (random.NextDouble() < Symbol.VariableChangeProbability) {
+        var oldName = variableName;
+        variableName = Symbol.VariableNames.SampleRandom(random);
         if (oldName != variableName) {
+          // re-initialize weight if the variable is changed
           weight = NormalDistributedRandom.NextDouble(random, Symbol.WeightMu, Symbol.WeightSigma);
         }