Changeset 10022 for branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/GEArtificialAntProblem.cs

Timestamp:

10/03/13 22:47:11 (11 years ago)

Author:

sawinkle

Message:

#2109:

• simplified GEArtificialAntProblem and removed some unused code (e.g. parameter MaximumExpressionDepth is not necessary for an IntegerVector)
• extended GEEvaluator to perform a complete, recursive Genotype-To-Phenotype mapping (depth-first approach); currently no "wrapping" of the integer vector is possible; a full tree with the maximum possible nodes filled in is generated, dependent on the integer vector; the Interpreter, Analysers and other classes get reused

File:

• branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/GEArtificialAntProblem.cs (modified) (5 diffs)

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/GEArtificialAntProblem.cs

@@ -86 +86 @@
       get { return (IValueParameter<IntValue>)Parameters["MaximumExpressionLength"]; }
     }
-    public IValueParameter<IntValue> MaxExpressionDepthParameter {
-      get { return (IValueParameter<IntValue>)Parameters["MaximumExpressionDepth"]; }
-    }
     public IValueParameter<IntValue> MaxFunctionDefinitionsParameter {
       get { return (IValueParameter<IntValue>)Parameters["MaximumFunctionDefinitions"]; }
@@ -104 +101 @@
       get { return (IValueParameter<IntMatrix>)Parameters["Bounds"]; }
     }
-    
     #endregion
 
@@ -119 +115 @@
       get { return MaxExpressionLengthParameter.Value; }
       set { MaxExpressionLengthParameter.Value = value; }
-    }
-    public IntValue MaxExpressionDepth {
-      get { return MaxExpressionDepthParameter.Value; }
-      set { MaxExpressionDepthParameter.Value = value; }
     }
     public IntValue MaxFunctionDefinitions {
@@ -174 +166 @@
       : base(new GEEvaluator(), new UniformRandomIntegerVectorCreator()) {
       BoolMatrix world = new BoolMatrix(santaFeAntTrail);
-      Parameters.Add(new ValueParameter<IntValue>("MaximumExpressionLength", "Maximal length of the expression to control the artificial ant.", new IntValue(100)));
-      Parameters.Add(new ValueParameter<IntValue>("MaximumExpressionDepth", "Maximal depth of the expression to control the artificial ant.", new IntValue(10)));
+      Parameters.Add(new ValueParameter<IntValue>("MaximumExpressionLength", "Maximal length of the expression to control the artificial ant.", new IntValue(30)));
       Parameters.Add(new ValueParameter<IntValue>("MaximumFunctionDefinitions", "Maximal number of automatically defined functions in the expression to control the artificial ant.", new IntValue(3)));
       Parameters.Add(new ValueParameter<IntValue>("MaximumFunctionArguments", "Maximal number of arguments of automatically defined functions in the expression to control the artificial ant.", new IntValue(3)));
@@ -181 +172 @@
       Parameters.Add(new ValueParameter<BoolMatrix>("World", "The world for the artificial ant with scattered food items.", world));
       Parameters.Add(new ValueParameter<IntValue>("MaximumTimeSteps", "The number of time steps the artificial ant has available to collect all food items.", new IntValue(600)));
-      IntMatrix m = new IntMatrix(1,2);
-      m[0,0] = 1;
-      m[0,1] = 10;
-      Parameters.Add(new ValueParameter<IntMatrix>("Bounds", "", m));
+      IntMatrix m = new IntMatrix(new int[,]{{0,100}});
+      Parameters.Add(new ValueParameter<IntMatrix>("Bounds", "The integer number range in which the single genomes of a genotype are created.", m));
       
       Maximization.Value = true;