Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/PushBenchmarkSuiteProblem.cs

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/PushBenchmarkSuiteProblem.cs (modified) (3 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/PushBenchmarkSuiteProblem.cs

@@ -5 +5 @@
 
   using HeuristicLab.BenchmarkSuite;
-  using HeuristicLab.Encodings.IntegerVectorEncoding;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
 
   using Instances;
@@ -38 +38 @@
       PushEvaluator.LoadData(data);
 
-      BestKnownQuality = data.BestResult;
-      MaxPointsInProgram = data.MaxSize;
-      MinPointsInProgram = data.MaxSize;
-      EvalPushLimit = data.EvalLimit;
-      ErcOptions = data.ErcOptions;
       Name = "Push Problem: " + data.Name;
       Description = data.Description;
+      BestKnownQuality = data.BestResult;
+      config.MaxPointsInProgram = data.MaxSize;
+      config.EvalPushLimit = data.EvalLimit;
+      config.ErcOptions = data.ErcOptions;
+      config.FloatStringFormat = data.FloatStringFormat;
 
       config.SetEnabledStacks((StackTypes)data.EnabledDataTypes);
@@ -50 +50 @@
       Encoding.Bounds[0, 0] = 0;
       Encoding.Bounds[0, 1] = config.EnabledExpressions.Count;
-      Encoding.Length = config.MaxPointsInProgram;
+
+      InitProgramLength = data.MaxSize / 2;
     }
 
     protected override PushSolution CreatePushSolution(
-      IntegerVector vector,
+      PushProgram program,
       double bestQuality,
       IRandom random,
       IReadOnlyPushConfiguration config,
       IPushEvaluator evaluator) {
-      return new PushBenchmarkSuiteSolution(vector, bestQuality, random, (IReadOnlyPushConfiguration)config.Clone(), (PushBenchmarkSuiteEvaluator)PushEvaluator.Clone());
+      return new PushBenchmarkSuiteSolution(program, bestQuality, random, (IReadOnlyPushConfiguration)config.Clone(), (PushBenchmarkSuiteEvaluator)PushEvaluator.Clone());
     }
   }