Changeset 11504 for trunk

Timestamp:

10/27/14 13:24:03 (10 years ago)

Author:

mkommend

Message:

#2268: Set ADF grammar parameters to the correct during problem creation and disabled a warning in EmtpySymbolicExpressionTreeGrammar.

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/EmptySymbolicExpressionTreeGrammar.cs (modified) (1 diff)
• HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.LawnMower/3.3/Problem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/EmptySymbolicExpressionTreeGrammar.cs

@@ -128 +128 @@
       throw new NotSupportedException();
     }
-
+    
+    #pragma warning disable 0169 //disable usage warning
     public event EventHandler Changed;
+    #pragma warning restore 0169
     #endregion
   }

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs

@@ -180 +180 @@
       InitializeOperators();
       RegisterEventHandlers();
+
+      ArtificialAntExpressionGrammar.MaximumFunctionDefinitions = MaxFunctionDefinitions.Value;
+      ArtificialAntExpressionGrammar.MaximumFunctionArguments = MaxFunctionArguments.Value;
     }
 

trunk/sources/HeuristicLab.Problems.LawnMower/3.3/Problem.cs

@@ -86 +86 @@
                      new Grammar()));
       Maximization.Value = true;
-      InitializeOperators();
-
+
+      GrammarParameter.Value.MaximumFunctionDefinitions = MaxFunctionDefinitionsParameter.Value.Value;
+      GrammarParameter.Value.MaximumFunctionArguments = MaxArgumentDefinitionsParameter.Value.Value;
+
+      InitializeOperators();      
       RegisterEventHandlers();
     }