Changeset 3875 for trunk

Timestamp:

05/31/10 15:51:50 (14 years ago)

Author:

gkronber

Message:

Fixed bug: ChangeNodeTypeManipulation created tree nodes with disabled symbols (InitialFrequency == 0). #1016

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Manipulators/ChangeNodeTypeManipulation.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Manipulators/ChangeNodeTypeManipulation.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System;
+using System.Collections.Generic;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Manipulators {
@@ -65 +68 @@
         return;
       }
-      var newSymbol = constrainedSymbols.SelectRandom(random);
+      var newSymbol = SelectRandomSymbol(random, constrainedSymbols);
 
       // replace the old node with the new node
@@ -77 +80 @@
       success = true;
     }
+
+    private static Symbol SelectRandomSymbol(IRandom random, IEnumerable<Symbol> symbols) {
+      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) {
+          return symbolList[i];
+        }
+      }
+      // this should never happen
+      throw new ArgumentException("There is a problem with the initial frequency setting of allowed symbols.");
+    }
   }
 }