Changeset 15273 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Analyzer/PushExpressionFrequencyAnalyzer.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/Analyzer/PushExpressionFrequencyAnalyzer.cs (modified) (8 diffs)

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

@@ -12 +12 @@
   using HeuristicLab.Parameters;
   using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Individual;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.ObjectPools.Random;
 
   /// <summary>
@@ -22 +24 @@
   [StorableClass]
   public class PushExpressionFrequencyAnalyzer : SingleSuccessorOperator, IPushExpressionAnalyzer {
+    private readonly SeededRandomPool randomPool = new SeededRandomPool();
 
-    private const string PushConfigurationParameterName = "PushConfiguration";
-    private const string IntegerVectorParameterName = "IntegerVector";
-    private const string ResultsParameterName = "Results";
-    private const string ExpressionFrequenciesParameterName = "InstructionFrequencies";
-    private const string AggregateStackTypesParameterName = "Aggregate stack types";
+    private const string PUSH_CONFIGURATION_PARAMETER_NAME = "PushConfiguration";
+    private const string INTEGER_VECTOR_PARAMETER_NAME = "IntegerVector";
+    private const string RESULTS_PARAMETER_NAME = "Results";
+    private const string EXPRESSION_FREQUENCIES_PARAMETER_NAME = "InstructionFrequencies";
+    private const string AGGREGATE_STACK_TYPES_PARAMETER_NAME = "Aggregate stack types";
+    private const string IN_EXPRESSION_GROUP_NAME = "IN";
+    private const string RANDOM_PARAMETER_NAME = "Random";
+    private const string RESULT_PARAMETER_NAME = "Instruction frequencies";
+    private const string RESULT_PARAMETER_DESCRIPTION = "Relative frequency of instructions aggregated over the whole population.";
+    private const string Y_AXIS_TITLE = "Relative Instruction Frequency";
 
     public PushExpressionFrequencyAnalyzer() {
-      Parameters.Add(new LookupParameter<IReadOnlyPushConfiguration>(PushConfigurationParameterName, "The current specified push configuration."));
-      Parameters.Add(new ScopeTreeLookupParameter<IntegerVector>(IntegerVectorParameterName, "The integer vectors to analyze."));
-      Parameters.Add(new LookupParameter<DataTable>(ExpressionFrequenciesParameterName, "The data table to store the instruction frequencies."));
-      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The result collection where the symbol frequencies should be stored."));
+      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 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."));
 
-      Parameters.Add(new FixedValueParameter<BoolValue>(AggregateStackTypesParameterName, "Determines if expressions should be aggregated by their primary stack type.", new BoolValue(true)));
+      Parameters.Add(new FixedValueParameter<BoolValue>(AGGREGATE_STACK_TYPES_PARAMETER_NAME, "Determines if expressions should be aggregated by their primary stack type.", new BoolValue(true)));
     }
 
@@ -51 +59 @@
     public ILookupParameter<IReadOnlyPushConfiguration> PushConfigurationParameter
     {
-      get { return (ILookupParameter<IReadOnlyPushConfiguration>)Parameters[PushConfigurationParameterName]; }
+      get { return (ILookupParameter<IReadOnlyPushConfiguration>)Parameters[PUSH_CONFIGURATION_PARAMETER_NAME]; }
     }
 
     public IScopeTreeLookupParameter<IntegerVector> IntegerVectorParameter
     {
-      get { return (IScopeTreeLookupParameter<IntegerVector>)Parameters[IntegerVectorParameterName]; }
+      get { return (IScopeTreeLookupParameter<IntegerVector>)Parameters[INTEGER_VECTOR_PARAMETER_NAME]; }
     }
 
     public ILookupParameter<DataTable> ExpressionFrequenciesParameter
     {
-      get { return (ILookupParameter<DataTable>)Parameters[ExpressionFrequenciesParameterName]; }
+      get { return (ILookupParameter<DataTable>)Parameters[EXPRESSION_FREQUENCIES_PARAMETER_NAME]; }
+    }
+
+    public ILookupParameter<IRandom> RandomParameter
+    {
+      get { return (ILookupParameter<IRandom>)Parameters[RANDOM_PARAMETER_NAME]; }
     }
 
     public ILookupParameter<ResultCollection> ResultsParameter
     {
-      get { return (ILookupParameter<ResultCollection>)Parameters[ResultsParameterName]; }
+      get { return (ILookupParameter<ResultCollection>)Parameters[RESULTS_PARAMETER_NAME]; }
     }
 
     public IValueParameter<BoolValue> AggregateStackTypesParameter
     {
-      get { return (IValueParameter<BoolValue>)Parameters[AggregateStackTypesParameterName]; }
+      get { return (IValueParameter<BoolValue>)Parameters[AGGREGATE_STACK_TYPES_PARAMETER_NAME]; }
     }
 
@@ -80 +93 @@
     }
 
-
     public override IOperation Apply() {
       var config = PushConfigurationParameter.ActualValue;
       var integerVectors = IntegerVectorParameter.ActualValue;
-      var pushPrograms = integerVectors.Select(iv => iv.ToPushProgram(config));
+
+      randomPool.Seed = config.Seed;
+
+      var pushPrograms = integerVectors.Select(iv => {
+        var random = randomPool.ResetAndAllocate();
+        var program = iv.ToPushProgram(config, random);
+        randomPool.Free(random);
+
+        return program;
+      });
 
       var results = ResultsParameter.ActualValue;
@@ -91 +112 @@
       if (frequencies == null) {
         frequencies = new DataTable(
-          "Instruction frequencies",
-          "Relative frequency of instructions aggregated over the whole population.") {
+          RESULT_PARAMETER_NAME,
+          RESULT_PARAMETER_DESCRIPTION) {
           VisualProperties = {
-            YAxisTitle = "Relative Instruction Frequency"
+            YAxisTitle = Y_AXIS_TITLE
           }
         };
 
         ExpressionFrequenciesParameter.ActualValue = frequencies;
-        results.Add(new Result("Instruction frequencies", frequencies));
+        results.Add(new Result(RESULT_PARAMETER_NAME, frequencies));
       }
 
@@ -110 +131 @@
 
       var expressionFrequencies = allExpressions
-        .GroupBy(x => AggregateStackTypes
-          ? x.Attribute.StackType.ToString()
-          : x.Attribute.Name)
+        .GroupBy(x => GetGroupName(x.Attribute, AggregateStackTypes))
         .ToDictionary(
           group => group.Key,
@@ -126 +145 @@
           var row = new DataRow(pair.Key, string.Empty, Enumerable.Repeat(0.0, numberOfValues)) {
             VisualProperties = {
-              StartIndexZero = true
+              StartIndexZero = true,
             }
           };
@@ -142 +161 @@
       return base.Apply();
     }
+
+    private string GetGroupName(PushExpressionAttribute attribute, bool aggregateStackTypes) {
+      if (aggregateStackTypes) {
+        return attribute.IsInExpression
+         ? IN_EXPRESSION_GROUP_NAME
+         : attribute.StackType.ToString();
+      }
+
+      return attribute.Name;
+    }
   }
 }