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

Timestamp:

10/08/16 12:04:25 (8 years ago)

Author:

pkimmesw

Message:

#2665 Set .NET version to 4.5, C# version to 5.0, Added expression templates and factory

File:

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

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

@@ -12 +12 @@
         static void Main(string[] args)
         {
-            //Stepwise().Wait();
-            PerformanceTest();
+            Stepwise().Wait();
+            //PerformanceTestInterpreter();
             //PerformanceTestCodeGenerator();
 
@@ -22 +22 @@
         static async Task Stepwise()
         {
-            var program = PushGPInterpreter.Encode("( 2 3 INTEGER.* 4.1 5.2 FLOAT.+ TRUE FALSE BOOLEAN.OR )");
+            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();
 
-            var task = interpreter.InterpreteAsync(program);
-            await interpreter.PauseAsync();
+            interpreter.IntegerStack.Push(5);
+            interpreter.InterpretAsync(program, true).Wait();
 
             while (!interpreter.IsCompleted)
@@ -49 +51 @@
         }
 
-        static void PerformanceTest()
+        static void PerformanceTestInterpreter()
         {
             var program = PushGPInterpreter.Encode("( 5 INTEGER.DUP INTEGER.+ )");
@@ -58 +60 @@
             for (var i = 0; i < 20000000; i++)
             {
-                interpreter.Interprete(program);
-                interpreter.Reset();
+                interpreter.Interpret(program);
+                interpreter.Clear();
             }
             sw.Stop();
@@ -71 +73 @@
 
             sw.Start();
-            var expressions = CodeGenerator.RandomCode(10000000);
+            var expressions = CodeGenerator.RandomCode(3000000);
             sw.Stop();
 
-            Console.WriteLine($"Count: {expressions.Count()}");
-            Console.WriteLine(sw.Elapsed);
+            Console.WriteLine(string.Format("Generated {0} in {1}", expressions.Count(), sw.Elapsed));
         }
     }