Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration

Timestamp:

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

Author:

pkimmesw

Message:

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

Location:

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

Files:

• IReadonlyPushConfiguration.cs (modified) (1 diff)
• PushConfiguration.cs (modified) (10 diffs)

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

@@ -3 +3 @@
 
   using HeuristicLab.Common;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Erc.Interfaces;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Interfaces;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
 

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

@@ -4 +4 @@
   using System.Linq;
   using Attributes;
+  using Base.Erc;
+  using Base.Erc.Interfaces;
   using Common;
   using Core;
-  using Erc;
-  using Erc.Interfaces;
   using Expressions;
   using Persistence.Default.CompositeSerializers.Storable;
@@ -21 +21 @@
 
       enabledExpressions = ExpressionTable.ExpressionNames.ToList();
-      EnabledStacks = new Dictionary<StackTypes, bool>();
+      enabledStacks = new Dictionary<StackTypes, bool>();
 
       ErcOptions = new ErcOptions();
@@ -38 +38 @@
     private void InitEnabledStacks(bool state = true) {
       foreach (StackTypes type in Enum.GetValues(typeof(StackTypes))) {
-        if (!EnabledStacks.ContainsKey(type))
-          EnabledStacks.Add(type, state);
+        if (!enabledStacks.ContainsKey(type))
+          enabledStacks.Add(type, state);
       }
     }
@@ -50 +50 @@
     public PushConfiguration(PushConfiguration origin, Cloner cloner) : base(origin, cloner) {
       enabledExpressions = origin.EnabledExpressions.ToList();
-      EnabledStacks = origin.EnabledStacks.ToDictionary(x => x.Key, x => x.Value);
+      enabledStacks = origin.EnabledStacks.ToDictionary(x => x.Key, x => x.Value);
 
       ErcOptions = cloner.Clone(origin.ErcOptions);
@@ -70 +70 @@
     }
 
-    [Storable]
-    public IDictionary<StackTypes, bool> EnabledStacks { get; set; }
-
-    IReadOnlyDictionary<StackTypes, bool> IReadOnlyPushConfiguration.EnabledStacks { get { return EnabledStacks as IReadOnlyDictionary<StackTypes, bool>; } }
+
+    [Storable]
+    private Dictionary<StackTypes, bool> enabledStacks;
+
+    public IReadOnlyDictionary<StackTypes, bool> EnabledStacks { get { return enabledStacks; } }
 
     public event EventHandler<EnabledExpressionsChangedEventArgs> EnabledExpressionsChanged;
@@ -95 +96 @@
     }
 
-    IReadOnlyList<string> IReadOnlyPushConfiguration.EnabledExpressions { get { return EnabledExpressions as IReadOnlyList<string>; } }
+    IReadOnlyList<string> IReadOnlyPushConfiguration.EnabledExpressions { get { return enabledExpressions; } }
 
     [Storable]
@@ -189 +190 @@
         var type = ExpressionTable.TypeToNameTable.Single(x => x.Value == name).Key;
         var attribute = ExpressionTable.TypeToAttributeTable[type];
-        EnabledStacks[attribute.StackType] = true;
+        enabledStacks[attribute.StackType] = true;
       }
 
@@ -207 +208 @@
         var type = ExpressionTable.TypeToNameTable.Single(x => x.Value == name).Key;
         var attribute = ExpressionTable.TypeToAttributeTable[type];
-        EnabledStacks[attribute.StackType] = false;
+        enabledStacks[attribute.StackType] = false;
       }
 
@@ -238 +239 @@
 
     public void EnableStack(StackTypes type, bool enableExpressions = false) {
-      EnabledStacks[type] = true;
+      enabledStacks[type] = true;
 
       if (enableExpressions)
@@ -245 +246 @@
 
     public void DisableStack(StackTypes type, bool disableExpressions = false) {
-      EnabledStacks[type] = false;
+      enabledStacks[type] = false;
 
       if (disableExpressions)