Skip to content

Commit

Permalink
Cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
isaksamsten committed Nov 16, 2023
1 parent 908badc commit b7a0d69
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 120 deletions.
1 change: 0 additions & 1 deletion src/wildboar/distance/_cdistance.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -1551,7 +1551,6 @@ cdef class _SubsequenceDistanceProfile:
return self.x.shape[0]

def __call__(self, Py_ssize_t job_id, Py_ssize_t offset, Py_ssize_t batch_size):
# offset is either in subsequences or x.shape[0] depending on which is larger
cdef Py_ssize_t i, j
cdef SubsequenceMetric metric = deepcopy(self.metric)

Expand Down
119 changes: 0 additions & 119 deletions src/wildboar/distance/_metric.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -170,125 +170,6 @@ cdef class ScaledEuclideanSubsequenceMetric(ScaledSubsequenceMetric):
indicies
)

# cdef double transient_distance(
# self,
# SubsequenceView *s,
# TSArray X,
# Py_ssize_t index,
# Py_ssize_t *return_index=NULL,
# ) noexcept nogil:
# return self._distance(
# &X[s.index, s.dim, s.start],
# s.length,
# s.mean,
# s.std if s.std != 0.0 else 1.0,
# &X[index, s.dim, 0],
# X.shape[2],
# return_index,
# )

# cdef double persistent_distance(
# self,
# Subsequence *s,
# TSArray X,
# Py_ssize_t index,
# Py_ssize_t *return_index=NULL,
# ) noexcept nogil:
# return scaled_euclidean_distance(
# s.data,
# s.length,
# s.mean,
# s.std if s.std != 0.0 else 1.0,
# &X[index, s.dim, 0],
# X.shape[2],
# self.X_buffer,
# return_index,
# )

# cdef Py_ssize_t transient_matches(
# self,
# SubsequenceView *v,
# TSArray X,
# Py_ssize_t index,
# double threshold,
# double *distances,
# Py_ssize_t *indicies,
# ) noexcept nogil:
# return scaled_euclidean_distance_matches(
# &X[v.index, v.dim, v.start],
# v.length,
# v.mean,
# v.std if v.std != 0.0 else 1.0,
# &X[index, v.dim, 0],
# X.shape[2],
# self.X_buffer,
# threshold,
# distances,
# indicies,
# )

# cdef Py_ssize_t persistent_matches(
# self,
# Subsequence *s,
# TSArray X,
# Py_ssize_t index,
# double threshold,
# double *distances,
# Py_ssize_t *indicies,
# ) noexcept nogil:
# return scaled_euclidean_distance_matches(
# s.data,
# s.length,
# s.mean,
# s.std if s.std != 0.0 else 1.0,
# &X[index, s.dim, 0],
# X.shape[2],
# self.X_buffer,
# threshold,
# distances,
# indicies,
# )

# cdef void transient_profile(
# self,
# SubsequenceView *s,
# TSArray X,
# Py_ssize_t index,
# double *dp,
# ) noexcept nogil:
# scaled_euclidean_distance_matches(
# &X[v.index, v.dim, v.start],
# v.length,
# v.mean,
# v.std if v.std != 0.0 else 1.0,
# &X[index, v.dim, 0],
# X.shape[2],
# self.X_buffer,
# INFINITY,
# distances,
# NULL,
# )

# cdef void persistent_profile(
# self,
# Subsequence *s,
# TSArray X,
# Py_ssize_t index,
# double *dp,
# ) noexcept nogil:
# scaled_euclidean_distance_matches(
# s.data,
# s.length,
# s.mean,
# s.std if s.std != 0.0 else 1.0,
# &X[index, s.dim, 0],
# X.shape[2],
# self.X_buffer,
# INFINITY,
# dp,
# NULL,
# )


cdef class ManhattanSubsequenceMetric(SubsequenceMetric):
def __init__(self):
Expand Down

0 comments on commit b7a0d69

Please sign in to comment.