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

Timestamp:

06/12/17 14:11:43 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed bias 0 issue, PushExpressionFrequencyAnalyzer, Fixed probability for ERC settings, Fixed enable/disable instructions, Added expression descriptions

File:

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

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

@@ -10 +10 @@
   using HeuristicLab.Data;
   using HeuristicLab.Encodings.IntegerVectorEncoding;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Analyzer;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Problem.BenchmarkSuite;
@@ -40 +41 @@
       InitParameters();
       InitEncoding();
+      InitOperators();
     }
 
@@ -85 +87 @@
     private const string InitProgramLengthParameterName = "InitProgramLength";
     private const string InitProgramLengthParameterDescription = "This is the initial size of a push program.";
+    private const string PushConfigurationParameterName = "PushConfiguration";
 
     public const string CasesScopeParameterName = "CaseQualities";
@@ -96 +99 @@
       }
 
+      if (!Parameters.ContainsKey(PushConfigurationParameterName))
+        Parameters.Add(new ValueParameter<IReadOnlyPushConfiguration>(PushConfigurationParameterName, config) {
+          Hidden = true
+        });
+
       if (!Parameters.ContainsKey(InitProgramLengthParameterName)) {
         Parameters.Add(new FixedValueParameter<IntValue>(
@@ -123 +131 @@
       Encoding.Bounds[0, 1] = config.EnabledExpressions.Count;
       Encoding.Length = config.MaxPointsInProgram;
+    }
+
+    private void InitOperators() {
+      Operators.Add(new PushExpressionFrequencyAnalyzer());
     }