Changeset 14602 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP.Cli

Timestamp:

01/25/17 01:53:30 (7 years ago)

Author:

pkimmesw

Message:

#2665 PushGP HL Integration

File:

• branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP.Cli/Program.cs (modified) (9 diffs)

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP.Cli/Program.cs

@@ -26 +26 @@
 
       Console.WriteLine("\nPress any key to continue...");
+
+      //if (args.Length == 0) return;
+
+      //var code = args[0];
+      //EvaluateStepwise(code).Wait();
+
       Console.ReadKey();
     }
 
-    static void SimpleTest() {
-      var interpreter = new PushGpInterpreter();
-
-      interpreter.Interpret("5 INTEGER.DUP INTEGER.+");
-
-      interpreter.PrintStacks();
-    }
-
-    static async Task Stepwise() {
-      var interpreter = new PushGpInterpreter();
-
-      interpreter.InterpretAsync("( 0 2 CODE.QUOTE ( 1 INTEGER.+ 0 3 CODE.QUOTE ( 1 INTEGER.+ INTEGER.* ) CODE.DO*RANGE INTEGER.+ ) CODE.DO*RANGE )", true).Wait();
+    static async Task EvaluateStepwise(string code) {
+      var interpreter = new PushGpInterpreter(new Configuration {
+        TopLevelPushCode = false
+      });
+
+      interpreter.RunAsync(code, true).Wait();
 
       while (!interpreter.IsCompleted) {
@@ -59 +59 @@
     }
 
+    static void SimpleTest() {
+      var interpreter = new PushGpInterpreter();
+
+      interpreter.Run("5 INTEGER.DUP INTEGER.+");
+
+      interpreter.PrintStacks();
+    }
+
+    static async Task Stepwise() {
+      var interpreter = new PushGpInterpreter();
+
+      interpreter.RunAsync("( 0 2 CODE.QUOTE ( 1 INTEGER.+ 0 3 CODE.QUOTE ( 1 INTEGER.+ INTEGER.* ) CODE.DO*RANGE INTEGER.+ ) CODE.DO*RANGE )", true).Wait();
+
+      while (!interpreter.IsCompleted) {
+        Console.Clear();
+        interpreter.PrintStacks();
+        interpreter.Step();
+
+        var input = Console.ReadKey();
+        if (input.Key == ConsoleKey.Escape) {
+          break;
+        } else if (input.Key == ConsoleKey.Spacebar) {
+          await interpreter.ResumeAsync();
+        }
+      }
+
+      Console.Clear();
+      interpreter.PrintStacks();
+    }
+
     static void PerformanceTestInterpreter() {
       var program = PushGPParser.Parse("( 5 INTEGER.DUP INTEGER.+ )");
@@ -67 +97 @@
       sw.Start();
       for (var i = 0; i < 60000000; i++) {
-        interpreter.Interpret(program);
+        interpreter.Run(program);
         interpreter.Clear();
       }
@@ -94 +124 @@
 
           for (var j = 0; j < amount; j++) {
-            interpreter.Interpret(program);
+            interpreter.Run(program);
             interpreter.Clear();
           }
@@ -111 +141 @@
       sw.Stop();
 
-      Console.WriteLine(string.Format("Generated {0} in {1}", expressions.Count(), sw.Elapsed));
+      Console.WriteLine("Generated {0} in {1}", expressions.Count(), sw.Elapsed);
     }
 
@@ -131 +161 @@
             var program = CodeGenerator.RandomProgram(maxProgramSizeLimit);
 
-            interpreter.Interpret(program);
+            interpreter.Run(program);
 
             execCounters[i] += interpreter.ExecCounter;
@@ -150 +180 @@
 
       using (var interpreter = pool.GetInstance()) {
-        interpreter.Interpret("( 1 2 INTEGER.+ )");
+        interpreter.Run("( 1 2 INTEGER.+ )");
 
         id = interpreter.GetHashCode();
@@ -158 +188 @@
       using (var interpreter = pool.GetInstance())
       using (var interpreter2 = pool.GetInstance()) {
-        interpreter.Interpret("( 1 2 INTEGER.+ )");
+        interpreter.Run("( 1 2 INTEGER.+ )");
         if (id == interpreter.GetHashCode()) Console.WriteLine("equal 2");
         if (id == interpreter2.GetHashCode()) Console.WriteLine("equal 3");
@@ -198 +228 @@
         solution => {
           interpreter.Clear();
-          interpreter.Interpret(solution);
+          interpreter.Run(solution);
           return interpreter.IntegerStack.Top == 10;
         });