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

Timestamp:

07/19/17 12:55:58 (7 years ago)

Author:

pkimmesw

Message:

#2665 Started Plush Encoding, Added Zero Error Individual Count Analyzer

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

@@ -8 +8 @@
   using HeuristicLab.BenchmarkSuite.Problems;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Extensions;
 
   using Instances;
@@ -49 +48 @@
       Description = data.Description;
       BestKnownQuality = data.BestResult;
-      config.MaxPointsInProgram = data.MaxSize;
-      config.EvalPushLimit = data.EvalLimit;
-      config.ErcOptions = data.ErcOptions;
-      config.FloatStringFormat = data.FloatStringFormat;
+      Config.MaxPointsInProgram = data.MaxSize;
+      Config.EvalPushLimit = data.EvalLimit;
+      Config.ErcOptions = data.ErcOptions;
+      Config.FloatStringFormat = data.FloatStringFormat;
 
-      config.SetEnabledStacks((StackTypes)data.EnabledDataTypes);
-      data.InitInExpressions(config);
+      Config.SetEnabledStacks((StackTypes)data.EnabledDataTypes);
+      Config.InitInExpressions(data.TotalInputArgumentCount);
 
       Encoding.Bounds[0, 0] = 0;
-      Encoding.Bounds[0, 1] = config.EnabledExpressions.Count;
+      Encoding.Bounds[0, 1] = Config.EnabledExpressions.Count;
 
-      InitProgramLength = data.MaxSize / 2;
+      Encoding.Length = data.MaxSize;
     }
 
@@ -67 +66 @@
       double bestQuality,
       IRandom random,
-      IReadOnlyPushConfiguration config,
-      IPushEvaluator evaluator) {
-      return new PushBenchmarkSuiteSolution(program, bestQuality, random, (IReadOnlyPushConfiguration)config.Clone(), (PushBenchmarkSuiteEvaluator)PushEvaluator.Clone());
+      IReadOnlyPushConfiguration config) {
+      return new PushBenchmarkSuiteSolution(program, bestQuality, random, config, (PushBenchmarkSuiteEvaluator)PushEvaluator.Clone());
     }
   }