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

Timestamp:

08/28/17 09:03:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Testet Problems, Improved Performance

File:

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

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

@@ -175 +175 @@
 
     public static Expression GetStatelessExpression<T>() where T : StatelessExpression {
-      return GetStatelessExpression(typeToNameTable[typeof(T)]);
+      Expression expression;
+      var type = typeof(T);
+
+      if (StatelessExpressionTable.TryGetValue(type, out expression))
+        return expression;
+
+      throw new NotSupportedException("Expression not supported: " + type.Name);
     }
 
     public static Expression GetStatelessExpression(string name) {
-      if (NameToTypeTable.ContainsKey(name) && StatelessExpressionTable.ContainsKey(NameToTypeTable[name]))
-        return StatelessExpressionTable[NameToTypeTable[name]];
+      Type type;
+      Expression expression;
+
+      if (NameToTypeTable.TryGetValue(name, out type) && StatelessExpressionTable.TryGetValue(type, out expression))
+        return expression;
+
       throw new NotSupportedException("Expression not supported: " + name);
     }
 
     public static bool TryGetStatelessExpression(string name, out Expression expression) {
-      if (!NameToTypeTable.ContainsKey(name) || !StatelessExpressionTable.ContainsKey(NameToTypeTable[name])) {
+      Type type;
+      if (!NameToTypeTable.TryGetValue(name, out type) || !StatelessExpressionTable.TryGetValue(type, out expression)) {
         expression = null;
         return false;
       }
 
-      expression = StatelessExpressionTable[NameToTypeTable[name]];
       return true;
     }
@@ -199 +209 @@
 
     public static Expression GetStatefulExpression(string name) {
-      if (NameToTypeTable.ContainsKey(name)) {
-        Func<Expression> creator;
-        var type = NameToTypeTable[name];
-
-        if (StatefulExpressionFactory.TryGetValue(type, out creator))
-          return creator();
+      Type type;
+      Func<Expression> creator;
+
+      if (NameToTypeTable.TryGetValue(name, out type) && StatefulExpressionFactory.TryGetValue(type, out creator)) {
+        return creator();
       }