Skip to content

Commit a76fc5e

Browse files
authored
Fixed sum to ensure numba type copatability (#662)
* Fixed numba errors in age.py * Changed sum to np.sum for numba compatability
1 parent 5a2bd2a commit a76fc5e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pymoo/algorithms/moo/age.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ def minkowski_distances(A, B, p):
232232
distances = np.zeros((m1, m2))
233233
for i in range(m1):
234234
for j in range(m2):
235-
distances[i][j] = sum(np.abs(A[i] - B[j]) ** p) ** (1 / p)
235+
distances[i][j] = np.sum(np.abs(A[i] - B[j]) ** p) ** (1 / p)
236236

237237
return distances
238238

@@ -262,13 +262,13 @@ def find_corner_solutions(front):
262262

263263
@jit(nopython=True, fastmath=True)
264264
def point_2_line_distance(P, A, B):
265-
d = np.zeros(P.shape[0])
265+
d = np.zeros(P.shape[0], dtype=numba.float64)
266266

267267
for i in range(P.shape[0]):
268268
pa = P[i] - A
269269
ba = B - A
270270
t = np.dot(pa, ba) / np.dot(ba, ba)
271-
d[i] = sum((pa - t * ba) ** 2)
271+
d[i] = np.sum((pa - t * ba) ** 2)
272272

273273
return d
274274

pymoo/algorithms/moo/age2.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def __init__(self,
6666

6767
@jit(nopython=True, fastmath=True)
6868
def project_on_manifold(point, p):
69-
dist = sum(point[point > 0] ** p) ** (1/p)
69+
dist = np.sum(point[point > 0] ** p) ** (1/p)
7070
return np.multiply(point, 1 / dist)
7171

7272

@@ -178,16 +178,16 @@ def pairwise_distances(front, p):
178178
if 0.95 < p < 1.05:
179179
for row in range(0, m - 1):
180180
for column in range(row + 1, m):
181-
distances[row][column] = sum(np.abs(projected_front[row] - projected_front[column]) ** 2) ** 0.5
181+
distances[row][column] = np.sum(np.abs(projected_front[row] - projected_front[column]) ** 2) ** 0.5
182182

183183
else:
184184
for row in range(0, m-1):
185185
for column in range(row+1, m):
186186
mid_point = projected_front[row] * 0.5 + projected_front[column] * 0.5
187187
mid_point = project_on_manifold(mid_point, p)
188188

189-
distances[row][column] = sum(np.abs(projected_front[row] - mid_point) ** 2) ** 0.5 + \
190-
sum(np.abs(projected_front[column] - mid_point) ** 2) ** 0.5
189+
distances[row][column] = np.sum(np.abs(projected_front[row] - mid_point) ** 2) ** 0.5 + \
190+
np.sum(np.abs(projected_front[column] - mid_point) ** 2) ** 0.5
191191

192192
return distances + distances.T
193193

0 commit comments

Comments
 (0)