Changeset 14397 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Tests

Timestamp:

11/16/16 00:33:20 (8 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Equals issue for ExecExpandExpression, Parallized CountOdds problem random walk

File:

• branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Tests/Benchmark/Problem/CountOdds.cs (modified) (4 diffs)

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Tests/Benchmark/Problem/CountOdds.cs

@@ -3 +3 @@
 using System.Diagnostics;
 using System.Linq;
+using System.Threading.Tasks;
+using HeuristicLab.Algorithms.PushGP.Expressions;
 using HeuristicLab.Algorithms.PushGP.Interpreter;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -21 +23 @@
         public void RandomWalk()
         {
-            var interpreter = new PushGPInterpreter(new Configuration
+            var limit = 1000;
+            var iterations = 20000;
+            var best = double.MaxValue;
+            Expression bestProgram = null;
+            var lockObj = new object();
+            var globalExecCounter = 0;
+
+
+            Parallel.For(0, iterations, async i =>
             {
-                EvalPushLimit = 10000
-            });
+                var interpreter = new PushGPInterpreter(new Configuration
+                {
+                    EvalPushLimit = 10000
+                });
 
-            var limit = 1000;
-            var iterations = 3000;
-            var best = double.MaxValue;
-
-            for (var i = 0; i < iterations; i++)
-            {
+                var execCounter = 0;
                 var program = interpreter.CodeGenerator.RandomProgram(limit);
-
                 var results = new List<long>();
 
@@ -43 +49 @@
                     }
 
-                    interpreter.Interpret(program);
+                    await interpreter.InterpretAsync(program);
 
                     if (!interpreter.IntegerStack.IsEmpty)
@@ -51 +57 @@
                         results.Add(Math.Min(value, 1000));
                     }
+
+                    execCounter += interpreter.ExecCounter;
+                    interpreter.Clear();
                 }
 
-
                 if (!results.Any())
-                    continue;
+                    return;
 
                 var avg = results.Average();
 
-                if (avg < best)
+                lock (lockObj)
                 {
-                    best = avg;
+                    if (avg < best)
+                    {
+                        best = avg;
+                        bestProgram = program;
+                        globalExecCounter += execCounter;
+                    }
                 }
-
-                interpreter.Clear();
-            }
+            });
 
             Debug.WriteLine("Best: {0}", best);
+            Debug.WriteLine("Program: {0}", bestProgram);
+            Debug.WriteLine("ExecCounter: {0}", globalExecCounter);
         }
     }