Changeset 14392 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP.Cli/Program.cs

Timestamp:

11/15/16 21:10:17 (8 years ago)

Author:

pkimmesw

Message:

#2665 Full Push 3.0 instruction set and tests; Added first benchmark test (count odds) for random walk tests;

File:

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

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

@@ -22 +22 @@
         static async Task Stepwise()
         {
-            var program = PushGPInterpreter.Encode(@"( CODE.QUOTE ( INTEGER.POP 1 )
-                                                       CODE.QUOTE ( CODE.DUP INTEGER.DUP 1 INTEGER.- CODE.DO INTEGER.* )
-                                                       INTEGER.DUP 2 INTEGER.< CODE.IF )");
             var interpreter = new PushGPInterpreter();
 
-            interpreter.IntegerStack.Push(5);
-            interpreter.InterpretAsync(program, true).Wait();
+            interpreter.InterpretAsync("( 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)
@@ -72 +68 @@
             var sw = new Stopwatch();
 
+            var interpreter = new PushGPInterpreter();
+            var generator = new CodeGenerator(interpreter);
+
             sw.Start();
-            var expressions = CodeGenerator.RandomCode(3000000);
+            var expressions = generator.RandomCode(3000000);
             sw.Stop();