Changeset 15289 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/SolutionCreator

Timestamp:

07/26/17 19:34:13 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed analyzer, fixed Plush encoding + operators, adpated print evaluation according to McPhee

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/SolutionCreator/IPlushCreator.cs (modified) (1 diff)
• HeuristicLab.Problems.ProgramSynthesis/Push/SolutionCreator/PlushCreator.cs (modified) (3 diffs)
• HeuristicLab.Problems.ProgramSynthesis/Push/SolutionCreator/PushSolutionCreator.cs (modified) (5 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/SolutionCreator/IPlushCreator.cs

@@ -12 +12 @@
     IValueLookupParameter<IntValue> MinCloseParameter { get; }
     IValueLookupParameter<IntValue> MaxCloseParameter { get; }
+    IValueLookupParameter<DoubleValue> CloseBiasLevelParameter { get; }
     IValueLookupParameter<PercentValue> InInstructionProbabilityParameter { get; }
     IValueLookupParameter<IReadOnlyErcOptions> ErcOptionsParameter { get; }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/SolutionCreator/PlushCreator.cs

@@ -77 +77 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["MaxClose"]; }
     }
-    public IValueLookupParameter<DoubleValue> CloseBiasLevel
+    public IValueLookupParameter<DoubleValue> CloseBiasLevelParameter
     {
       get { return (IValueLookupParameter<DoubleValue>)Parameters["CloseBiasLevel"]; }
@@ -99 +99 @@
       var minClose = MinCloseParameter.ActualValue.Value;
       var maxClose = MaxCloseParameter.ActualValue.Value;
-      var biasLevel = CloseBiasLevel.ActualValue.Value;
+      var biasLevel = CloseBiasLevelParameter.ActualValue.Value;
 
       if (minLength > maxLength)
@@ -111 +111 @@
 
       for (var i = 0; i < length; i++) {
-        var expression = CodeGeneratorUtils.GetRandomExpression(random, ercOptions, instructions, inInstructionProbability);
+        var expression = CodeGeneratorUtils.GetRandomExpression(
+          random,
+          ercOptions,
+          instructions,
+          inInstructionProbability);
+
         var close = random.NextBiased(minClose, maxClose, biasLevel);
 

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/SolutionCreator/PushSolutionCreator.cs

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.SolutionCreator {
-  using System;
 
   using HeuristicLab.Common;
@@ -9 +8 @@
   using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Base.Erc;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
 
   /// <summary>
@@ -34 +34 @@
       if (!Parameters.ContainsKey(IN_INSTRUCTION_PROBABILITY))
         Parameters.Add(new FixedValueParameter<PercentValue>(IN_INSTRUCTION_PROBABILITY, new PercentValue(0.05)));
+
+      Parameters.Add(new ValueLookupParameter<IReadOnlyExpressionsConfiguration>("Instructions", "The enabled instructions"));
     }
 
@@ -68 +70 @@
     }
 
+    public IValueLookupParameter<IReadOnlyExpressionsConfiguration> InstructionsParameter
+    {
+      get { return (IValueLookupParameter<IReadOnlyExpressionsConfiguration>)Parameters["Instructions"]; }
+    }
+
     //public IValueParameter<IntValue> MaxLengthParameter
     //{
@@ -94 +101 @@
       var result = new IntegerVector(len);
 
-      var variableLength = random.Next(MinLength, len);
-      var contentLength = Math.Min(variableLength, len);
+      var contentLength = random.Next(MinLength, len);
       var lowerBound = bounds[0, 0];
       var upperBound = bounds[0, 1];
-      var inInstructionRelativeProbability = ErcOptions.ErcProbability + InInstructionProbability;
+      //var inInstructionRelativeProbability = ErcOptions.ErcProbability + InInstructionProbability;
+      //var instructions = InstructionsParameter.ActualValue;
 
       for (var i = 0; i < contentLength; i++) {
-        var x = random.NextDouble();
+        //var x = random.NextDouble();
 
-        if (ErcOptions.ErcProbability > 0 &&
-            x <= ErcOptions.ErcProbability)
-          result[i] = PushSolutionEncoding.Erc;
-        else if (InInstructionProbability > 0 &&
-                 x <= inInstructionRelativeProbability)
-          result[i] = PushSolutionEncoding.In;
-        else
-          result[i] = random.Next(lowerBound, upperBound);
+        //if (ErcOptions.ErcProbability > 0 && x <= ErcOptions.ErcProbability) {
+        //  result[i] = PushSolutionEncoding.Erc;
+        //} else if (InInstructionProbability > 0 && x <= inInstructionRelativeProbability && instructions.InExpressionCount > 0) {
+        //  var index = random.Next(0, instructions.InExpressionCount);
+        //  var expression = ExpressionTable.InExpressionTable[index];
+
+        //  instructions.EnabledExpressions
+        //  //result[i] = PushSolutionEncoding.In;
+        //} else {
+        result[i] = random.Next(lowerBound, upperBound);
+        //}
       }