Changeset 14328 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Generators/CodeGenerator.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/Generators/CodeGenerator.cs (modified) (5 diffs)

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Generators/CodeGenerator.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Algorithms.PushGP.Expressions;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Algorithms.PushGP.Generators
@@ -8 +8 @@
     public static class CodeGenerator
     {
+        private static FastRandom random = new FastRandom();
         public static IEnumerable<Expression> RandomCode(int maxPoints)
         {
-            var actualPoints = StaticRandom.Next(1, maxPoints);
+            var actualPoints = random.Next(1, maxPoints);
 
             return RandomCodeWithSize(actualPoints).ToArray();
@@ -19 +20 @@
             if (points == 1)
             {
-                OpCode opCode;
-                Func<Expression> creator;
+                // TODO: If this is an "ephemeral random constant"???? then return a randomly - chosen value of the appropriate type;
+                var opCode = (OpCode)random.Next(OpCodeExtensions.Min, OpCodeExtensions.Max);
 
-                do
-                {
-                    // TODO: If this is an "ephemeral random constant"???? then return a randomly - chosen value of the appropriate type;
-                    opCode = (OpCode)StaticRandom.Next(OpCodeExtensions.Min, OpCodeExtensions.Max);
-                }
-                while (!ExpressionCreatorTable.TryGetCreator(opCode, out creator));
-
-                return new[] { creator.Invoke() };
+                return new[] { ExpressionFactory.Create(opCode) };
             }
             else
@@ -35 +29 @@
                 var sizesThisLevel = Decompose(points - 1, points - 1);
 
-                return sizesThisLevel.SelectMany(size => RandomCodeWithSize(size));
+                return sizesThisLevel.SelectMany(size => RandomCodeWithSize(size)).Shuffle(random);
             }
         }
@@ -47 +41 @@
             else
             {
-                var thisPart = StaticRandom.Next(1, number - 1);
+                var thisPart = random.Next(1, number - 1);
 
                 return new[] { thisPart }.Concat(Decompose(number - thisPart, maxParts - 1));