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

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

File:

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

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

@@ -33 +33 @@
       ExpressionNames = StatelessExpressionTable.Keys
         .Concat(StatefulExpressionFactory.Keys)
+        .Where(t => typeToNameTable.ContainsKey(t))
         .Select(type => typeToNameTable[type])
         .ToArray();
@@ -55 +56 @@
         typeToAttributeTable.Add(type, attribute);
         dictionary.Add(type, expression);
+
+        // do not index hidden expressions like push expression in tables
+        if (attribute.IsHidden) continue;
+
         indexToNameTable.Add(indexToNameTable.Keys.Count, attribute.ExpressionName);
         typeToNameTable.Add(type, attribute.ExpressionName);
@@ -89 +94 @@
         typeToAttributeTable.Add(type, attribute);
         dictionary.Add(type, creator);
+
+        // do not index hidden expressions like push expression in tables
+        if (attribute.IsHidden) continue;
+
         indexToNameTable.Add(indexToNameTable.Keys.Count, attribute.ExpressionName);
         typeToNameTable.Add(type, attribute.ExpressionName);