Changeset 13372 for branches/ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution

Timestamp:

11/24/15 17:22:41 (8 years ago)

Author:

mkommend

Message:

#2521: Fixed all problems.

File:

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

branches/ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/ArtificialAnt/GEArtificialAntProblem.cs

@@ -38 +38 @@
   [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 170)]
   [StorableClass]
-  public sealed class GEArtificialAntProblem : SingleObjectiveProblem<IntegerVectorEncoding>, IStorableContent {
-    public string Filename { get; set; }
+  public sealed class GEArtificialAntProblem : SingleObjectiveProblem<IntegerVectorEncoding, IntegerVector> {
 
     #region Parameter Properties
@@ -99 +98 @@
 
     private readonly object syncRoot = new object();
-    public override double Evaluate(Individual individual, IRandom random) {
-      var vector = individual.IntegerVector();
-
+    public override double Evaluate(IntegerVector solution, IRandom random) {
       var bounds = Encoding.Bounds;
       var len = Encoding.Length;
@@ -113 +110 @@
         fastRand = new FastRandom(random.Next());
       }
-      var tree = mapper.Map(fastRand, bounds, len, grammar, vector);
+      var tree = mapper.Map(fastRand, bounds, len, grammar, solution);
 
       Interpreter interpreter = new Interpreter(tree, World, MaxTimeSteps);
@@ -121 +118 @@
     }
 
-    public override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
+    public override void Analyze(IntegerVector[] solutions, double[] qualities, ResultCollection results, IRandom random) {
       var bounds = Encoding.Bounds;
       var len = Encoding.Length;
@@ -127 +124 @@
       var mapper = GenotypeToPhenotypeMapperParameter.Value;
 
-      var trees = individuals
-        .Select(ind => mapper.Map(random, bounds, len, grammar, ind.IntegerVector()))
+      var trees = solutions
+        .Select(ind => mapper.Map(random, bounds, len, grammar, ind))
         .ToArray();