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

Timestamp:

08/21/17 11:33:53 (7 years ago)

Author:

pkimmesw

Message:

#2665 Testet Problems, Testet error functions, Small fixes, Created HL files

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/Extensions.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP

@@ -1 +1 @@
 *.user
+packages
+TestResults

@@ -1 +1 @@
 *.user
+packages
+TestResults

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

@@ -77 +77 @@
 
     public static void PrintStacks(this IPushInterpreter interpreter) {
+      var maxStackNameLength = interpreter.Stacks.Max(x => x.Key.ToString().Length);
+      var totalLength = maxStackNameLength + 6;
+
       foreach (var pair in interpreter.Stacks) {
         var stackName = pair.Key.ToString();
         var stack = interpreter.Stacks[pair.Key];
 
-        if (stack.IsEmpty || !stack.IsEnabled) continue;
+        if (stack.IsEmpty || !stack.IsEnabled)
+          continue;
 
-        var stackString = string.Join(" ", interpreter.StringifyStack(pair.Key).Reverse());
-        Console.WriteLine("--------- {0} ---------\n{1}\n", stackName, stackString);
+        var stackString = string.Join(" ", interpreter.StringifyStack(pair.Key));
+
+        //var padLength = (totalLength - stackName.Length) / 2;
+        //var padLengthLeft = stackName.Length + padLength;
+        //var padLengthRight = padLengthLeft + padLength;
+        //Console.WriteLine("{0}\n{1}\n", stackName.PadLeft(padLengthLeft, '-').PadRight(padLengthRight, '-'), stackString);
+
+        Console.WriteLine("{0}: {1}", stackName, stackString);
       }
 
@@ -96 +106 @@
 
     public static void InitExample(this IPushInterpreter interpreter, Example example) {
-      interpreter.BooleanStack.Push(example.InputBoolean);
-      interpreter.IntegerStack.Push(example.InputInteger);
-      interpreter.FloatStack.Push(example.InputFloat);
-      interpreter.CharStack.Push(example.InputChar);
-      interpreter.StringStack.Push(example.InputString);
-      interpreter.StringVectorStack.Push(example.InputStringVector);
-      interpreter.IntegerVectorStack.Push(example.InputIntegerVector);
-      interpreter.FloatVectorStack.Push(example.InputFloatVector);
+      if (interpreter.Configuration.TopLevelPushInputArguments) {
+        interpreter.BooleanStack.Push(example.InputBoolean);
+        interpreter.IntegerStack.Push(example.InputInteger);
+        interpreter.FloatStack.Push(example.InputFloat);
+        interpreter.CharStack.Push(example.InputChar);
+        interpreter.StringStack.Push(example.InputString);
+        interpreter.StringVectorStack.Push(example.InputStringVector);
+        interpreter.IntegerVectorStack.Push(example.InputIntegerVector);
+        interpreter.FloatVectorStack.Push(example.InputFloatVector);
+      }
 
+      // init in expressions
       interpreter.SetInput(
         integers: example.InputInteger,

@@ -1 +1 @@
 *.user
+packages
+TestResults