Changeset 16946 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean

Timestamp:

05/13/19 13:59:30 (6 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes up to r16945 into branch.

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/MultiplexerProblem.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/MultiplexerProblem.cs

@@ -86 +86 @@
         new IntValue(11)));
 
-      Encoding.TreeLength = 100;
-      Encoding.TreeDepth = 17;
+      var g = new SimpleSymbolicExpressionGrammar(); // will be replaced in update grammar
+      Encoding = new SymbolicExpressionTreeEncoding(g, 100, 17);
+      Encoding.GrammarParameter.ReadOnly = true;
+
       UpdateGrammar();
       RegisterEventHandlers();
@@ -109 +111 @@
         g.AddTerminalSymbol(string.Format("d{0}", i));
 
+      Encoding.GrammarParameter.ReadOnly = false;
       Encoding.Grammar = g;
+      Encoding.GrammarParameter.ReadOnly = true;
 
       BestKnownQuality = Math.Pow(2, NumberOfBits); // this is a benchmark problem (the best achievable quality is known for a given number of bits)