Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator

Timestamp:

06/01/17 09:28:34 (8 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/Generators/CodeGenerator/CodeGeneratorUtils.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator/CodeGeneratorUtils.cs

@@ -96 +96 @@
             : new CharPushExpression(ercOptions.CharErcOptions.GetErcValue(random));
 
+        case StackTypes.IntegerVector:
+          return ercOptions.IntegerVectorErcOptions == null || !ercOptions.IntegerVectorErcOptions.IsEnabled
+            ? Noop
+            : new IntegerVectorPushExpression(ercOptions.IntegerVectorErcOptions.GetErcValue(random).Select(i => (long)i).ToList());
+
+        case StackTypes.FloatVector:
+          return ercOptions.FloatVectorErcOptions == null || !ercOptions.FloatVectorErcOptions.IsEnabled
+            ? Noop
+            : new FloatVectorPushExpression(ercOptions.FloatVectorErcOptions.GetErcValue(random));
+
+        case StackTypes.StringVector:
+          return ercOptions.StringVectorErcOptions == null || !ercOptions.StringVectorErcOptions.IsEnabled
+            ? Noop
+            : new StringVectorPushExpression(ercOptions.StringVectorErcOptions.GetErcValue(random));
+
         default:
           return Noop;