Changeset 14897 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfiguration.cs

Timestamp:

04/28/17 22:52:08 (8 years ago)

Author:

pkimmesw

Message:

#2665 Dynamic ErcValues, Separate Push from BenchmarkSuite Push

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfiguration.cs (modified) (8 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfiguration.cs

@@ -5 +5 @@
   using Attributes;
   using Base.Erc;
-  using Base.Erc.Interfaces;
   using Common;
   using Core;
@@ -14 +13 @@
   [StorableClass]
   public class PushConfiguration : ParameterizedNamedItem, IReadOnlyPushConfiguration, IEnabledExpressionsConfiguration {
-
-
-
     public PushConfiguration() {
       Name = "Push Configuration";
@@ -25 +21 @@
       ErcOptions = new ErcOptions();
       EvalPushLimit = 1024;
-      MaxPointsInProgram = 128;
+      MinPointsInProgram = 25;
+      MaxPointsInProgram = 200;
       TopLevelPushCode = true;
       TopLevelPopCode = false;
       MaxPointsInRandomExpression = 64;
-      MaxStringLength = 32;
+      MaxStringLength = 128;
       MaxVectorLength = 64;
       MaxDepth = 32;
@@ -38 +35 @@
     private void InitEnabledStacks(bool state = true) {
       foreach (StackTypes type in Enum.GetValues(typeof(StackTypes))) {
-        if (!enabledStacks.ContainsKey(type))
+        if (!enabledStacks.ContainsKey(type) && type != StackTypes.None)
           enabledStacks.Add(type, state);
       }
@@ -54 +51 @@
       ErcOptions = cloner.Clone(origin.ErcOptions);
       EvalPushLimit = origin.EvalPushLimit;
+      MinPointsInProgram = origin.MinPointsInProgram;
       MaxPointsInProgram = origin.MaxPointsInProgram;
       MaxPointsInRandomExpression = origin.MaxPointsInRandomExpression;
@@ -72 +70 @@
 
     [Storable]
-    private Dictionary<StackTypes, bool> enabledStacks;
+    private readonly Dictionary<StackTypes, bool> enabledStacks;
 
     public IReadOnlyDictionary<StackTypes, bool> EnabledStacks { get { return enabledStacks; } }
@@ -122 +120 @@
 
     /// <summary>
+    ///     This is the minimum size of an item on the CODE stack, expressed as a number of points.
+    ///     A point is an instruction, a literal, or a pair of parentheses. Any instruction that would cause this limit to be
+    ///     exceeded should instead act as a NOOP, leaving all stacks in the states that they were in before the execution of the
+    ///     instruction.
+    /// </summary>
+    [Storable]
+    public int MinPointsInProgram { get; set; }
+
+    /// <summary>
     ///     This is the maximum size of an item on the CODE stack, expressed as a number of points.
     ///     A point is an instruction, a literal, or a pair of parentheses. Any instruction that would cause this limit to be
-    ///     exceeded
-    ///     should instead act as a NOOP, leaving all stacks in the states that they were in before the execution of the
+    ///     exceeded should instead act as a NOOP, leaving all stacks in the states that they were in before the execution of the
     ///     instruction.
     /// </summary>
@@ -155 +161 @@
     [Storable]
     public int MaxVectorLength { get; set; }
+
+
+    public void SetEnabledStacks(StackTypes types) {
+      // Disable all
+      EnabledExpressions.Clear();
+
+      // Enable those are required
+      foreach (StackTypes type in Enum.GetValues(types.GetType())) {
+        if (type == StackTypes.None) continue;
+
+        enabledStacks[type] = false;
+
+        if (types.HasFlag(type))
+          EnableStack(type, true);
+      }
+    }
 
     public void EnableExpressionOfStack(StackTypes types) {