Changeset 14834 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ExpressionTable.cs

Timestamp:

04/10/17 00:27:31 (7 years ago)

Author:

pkimmesw

Message:

#2665 LexicaseSelector, Performance improvements, UI Fixes, Debugger only shows used stacks, fixed Debugger stepping, Added vector expressions, ERCOptions,

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ExpressionTable.cs (modified) (4 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ExpressionTable.cs

@@ -14 +14 @@
     public static readonly IDictionary<int, string> IndexToNameTable = new Dictionary<int, string>();
     public static readonly IDictionary<Type, string> TypeToNameTable = new Dictionary<Type, string>();
+    public static readonly IDictionary<Type, PushExpressionAttribute> TypeToAttributeTable = new Dictionary<Type, PushExpressionAttribute>();
     public static readonly IDictionary<StackTypes, IList<string>> StackDependencyToNamesTable = new Dictionary<StackTypes, IList<string>>();
     public static readonly string[] ExpressionNames;
@@ -56 +57 @@
         var attribute = (PushExpressionAttribute)Attribute.GetCustomAttribute(type, typeof(PushExpressionAttribute));
 
+        TypeToAttributeTable.Add(type, attribute);
         dictionary.Add(attribute.ExpressionName, expression);
         IndexToNameTable.Add(IndexToNameTable.Keys.Count, attribute.ExpressionName);
         TypeToNameTable.Add(type, attribute.ExpressionName);
 
-        if (!StackTypeToNamesTable.ContainsKey(attribute.StackTypes)) {
-          StackTypeToNamesTable.Add(attribute.StackTypes, new List<string>());
-        }
-
-        StackTypeToNamesTable[attribute.StackTypes].Add(attribute.ExpressionName);
-
-        var dependencies = attribute.StackTypes | attribute.AdditionalStackDependencies;
+        if (!StackTypeToNamesTable.ContainsKey(attribute.StackType)) {
+          StackTypeToNamesTable.Add(attribute.StackType, new List<string>());
+        }
+
+        StackTypeToNamesTable[attribute.StackType].Add(attribute.ExpressionName);
+
+        var dependencies = attribute.StackType | attribute.AdditionalStackDependencies;
         if (!StackDependencyToNamesTable.ContainsKey(dependencies)) {
           StackDependencyToNamesTable.Add(dependencies, new List<string>());
@@ -88 +90 @@
         var attribute = (PushExpressionAttribute)Attribute.GetCustomAttribute(type, typeof(PushExpressionAttribute));
 
+        TypeToAttributeTable.Add(type, attribute);
         dictionary.Add(attribute.ExpressionName, creator);
         IndexToNameTable.Add(IndexToNameTable.Keys.Count, attribute.ExpressionName);
         TypeToNameTable.Add(type, attribute.ExpressionName);
 
-        if (!StackTypeToNamesTable.ContainsKey(attribute.StackTypes)) {
-          StackTypeToNamesTable.Add(attribute.StackTypes, new List<string>());
-        }
-
-        StackTypeToNamesTable[attribute.StackTypes].Add(attribute.ExpressionName);
-
-        var dependencies = attribute.StackTypes | attribute.AdditionalStackDependencies;
+        if (!StackTypeToNamesTable.ContainsKey(attribute.StackType)) {
+          StackTypeToNamesTable.Add(attribute.StackType, new List<string>());
+        }
+
+        StackTypeToNamesTable[attribute.StackType].Add(attribute.ExpressionName);
+
+        var dependencies = attribute.StackType | attribute.AdditionalStackDependencies;
         if (!StackDependencyToNamesTable.ContainsKey(dependencies)) {
           StackDependencyToNamesTable.Add(dependencies, new List<string>());
@@ -142 +145 @@
     }
 
-    public static IReadOnlyList<string> GetEnabledExpressionsByStackTypes(StackTypes allowedTypes) {
+    public static IReadOnlyList<string> GetExpressionsByStackTypes(StackTypes allowedTypes) {
       return StackDependencyToNamesTable
           .Where(entry => (entry.Key & ~allowedTypes) == StackTypes.None)