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

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

@@ -12 +12 @@
 
   [StorableClass]
-  public abstract class PushConfigurationBase : NamedItem, IEnabledExpressionsConfiguration {
+  public abstract class PushConfigurationBase : NamedItem, IExpressionsConfiguration {
 
     protected PushConfigurationBase() {
@@ -28 +28 @@
       enabledExpressions = origin.EnabledExpressions.ToList();
       expressionsPerStackCount = origin.expressionsPerStackCount.ToDictionary(x => x.Key, x => x.Value);
-    }
+      InExpressionCount = origin.InExpressionCount;
+      Seed = origin.Seed;
+    }
+
+    [Storable]
+    public int Seed { get; set; }
+
+    [Storable]
+    public int InExpressionCount { get; private set; }
 
     [Storable]
     private readonly Dictionary<StackTypes, int> expressionsPerStackCount;
+
+    public IReadOnlyDictionary<StackTypes, int> ExpressionsPerStackCount { get { return expressionsPerStackCount; } }
 
     public event EventHandler<EnabledExpressionsChangedEventArgs> EnabledExpressionsChanged;
@@ -112 +122 @@
 
     private void EnableExpressions(IEnumerable<string> expressionNames) {
-      foreach (var expressionName in expressionNames.Except(EnabledExpressions))
+      var addedExpressions = expressionNames as IList<string> ?? expressionNames.ToList();
+
+      foreach (var expressionName in addedExpressions.Except(EnabledExpressions))
         EnableExpression(expressionName, false);
 
       if (EnabledExpressionsChanged != null) {
-        EnabledExpressionsChanged(this, new EnabledExpressionsChangedEventArgs(expressionNames, new string[0]));
+        EnabledExpressionsChanged(this, new EnabledExpressionsChangedEventArgs(addedExpressions, new string[0]));
       }
     }
@@ -133 +145 @@
 
     private void DisableExpressions(IEnumerable<string> expressionNames) {
-      foreach (var expressionName in expressionNames.Intersect(EnabledExpressions))
+      var removedExpressions = expressionNames as IList<string> ?? expressionNames.ToList();
+
+      foreach (var expressionName in removedExpressions.Intersect(EnabledExpressions))
         DisableExpression(expressionName, false);
 
       if (EnabledExpressionsChanged != null) {
-        EnabledExpressionsChanged(this, new EnabledExpressionsChangedEventArgs(new string[0], expressionNames));
+        EnabledExpressionsChanged(this, new EnabledExpressionsChangedEventArgs(new string[0], removedExpressions));
       }
     }
@@ -229 +243 @@
       else DisableStack(type, setDependencies);
     }
+
+    public void InitInExpressions(int totalInputArgumentCount) {
+      InExpressionCount = totalInputArgumentCount;
+
+      for (var i = 0; i < ExpressionTable.InExpressionTable.Count; i++) {
+        var expression = ExpressionTable.InExpressionTable[i];
+        var expressionName = ExpressionTable.TypeToNameTable[expression.GetType()];
+
+        DisableExpression(expressionName);
+      }
+
+      if (totalInputArgumentCount > ExpressionTable.InExpressionTable.Count)
+        throw new InvalidOperationException("More input arguments defined as InExpression types");
+
+      for (var i = 0; i < totalInputArgumentCount; i++) {
+        var expression = ExpressionTable.InExpressionTable[i];
+        var expressionName = ExpressionTable.TypeToNameTable[expression.GetType()];
+
+        EnableExpression(expressionName);
+      }
+    }
   }
 }