Skip to content

Commit

Permalink
use normal integer dtype for state intervals
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Böck committed Sep 19, 2017
1 parent 515ee79 commit dcdbb8b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions madmom/features/beats_hmm.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,17 @@ def __init__(self, min_interval, max_interval, num_intervals=None):
intervals = np.unique(np.round(intervals))
num_log_intervals += 1
# save the intervals
self.intervals = np.ascontiguousarray(intervals, dtype=np.uint32)
self.intervals = np.ascontiguousarray(intervals, dtype=np.int)
# number of states and intervals
self.num_states = int(np.sum(intervals))
self.num_states = np.sum(intervals)
self.num_intervals = len(intervals)
# define first and last states
first_states = np.cumsum(np.r_[0, self.intervals[:-1]])
self.first_states = first_states.astype(np.uint32)
self.last_states = np.cumsum(self.intervals).astype(np.uint32) - 1
self.first_states = first_states.astype(np.int)
self.last_states = np.cumsum(self.intervals) - 1
# define the positions and intervals of the states
self.state_positions = np.empty(self.num_states)
self.state_intervals = np.empty(self.num_states, dtype=np.uint32)
self.state_intervals = np.empty(self.num_states, dtype=np.int)
# Note: having an index counter is faster than ndenumerate
idx = 0
for i in self.intervals:
Expand Down Expand Up @@ -150,7 +150,7 @@ def __init__(self, num_beats, min_interval, max_interval,
# model N beats as a bar
self.num_beats = int(num_beats)
self.state_positions = np.empty(0)
self.state_intervals = np.empty(0, dtype=np.uint32)
self.state_intervals = np.empty(0, dtype=np.int)
self.num_states = 0
# save the first and last states of the individual beats in a list
self.first_states = []
Expand Down Expand Up @@ -196,8 +196,8 @@ def __init__(self, state_spaces):
self.num_patterns = len(state_spaces)
self.state_spaces = state_spaces
self.state_positions = np.empty(0)
self.state_intervals = np.empty(0, dtype=np.uint32)
self.state_patterns = np.empty(0, dtype=np.uint32)
self.state_intervals = np.empty(0, dtype=np.int)
self.state_patterns = np.empty(0, dtype=np.int)
self.num_states = 0
# save the first and last states of the individual patterns in a list
self.first_states = []
Expand Down

0 comments on commit dcdbb8b

Please sign in to comment.