Merge pull request #6388 from andyfaff/gbf_zip

BENCH: BenchmarkGlobal - getting it to work in Python3
scipy · Jul 30, 2016 · 8ade86a · 8ade86a
2 parents 901ea9f + bfccb7c
commit 8ade86a
Show file tree

Hide file tree

Showing 29 changed files with 294 additions and 251 deletions.
diff --git a/benchmarks/benchmarks/go_benchmark_functions/go_benchmark.py b/benchmarks/benchmarks/go_benchmark_functions/go_benchmark.py
@@ -86,7 +86,7 @@ def initial_vector(self):
             parameter.
         """
 
-        return asarray([np.random.uniform(l, u) for l, u in self._bounds])
+        return asarray([np.random.uniform(l, u) for l, u in self.bounds])
 
     def success(self, x, tol=1.e-5):
         """
@@ -156,7 +156,7 @@ def change_dimensions(self, ndim):
         """
 
         if self.change_dimensionality:
-            self.dimensions = ndim
+            self._dimensions = ndim
         else:
             raise ValueError('dimensionality cannot be changed for this'
                              'problem')

diff --git a/benchmarks/benchmarks/go_benchmark_functions/go_funcs_A.py b/benchmarks/benchmarks/go_benchmark_functions/go_funcs_A.py
@@ -35,7 +35,7 @@ class Ackley01(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-35.0] * self.N, [35.0] * self.N)
+        self._bounds = list(zip([-35.0] * self.N, [35.0] * self.N))
         self.global_optimum = [[0 for _ in range(self.N)]]
         self.fglob = 0.0
         self.change_dimensionality = True
@@ -73,7 +73,7 @@ class Ackley02(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-32.0] * self.N, [32.0] * self.N)
+        self._bounds = list(zip([-32.0] * self.N, [32.0] * self.N))
         self.global_optimum = [[0 for _ in range(self.N)]]
         self.fglob = -200.
 
@@ -112,7 +112,7 @@ class Ackley03(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-32.0] * self.N, [32.0] * self.N)
+        self._bounds = list(zip([-32.0] * self.N, [32.0] * self.N))
         self.global_optimum = [[-0.68255758, -0.36070859]]
         self.fglob = -195.62902825923879
 
@@ -185,7 +185,7 @@ class Alpine01(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-10.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([-10.0] * self.N, [10.0] * self.N))
         self.global_optimum = [[0 for _ in range(self.N)]]
         self.fglob = 0.0
         self.change_dimensionality = True
@@ -225,7 +225,7 @@ class Alpine02(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([0.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([0.0] * self.N, [10.0] * self.N))
         self.global_optimum = [[7.91705268, 4.81584232]]
         self.fglob = -6.12950
         self.change_dimensionality = True
@@ -264,7 +264,7 @@ class AMGM(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([0.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([0.0] * self.N, [10.0] * self.N))
         self.global_optimum = [[1, 1]]
         self.fglob = 0.0
         self.change_dimensionality = True

diff --git a/benchmarks/benchmarks/go_benchmark_functions/go_funcs_B.py b/benchmarks/benchmarks/go_benchmark_functions/go_funcs_B.py
@@ -32,7 +32,7 @@ class BartelsConn(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-500.] * self.N, [500.] * self.N)
+        self._bounds = list(zip([-500.] * self.N, [500.] * self.N))
         self.global_optimum = [[0 for _ in range(self.N)]]
         self.fglob = 1.0
 
@@ -70,7 +70,7 @@ class Beale(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-4.5] * self.N, [4.5] * self.N)
+        self._bounds = list(zip([-4.5] * self.N, [4.5] * self.N))
         self.global_optimum = [[3.0, 0.5]]
         self.fglob = 0.0
 
@@ -113,8 +113,8 @@ class BiggsExp02(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([0] * 2,
-                           [20] * 2)
+        self._bounds = list(zip([0] * 2,
+                                [20] * 2))
         self.global_optimum = [[1., 10.]]
         self.fglob = 0
 
@@ -158,8 +158,8 @@ class BiggsExp03(Benchmark):
     def __init__(self, dimensions=3):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([0] * 3,
-                           [20] * 3)
+        self._bounds = list(zip([0] * 3,
+                                [20] * 3))
         self.global_optimum = [[1., 10., 5.]]
         self.fglob = 0
 
@@ -203,8 +203,8 @@ class BiggsExp04(Benchmark):
     def __init__(self, dimensions=4):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([0.] * 4,
-                           [20.] * 4)
+        self._bounds = list(zip([0.] * 4,
+                                [20.] * 4))
         self.global_optimum = [[1., 10., 1., 5.]]
         self.fglob = 0
 
@@ -248,8 +248,8 @@ class BiggsExp05(Benchmark):
     def __init__(self, dimensions=5):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([0.] * 5,
-                           [20.] * 5)
+        self._bounds = list(zip([0.] * 5,
+                                [20.] * 5))
         self.global_optimum = [[1., 10., 1., 5., 4.]]
         self.fglob = 0
 
@@ -292,8 +292,8 @@ class Bird(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-2.0 * pi] * self.N,
-                           [2.0 * pi] * self.N)
+        self._bounds = list(zip([-2.0 * pi] * self.N,
+                                [2.0 * pi] * self.N))
         self.global_optimum = [[4.701055751981055, 3.152946019601391],
                                [-1.582142172055011, -3.130246799635430]]
         self.fglob = -106.7645367198034
@@ -335,7 +335,7 @@ class Bohachevsky1(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-100.0] * self.N, [100.0] * self.N)
+        self._bounds = list(zip([-100.0] * self.N, [100.0] * self.N))
         self.global_optimum = [[0 for _ in range(self.N)]]
         self.fglob = 0.0
 
@@ -377,7 +377,7 @@ class Bohachevsky2(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-100.0] * self.N, [100.0] * self.N)
+        self._bounds = list(zip([-100.0] * self.N, [100.0] * self.N))
         self.global_optimum = [[0 for _ in range(self.N)]]
         self.fglob = 0.0
 
@@ -418,7 +418,7 @@ class Bohachevsky3(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-100.0] * self.N, [100.0] * self.N)
+        self._bounds = list(zip([-100.0] * self.N, [100.0] * self.N))
         self.global_optimum = [[0 for _ in range(self.N)]]
         self.fglob = 0.0
 
@@ -587,7 +587,7 @@ class Brent(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-10.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([-10.0] * self.N, [10.0] * self.N))
         self.custom_bounds = ([-10, 2], [-10, 2])
 
         self.global_optimum = [[-10.0, -10.0]]
@@ -628,7 +628,7 @@ class Brown(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-1.0] * self.N, [4.0] * self.N)
+        self._bounds = list(zip([-1.0] * self.N, [4.0] * self.N))
         self.custom_bounds = ([-1.0, 1.0], [-1.0, 1.0])
 
         self.global_optimum = [[0 for _ in range(self.N)]]

diff --git a/benchmarks/benchmarks/go_benchmark_functions/go_funcs_C.py b/benchmarks/benchmarks/go_benchmark_functions/go_funcs_C.py
@@ -37,7 +37,7 @@ class CarromTable(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-10.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([-10.0] * self.N, [10.0] * self.N))
         self.global_optimum = [(9.646157266348881, 9.646134286497169),
                                (-9.646157266348881, 9.646134286497169),
                                (9.646157266348881, -9.646134286497169),
@@ -86,7 +86,7 @@ class Chichinadze(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-30.0] * self.N, [30.0] * self.N)
+        self._bounds = list(zip([-30.0] * self.N, [30.0] * self.N))
         self.custom_bounds = [(-10, 10), (-10, 10)]
 
         self.global_optimum = [[6.189866586965680, 0.5]]
@@ -125,8 +125,8 @@ class Cigar(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-100.0] * self.N,
-                           [100.0] * self.N)
+        self._bounds = list(zip([-100.0] * self.N,
+                                [100.0] * self.N))
         self.custom_bounds = [(-5, 5), (-5, 5)]
 
         self.global_optimum = [[0 for _ in range(self.N)]]
@@ -189,7 +189,7 @@ def __init__(self, dimensions=17):
         Benchmark.__init__(self, dimensions)
 
         self._bounds = [[0.0, 4.0]] + list(zip([-4.0] * (self.N - 1),
-                 [4.0] * (self.N - 1)))
+                                               [4.0] * (self.N - 1)))
 
         self.global_optimum = [[0.651906, 1.30194, 0.099242, -0.883791,
                                 -0.8796, 0.204651, -3.28414, 0.851188,
@@ -257,7 +257,7 @@ class Colville(Benchmark):
     def __init__(self, dimensions=4):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-10.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([-10.0] * self.N, [10.0] * self.N))
 
         self.global_optimum = [[1 for _ in range(self.N)]]
         self.fglob = 0.0
@@ -306,7 +306,7 @@ class Corana(Benchmark):
     def __init__(self, dimensions=4):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-5.0] * self.N, [5.0] * self.N)
+        self._bounds = list(zip([-5.0] * self.N, [5.0] * self.N))
 
         self.global_optimum = [[0 for _ in range(self.N)]]
         self.fglob = 0.0
@@ -358,7 +358,7 @@ def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
         self.change_dimensionality = True
-        self._bounds = zip([-1.0] * self.N, [1.0] * self.N)
+        self._bounds = list(zip([-1.0] * self.N, [1.0] * self.N))
 
         self.global_optimum = [[-1. for _ in range(self.N)]]
         self.fglob = -0.9 * self.N
@@ -397,7 +397,7 @@ class CrossInTray(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-10.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([-10.0] * self.N, [10.0] * self.N))
 
         self.global_optimum = [(1.349406685353340, 1.349406608602084),
                                (-1.349406685353340, 1.349406608602084),
@@ -441,7 +441,7 @@ class CrossLegTable(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-10.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([-10.0] * self.N, [10.0] * self.N))
 
         self.global_optimum = [[0., 0.]]
         self.fglob = -1.0
@@ -482,7 +482,7 @@ class CrownedCross(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-10.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([-10.0] * self.N, [10.0] * self.N))
 
         self.global_optimum = [[0, 0]]
         self.fglob = 0.0001
@@ -524,7 +524,7 @@ def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
         self.change_dimensionality = True
-        self._bounds = zip([-1.0] * self.N, [1.0] * self.N)
+        self._bounds = list(zip([-1.0] * self.N, [1.0] * self.N))
 
         self.global_optimum = [[0 for _ in range(self.N)]]
         self.fglob = np.nan
@@ -580,7 +580,7 @@ class Cube(Benchmark):
     def __init__(self, dimensions=2):
         Benchmark.__init__(self, dimensions)
 
-        self._bounds = zip([-10.0] * self.N, [10.0] * self.N)
+        self._bounds = list(zip([-10.0] * self.N, [10.0] * self.N))
         self.custom_bounds = ([0, 2], [0, 2])
 
         self.global_optimum = [[1.0, 1.0]]