added continuous_peaks_generator.py

Ported six peaks bug from GKHayes

mlrose_hiive/__init__.py

@@ -26,4 +26,5 @@
 
 from .runners import GARunner, MIMICRunner, RHCRunner, SARunner, NNGSRunner
 from .runners import (build_data_filename)
-from .generators import MaxKColorGenerator, QueensGenerator, FlipFlopGenerator, TSPGenerator, KnapsackGenerator
+from .generators import (MaxKColorGenerator, QueensGenerator, FlipFlopGenerator, TSPGenerator, KnapsackGenerator,
+                         ContinuousPeaksGenerator)

mlrose_hiive/fitness/six_peaks.py

@@ -86,10 +86,13 @@ def evaluate(self, state):
         tail_1 = self.tail(1, state)
 
         # Calculate R(X, T)
-        if (tail_0 > _t and head_1 > _t) or (tail_1 > _t and head_0 > _t):
+        _r = 0
+        _max_score = max(tail_0, head_1)
+        if tail_0 > _t and head_1 > _t:
             _r = _n
-        else:
-            _r = 0
+        elif tail_1 > _t and head_0 > _t:
+            _r = _n
+            _max_score = max(tail_1, head_0)
 
         # Evaluate function
         fitness = max(tail_0, head_1) + _r

mlrose_hiive/generators/__init__.py

@@ -8,3 +8,4 @@
 from .flip_flop_generator import FlipFlopGenerator
 from .queens_generator import QueensGenerator
 from .tsp_generator import TSPGenerator
+from .continuous_peaks_generator import ContinuousPeaksGenerator

mlrose_hiive/generators/continuous_peaks_generator.py

@@ -0,0 +1,17 @@
+""" Classes for defining optimization problem objects."""
+
+# Author: Andrew Rollings
+# License: BSD 3 clause
+
+import numpy as np
+
+from mlrose_hiive import DiscreteOpt, ContinuousPeaks
+
+
+class ContinuousPeaksGenerator:
+    @staticmethod
+    def generate(seed, size=20, t_pct=0.1):
+        np.random.seed(seed)
+        fitness = ContinuousPeaks(t_pct=t_pct)
+        problem = DiscreteOpt(length=size, fitness_fn=fitness)
+        return problem

mlrose_hiive/generators/flip_flop_generator.py

@@ -1,6 +1,6 @@
 """ Classes for defining optimization problem objects."""
 
-# Author: Genevieve Hayes
+# Author: Andrew Rollings
 # License: BSD 3 clause
 
 import numpy as np