Changeset 3825 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

05/17/10 16:08:53 (14 years ago)

Author:

gkronber

Message:

Fixed a minor bug in the probabilistic tree creator. #1014

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Creators/ProbabilisticTreeCreator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Creators/ProbabilisticTreeCreator.cs

@@ -90 +90 @@
         // try a different size MAX_TRIES times
       }
-      throw new ArgumentException("Couldn't create a valid tree with the specified constraints.");
+      throw new ArgumentException("Couldn't create a random valid tree.");
     }
 
@@ -234 +234 @@
       var symbolList = symbols.ToList();
       var ticketsSum = symbolList.Select(x => x.InitialFrequency).Sum();
+      if (ticketsSum == 0.0) throw new ArgumentException("The initial frequency of all allowed symbols is zero.");
       var r = random.NextDouble() * ticketsSum;
       double aggregatedTickets = 0;
       for (int i = 0; i < symbolList.Count; i++) {
         aggregatedTickets += symbolList[i].InitialFrequency;
-        if (aggregatedTickets >= r) {
+        if (aggregatedTickets > r) {
           return symbolList[i];
         }
       }
       // this should never happen
-      throw new ArgumentException();
+      throw new ArgumentException("There is a problem with the initial frequency setting of allowed symbols.");
     }