Added parameters to compiler for passing to constructor of generated program code.

Added default value for trainingCount to math fitness methods.

Author: primaryobjects

AIProgrammer.Compiler/BrainPlus.cs

@@ -21,11 +21,11 @@ public static class BrainPlus
         /// <param name="program">Brainfuck source code</param>
         /// <param name="pathName">Executable file path</param>
         /// <param name="fitness">IFitness</param>
-        /// <param name="maxIterations">Max number of instructions that interpreter will execute</param>
+        /// <param name="constructorParams">Parameters to pass to fitness method constructor, after GA.</param>
         /// <param name="includeHeader">True to display the header (Brainfuck .NET Compiler 1.0, Created by ...).</param>
-        public static void Compile(string program, string pathName, IFitness fitness, int maxIterations, bool includeHeader = true)
+        public static void Compile(string program, string pathName, IFitness fitness, string constructorParams, bool includeHeader = true)
         {
-            Compile(program, pathName, fitness.GetType().Name, maxIterations);
+            Compile(program, pathName, fitness.GetType().Name, constructorParams);
         }
 
         /// <summary>
@@ -34,9 +34,9 @@ public static void Compile(string program, string pathName, IFitness fitness, in
         /// <param name="program">Brainfuck source code</param>
         /// <param name="pathName">Executable file path</param>
         /// <param name="fitnessMethod">string (HelloUserFitness, StringOptimizedFitness, etc)</param>
-        /// <param name="maxIterations">Max number of instructions that interpreter will execute</param>
+        /// <param name="constructorParams">Parameters to pass to fitness method constructor, after GA.</param>
         /// <param name="includeHeader">True to display the header (Brainfuck .NET Compiler 1.0, Created by ...).</param>
-        public static void Compile(string program, string pathName, string fitnessMethod, int maxIterations, bool includeHeader = true)
+        public static void Compile(string program, string pathName, string fitnessMethod, string constructorParams, bool includeHeader = true)
         {
             string sourceCode = @"
 using System;
@@ -47,7 +47,7 @@ class Program {
     public static void Main(string[] args)
     {
         string program = ""[SOURCE]"";
-        IFitness fitness = new [FITNESSMETHOD](null, [MAXITERATIONS], """");
+        IFitness fitness = new [FITNESSMETHOD](null, [PARAMETERS]);
 
         [HEADER]
 
@@ -81,7 +81,7 @@ public static void Main(string[] args)
 
             sourceCode = sourceCode.Replace("[SOURCE]", program);
             sourceCode = sourceCode.Replace("[FITNESSMETHOD]", fitnessMethod);
-            sourceCode = sourceCode.Replace("[MAXITERATIONS]", maxIterations.ToString());
+            sourceCode = sourceCode.Replace("[PARAMETERS]", constructorParams);
 
             CompilerResults results = provider.CompileAssemblyFromSource(parameters, sourceCode);
 

AIProgrammer.Fitness/Concrete/AddCleanFitness.cs

@@ -18,7 +18,7 @@ public class AddCleanFitness : FitnessBase
     {
         private int _trainingCount = 5;
 
-        public AddCleanFitness(GA ga, int maxIterationCount, int maxTrainingCount)
+        public AddCleanFitness(GA ga, int maxIterationCount, int maxTrainingCount = 5)
             : base(ga, maxIterationCount)
         {
             _trainingCount = maxTrainingCount;

AIProgrammer.Fitness/Concrete/AddFitness.cs

@@ -17,7 +17,7 @@ public class AddFitness : FitnessBase
     {
         private int _trainingCount = 5;
 
-        public AddFitness(GA ga, int maxIterationCount, int maxTrainingCount)
+        public AddFitness(GA ga, int maxIterationCount, int maxTrainingCount = 5)
             : base(ga, maxIterationCount)
         {
             _trainingCount = maxTrainingCount;
@@ -44,6 +44,7 @@ public override double GetFitnessMethod(string program)
                     case 2: input1 = 5; input2 = 1; break;
                     case 3: input1 = 6; input2 = 2; break;
                     case 4: input1 = 3; input2 = 6; break;
+                    case 5: input1 = 2; input2 = 0; break;
                 };
 
                 try

AIProgrammer.Fitness/Concrete/AddToCharFitness.cs

@@ -17,7 +17,7 @@ public class AddToCharFitness : FitnessBase
     {
         private int _trainingCount = 5;
 
-        public AddToCharFitness(GA ga, int maxIterationCount, int maxTrainingCount)
+        public AddToCharFitness(GA ga, int maxIterationCount, int maxTrainingCount = 5)
             : base(ga, maxIterationCount)
         {
             _trainingCount = maxTrainingCount;

AIProgrammer.Fitness/Concrete/HelloUserFitness.cs

@@ -51,6 +51,7 @@ public override double GetFitnessMethod(string program)
                     case 1: name = "me"; break;
                     case 2: name = "jay"; break;
                     case 3: name = "kory"; break;
+                    case 4: name = "jamie"; break;
                 };
 
                 sb.Clear();

AIProgrammer.Fitness/Concrete/MultiplyFitness.cs

@@ -16,7 +16,7 @@ public class MultiplyFitness : FitnessBase
     {
         private int _trainingCount = 5;
 
-        public MultiplyFitness(GA ga, int maxIterationCount, int maxTrainingCount)
+        public MultiplyFitness(GA ga, int maxIterationCount, int maxTrainingCount = 5)
             : base(ga, maxIterationCount)
         {
             _trainingCount = maxTrainingCount;

AIProgrammer.Fitness/Concrete/SubtractFitness.cs

@@ -16,7 +16,7 @@ public class SubtractFitness : FitnessBase
     {
         private int _trainingCount = 5;
 
-        public SubtractFitness(GA ga, int maxIterationCount, int maxTrainingCount)
+        public SubtractFitness(GA ga, int maxIterationCount, int maxTrainingCount = 5)
             : base(ga, maxIterationCount)
         {
             _trainingCount = maxTrainingCount;