Changeset 15334 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/SolutionCreator/PlushCreator.cs

Timestamp:

08/21/17 11:33:53 (7 years ago)

Author:

pkimmesw

Message:

#2665 Testet Problems, Testet error functions, Small fixes, Created HL files

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

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

branches/PushGP/HeuristicLab.PushGP

@@ -1 +1 @@
 *.user
+packages
+TestResults

@@ -1 +1 @@
 *.user
+packages
+TestResults

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

@@ -24 +24 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("MinLength", "The min length of the vector."));
       Parameters.Add(new ValueLookupParameter<IntValue>("MaxLength", "The max length of the vector."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("MinClose", "The min close variable for a plush genome entry."));
       Parameters.Add(new ValueLookupParameter<IntValue>("MaxClose", "The max close variable for a plush genome entry."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("CloseBiasLevel", "Determines how strongly the random close variable is biased towards 0."));
@@ -69 +68 @@
       get { return (IValueLookupParameter<PercentValue>)Parameters["InInstructionProbability"]; }
     }
-    public IValueLookupParameter<IntValue> MinCloseParameter
-    {
-      get { return (IValueLookupParameter<IntValue>)Parameters["MinClose"]; }
-    }
     public IValueLookupParameter<IntValue> MaxCloseParameter
     {
@@ -97 +92 @@
       var instructions = InstructionsParameter.ActualValue;
       var inInstructionProbability = InInstructionProbabilityParameter.ActualValue.Value;
-      var minClose = MinCloseParameter.ActualValue.Value;
       var maxClose = MaxCloseParameter.ActualValue.Value;
       var biasLevel = CloseBiasLevelParameter.ActualValue.Value;
@@ -103 +97 @@
       if (minLength > maxLength)
         throw new InvalidOperationException("MinLength > MaxLength");
-
-      if (minClose > maxClose)
-        throw new InvalidOperationException("MinClose > MaxClose");
 
       var length = random.Next(minLength, maxLength);
@@ -117 +108 @@
           inInstructionProbability);
 
-        var close = random.NextBiased(minClose, maxClose, biasLevel);
+        var close = maxClose == 0 ? 1 : random.NextBiased(0, maxClose, biasLevel);
 
         result.Add(new PlushEntry {

@@ -1 +1 @@
 *.user
+packages
+TestResults