Changeset 11965 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Timestamp:

02/06/15 19:01:26 (10 years ago)

Author:

bburlacu

Message:

#1772: Merged trunk changes and updated the SymbolicDataAnalysisBottomUpDiversityAnalyzer.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Files:

• . (modified) (1 prop)
• 3.4/Crossovers/SubtreeCrossover.cs (modified) (1 diff)
• 3.4/Grammars/EmptySymbolicExpressionTreeGrammar.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs

@@ -109 +109 @@
         return parent0;
       } else {
-        var selectedBranch = SelectRandomBranch(random, allowedBranches, internalCrossoverPointProbability);
+        var selectedBranch = (ISymbolicExpressionTreeNode)SelectRandomBranch(random, allowedBranches, internalCrossoverPointProbability).Clone();
 
         if (crossoverPoint0.Child != null) {

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/EmptySymbolicExpressionTreeGrammar.cs

@@ -136 +136 @@
     }
     
-    #pragma warning disable 0169 //disable usage warning
+    #pragma warning disable 0067 //disable usage warning
     public event EventHandler Changed;
-    #pragma warning restore 0169
+    #pragma warning restore 0067
     #endregion
   }