Changeset 12891 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDuplicater.cs

Timestamp:

08/22/15 14:27:37 (9 years ago)

Author:

bburlacu

Message:

#1772: Merge trunk changes. Remove dead code from the genealogy analyzer.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Files:

• . (modified) (1 prop)
• 3.4/ArchitectureManipulators/ArgumentDuplicater.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDuplicater.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -56 +57 @@
       ISymbolicExpressionTree symbolicExpressionTree,
       int maxFunctionDefinitions, int maxFunctionArguments) {
-      var functionDefiningBranches = symbolicExpressionTree.IterateNodesPrefix().OfType<DefunTreeNode>();
+      var functionDefiningBranches = symbolicExpressionTree.IterateNodesPrefix().OfType<DefunTreeNode>().ToList();
 
       var allowedArgumentIndexes = Enumerable.Range(0, maxFunctionArguments);
-      if (functionDefiningBranches.Count() == 0)
+      if (!functionDefiningBranches.Any())
         // no function defining branches => abort
         return false;
 
-      var selectedDefunBranch = functionDefiningBranches.SelectRandom(random);
-      var argumentSymbols = selectedDefunBranch.Grammar.Symbols.OfType<Argument>();
-      if (argumentSymbols.Count() == 0 || argumentSymbols.Count() >= maxFunctionArguments)
+      var selectedDefunBranch = functionDefiningBranches.SampleRandom(random);
+
+      var argumentSymbols = selectedDefunBranch.Grammar.Symbols.OfType<Argument>().ToList();
+      if (!argumentSymbols.Any() || argumentSymbols.Count() >= maxFunctionArguments)
         // when no argument or number of arguments is already at max allowed value => abort
         return false;
-      var selectedArgumentSymbol = argumentSymbols.SelectRandom(random);
+
+      var selectedArgumentSymbol = argumentSymbols.SampleRandom(random);
       var takenIndexes = argumentSymbols.Select(s => s.ArgumentIndex);
       var newArgumentIndex = allowedArgumentIndexes.Except(takenIndexes).First();