Changeset 15289 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Analyzer/PushExpressionFrequencyAnalyzer.cs

Timestamp:

07/26/17 19:34:13 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed analyzer, fixed Plush encoding + operators, adpated print evaluation according to McPhee

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/Analyzer/PushExpressionFrequencyAnalyzer.cs (modified) (8 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Analyzer/PushExpressionFrequencyAnalyzer.cs

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Analyzer {
   using System;
+  using System.Collections.Generic;
   using System.Linq;
 
@@ -14 +15 @@
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Encoding;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Individual;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.ObjectPools.Random;
 
   /// <summary>
@@ -24 +25 @@
   [StorableClass]
   public class PushExpressionFrequencyAnalyzer : SingleSuccessorOperator, IPushExpressionAnalyzer {
-    private readonly SeededRandomPool randomPool = new SeededRandomPool();
 
     private const string PUSH_CONFIGURATION_PARAMETER_NAME = "PushConfiguration";
@@ -40 +40 @@
       Parameters.Add(new LookupParameter<IReadOnlyPushConfiguration>(PUSH_CONFIGURATION_PARAMETER_NAME, "The current specified push configuration."));
       Parameters.Add(new ScopeTreeLookupParameter<IntegerVector>(INTEGER_VECTOR_PARAMETER_NAME, "The integer vectors to analyze."));
+      Parameters.Add(new ScopeTreeLookupParameter<PlushVector>("Plush", "The plush vectors to analyze."));
       Parameters.Add(new LookupParameter<DataTable>(EXPRESSION_FREQUENCIES_PARAMETER_NAME, "The data table to store the instruction frequencies."));
       Parameters.Add(new LookupParameter<ResultCollection>(RESULTS_PARAMETER_NAME, "The result collection where the symbol frequencies should be stored."));
@@ -60 +61 @@
     {
       get { return (ILookupParameter<IReadOnlyPushConfiguration>)Parameters[PUSH_CONFIGURATION_PARAMETER_NAME]; }
+    }
+
+    public IScopeTreeLookupParameter<PlushVector> PlushVectorParameter
+    {
+      get { return (IScopeTreeLookupParameter<PlushVector>)Parameters["Plush"]; }
     }
 
@@ -95 +101 @@
     public override IOperation Apply() {
       var config = PushConfigurationParameter.ActualValue;
-      var integerVectors = IntegerVectorParameter.ActualValue;
 
-      randomPool.Seed = config.Seed;
+      IReadOnlyList<PushProgram> pushPrograms = null;
 
-      var pushPrograms = integerVectors.Select(iv => {
-        var random = randomPool.ResetAndAllocate();
-        var program = iv.ToPushProgram(config, random);
-        randomPool.Free(random);
-
-        return program;
-      });
+      if (IntegerVectorParameter.ActualValue.Length > 0) {
+        pushPrograms = IntegerVectorParameter.ActualValue.Select(iv => iv.ToPushProgram(config)).ToList();
+      } else if (PlushVectorParameter.ActualValue.Length > 0) {
+        pushPrograms = PlushVectorParameter.ActualValue.Select(pv => pv.PushProgram).ToList();
+      } else {
+        // nothing to do
+        return base.Apply();
+      }
 
       var results = ResultsParameter.ActualValue;
@@ -136 +142 @@
           group => group.Count());
 
-      var totalNumberofExpressions = Math.Max(1.0, expressionFrequencies.Values.Sum());
+      var totalNumberOfExpressions = Math.Max(1.0, expressionFrequencies.Values.Sum());
 
       // all rows must have the same number of values so we can just take the first
@@ -152 +158 @@
         }
 
-        frequencies.Rows[pair.Key].Values.Add(Math.Round(pair.Value / totalNumberofExpressions, 3));
+        frequencies.Rows[pair.Key].Values.Add(Math.Round(pair.Value / totalNumberOfExpressions, 3));
       }