Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PushProblem.cs

Timestamp:

04/18/17 01:15:25 (7 years ago)

Author:

pkimmesw

Message:

#2665 BenchmarkSuite, all examples, partially tested, VectorExpressions added

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PushProblem.cs (modified) (10 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PushProblem.cs

@@ -12 +12 @@
   using Expressions;
   using HeuristicLab.Data;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Erc;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc;
 
   using Instances;
@@ -25 +25 @@
   [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 180)]
   [Item("Push Problem", "")]
-  public class PushProblem : SingleObjectiveBasicProblem<IntegerVectorEncoding>, IProblemInstanceConsumer<Data> {
+  public class PushProblem : SingleObjectiveBasicProblem<IntegerVectorEncoding>, IProblemInstanceConsumer<ProblemData> {
     [Storable]
     private readonly PushConfiguration config;
@@ -32 +32 @@
 
     public const string CaseQualitiesScopeParameterName = "CaseQualities";
+    private const string BestTrainingSolutionResultName = "Best Solution";
+    private const string TestQualityResultName = "Test Quality";
 
     public PushProblem() {
@@ -63 +65 @@
     private void InitData() {
       pool = new PushInterpreterPool(Environment.ProcessorCount * 2, 4096, 1024, config);
-
-      //var solutionCreator = new PointsBasedPushProgramCreator(config.ErcOptions);
-      //SolutionCreator = solutionCreator;
-      //Encoding.SolutionCreator = solutionCreator;
     }
 
@@ -93 +91 @@
     private const string TopLevelPopCodeParameterName = "TopLevelPopCode";
     private const string TopLevelPopCodeParameterDescription = "When TRUE, the CODE stack will be popped at the end of top level calls to the interpreter. The default is FALSE.";
-    private const string MinRandomIntegerParameterName = "MinRandomInteger";
-    private const string MinRandomIntegerParameterDescription = "The minimum INTEGER that will be produced as an ephemeral random INTEGER constant or from a call to INTEGER.RAND.";
-    private const string MaxRandomIntegerParameterName = "MaxRandomInteger";
-    private const string MaxRandomIntegerParameterDescription = "The maximum INTEGER that will be produced as an ephemeral random INTEGER constant or from a call to INTEGER.RAND.";
-    private const string MinRandomFloatParameterName = "MinRandomFloat";
-    private const string MinRandomFloatParameterDescription = "The minimum FLOAT that will be produced as an ephemeral random FLOAT constant or from a call to FLOAT.RAND.";
-    private const string MaxRandomFloatParameterName = "MaxRandomFloat";
-    private const string MaxRandomFloatParameterDescription = "The maximum FLOAT that will be produced as an ephemeral random FLOAT constant or from a call to FLOAT.RAND.";
-    private const string NewErcNameProbabilityParameterName = "NewErcNameProbability";
-    private const string NewErcNameProbabilityParameterDescription = "The probability that the selection of the ephemeral random NAME constant for inclusion in randomly generated code will produce a new name.";
     private const string MaxPointsInRandomInstructionParameterName = "MaxPointsInRandomInstruction";
     private const string MaxPointsInRandomInstructionParameterDescription = "MaxPointsInRandomInstruction";
@@ -117 +105 @@
         config));
 
-      Parameters.Add(new ValueParameter<Data>(
+      Parameters.Add(new ValueParameter<ProblemData>(
         DataParameterName,
         DataParameterDescription));
 
-      Parameters.Add(new FixedValueParameter<ErcOptions>(ErcOptionsParameterName, config.ErcOptions));
+      Parameters.Add(new ValueParameter<ErcOptions>(ErcOptionsParameterName, config.ErcOptions));
 
       Parameters.Add(new FixedValueParameter<IntValue>(
@@ -188 +176 @@
     }
 
-    public IValueParameter<Data> DataParameter
-    {
-      get { return (IValueParameter<Data>)Parameters[DataParameterName]; }
-    }
-
-    public Data Data
+    public IValueParameter<ProblemData> DataParameter
+    {
+      get { return (IValueParameter<ProblemData>)Parameters[DataParameterName]; }
+    }
+
+    public ProblemData Data
     {
       get { return DataParameter.Value; }
@@ -356 +344 @@
 
     public override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
-      const string bestSolutionResultName = "Best Solution";
       var bestQuality = Maximization ? qualities.Max() : qualities.Min();
       var bestIdx = Array.IndexOf(qualities, bestQuality);
-      var bestIndividual = individuals[bestIdx];
-      var solution = new PushSolution(bestIndividual.IntegerVector(), bestQuality, Data, random, config, DataBounds.TrainingRange.Start, DataBounds.TrainingRange.End);
-
-      if (!results.ContainsKey(bestSolutionResultName)) {
-        results.Add(new Result(bestSolutionResultName, solution));
+      var bestIndividual = individuals[bestIdx].IntegerVector();
+
+      var isIndividualBetter = AnalyzeBestTrainingSolution(bestIndividual, bestQuality, results, random);
+
+      if (isIndividualBetter) {
+        AnalyzeBestTestSolution(bestIndividual, results, random);
+      }
+    }
+
+    private void AnalyzeBestTestSolution(IntegerVector bestIndividual, ResultCollection results, IRandom random) {
+      var program = bestIndividual.ToPushProgram(config, randomPool);
+      var trainingResult = PushEvaluator.Evaluate(program, pool, random, Data, DataBounds.TestRange.Start, DataBounds.TestRange.End);
+
+      if (!results.ContainsKey(TestQualityResultName)) {
+        results.Add(new Result(TestQualityResultName, new DoubleValue(trainingResult.TotalQuality)));
       } else {
-        var currentBestQuality = ((PushSolution)results[bestSolutionResultName].Value).Quality;
-
-        if (Maximization && currentBestQuality < bestQuality ||
-           !Maximization && currentBestQuality > bestQuality) {
-          results[bestSolutionResultName].Value = solution;
-        }
-      }
+        ((DoubleValue)results[TestQualityResultName].Value).Value = trainingResult.TotalQuality;
+      }
+    }
+
+    private bool AnalyzeBestTrainingSolution(IntegerVector bestIndividual, double bestQuality, ResultCollection results, IRandom random) {
+      var solution = new PushSolution(bestIndividual, bestQuality, Data, random, config, DataBounds.TrainingRange.Start, DataBounds.TrainingRange.End);
+
+      if (!results.ContainsKey(BestTrainingSolutionResultName)) {
+        results.Add(new Result(BestTrainingSolutionResultName, solution));
+        return true;
+      }
+
+      var currentBestQuality = ((PushSolution)results[BestTrainingSolutionResultName].Value).Quality;
+
+      if (Maximization && currentBestQuality < bestQuality ||
+         !Maximization && currentBestQuality > bestQuality) {
+        results[BestTrainingSolutionResultName].Value = solution;
+        return true;
+      }
+
+      return false;
     }
 
@@ -389 +400 @@
     }
 
-    public void Load(Data data) {
+    public void Load(ProblemData data) {
       Data = data;
       BestKnownQuality = data.BestResult;
       MaxPointsInProgram = data.MaxSize;
       EvalPushLimit = data.EvalLimit;
+      ErcOptions = data.ErcOptions;
 
       config.EnabledExpressions = (IList<string>)ExpressionTable.GetExpressionsByStackTypes((StackTypes)data.EnabledDataTypes);
@@ -408 +420 @@
 
       DataBounds.TrainingRange.Start = 0;
-      DataBounds.TrainingRange.End = Data.OriginalTrainingCount;
-      DataBounds.TestRange.Start = Data.OriginalTrainingCount;
-      DataBounds.TestRange.End = Data.OriginalTrainingCount + Data.OriginalTestCount;
+      DataBounds.TrainingRange.End = Data.TrainingCount;
+      DataBounds.TestRange.Start = Data.TrainingCount;
+      DataBounds.TestRange.End = Data.TrainingCount + Data.TestCount;
     }
   }