Changeset 15189 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/Extensions.cs

Timestamp:

07/10/17 21:36:03 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed small issues, testet benchmark suite, added INX Expressions

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/Extensions.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/Extensions.cs

@@ -25 +25 @@
 
     public static Type GetStackEntryType(this StackTypes stackType) {
+      if (StackProperties.ContainsKey(stackType) &&
+          StackProperties[stackType].PropertyType.IsGenericType) {
+        var genericTypeDef = StackProperties[stackType].PropertyType.GetGenericTypeDefinition();
+        if (genericTypeDef == typeof(IPushStack<>))
+          return genericTypeDef.GetGenericArguments()[0];
+      }
+
       return StackProperties.ContainsKey(stackType)
-        ? StackProperties[stackType].PropertyType.GetGenericArguments().Single()
+        ? StackProperties[stackType]
+            .PropertyType
+            .GetInterfaces()
+            .First(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPushStack<>))
+            .GetGenericArguments()
+            .First()
         : null;
     }
 
     public static void PrintStacks(this IPushInterpreter interpreter) {
-      var stackTypesType = typeof(StackTypes);
-
-      foreach (StackTypes type in Enum.GetValues(stackTypesType)) {
-        if (!interpreter.Stacks.ContainsKey(type)) continue;
-
-        var stackName = Enum.GetName(stackTypesType, type);
-        var stack = interpreter.Stacks[type];
+      foreach (var pair in interpreter.Stacks) {
+        var stackName = pair.Key.ToString();
+        var stack = interpreter.Stacks[pair.Key];
 
         if (stack.IsEmpty || !stack.IsEnabled) continue;
 
-        var stackString = string.Join(" ", interpreter.StringifyStack(type).Reverse());
+        var stackString = string.Join(" ", interpreter.StringifyStack(pair.Key).Reverse());
         Console.WriteLine("--------- {0} ---------\n{1}\n", stackName, stackString);
       }