@@ -234,10 +234,6 @@ def _compute_similarity_matrix_numpy(
234234 overlapping_templates = np .flatnonzero (np .sum (local_mask , 1 ))
235235 tgt_templates = tgt_sliced_templates [overlapping_templates ]
236236 for gcount , j in enumerate (overlapping_templates ):
237- # symmetric values are handled later
238- if same_array and j < i :
239- # no need exhaustive looping when same template
240- continue
241237 src = src_template [:, local_mask [j ]].reshape (1 , - 1 )
242238 tgt = (tgt_templates [gcount ][:, local_mask [j ]]).reshape (1 , - 1 )
243239
@@ -259,10 +255,8 @@ def _compute_similarity_matrix_numpy(
259255 distances [count , i , j ] = 1 - distances [count , i , j ]
260256
261257 if same_array :
262- distances [count , j , i ] = distances [count , i , j ]
258+ distances [num_shifts_both_sides - count - 1 , j , i ] = distances [count , i , j ]
263259
264- if same_array and num_shifts != 0 :
265- distances [num_shifts_both_sides - count - 1 ] = distances [count ].T
266260 return distances
267261
268262
@@ -331,10 +325,6 @@ def _compute_similarity_matrix_numba(
331325 for gcount in range (len (overlapping_templates )):
332326
333327 j = overlapping_templates [gcount ]
334- # symmetric values are handled later
335- if same_array and j < i :
336- # no need exhaustive looping when same template
337- continue
338328 src = src_template [:, local_mask [j ]].flatten ()
339329 tgt = (tgt_templates [gcount ][:, local_mask [j ]]).flatten ()
340330
@@ -370,10 +360,7 @@ def _compute_similarity_matrix_numba(
370360 distances [count , i , j ] = 1 - distances [count , i , j ]
371361
372362 if same_array :
373- distances [count , j , i ] = distances [count , i , j ]
374-
375- if same_array and num_shifts != 0 :
376- distances [num_shifts_both_sides - count - 1 ] = distances [count ].T
363+ distances [num_shifts_both_sides - count - 1 , j , i ] = distances [count , i , j ]
377364
378365 return distances
379366
0 commit comments