comparison Syncopation models/basic_functions.py @ 29:7a1730bbf15a

updating files with new text reading code

 	return upsampledVelocitySequence
 
 
 # convert a velocity sequence to its minimum time-span representation
 def velocity_sequence_to_min_timespan(velocitySequence):
+	from music_objects import VelocitySequence
 	minTimeSpanVelocitySeq = [1]
 	for divisors in find_divisor(len(velocitySequence)):
 		segments = subdivide(velocitySequence,divisors)
 		if len(segments)!=0:
 			del minTimeSpanVelocitySeq[:]
 			for s in segments:
 				minTimeSpanVelocitySeq.append(s[0])
 			if sum(minTimeSpanVelocitySeq) == sum(velocitySequence):
 				break
-	return minTimeSpanVelocitySeq
-
+	return VelocitySequence(minTimeSpanVelocitySeq)
+
+"""
 # convert a note sequence to its minimum time-span representation
 def note_sequence_to_min_timespan(noteSequence):
 	from music_objects import note_sequence_to_velocity_sequence
 	timeSpanTicks = len(note_sequence_to_velocity_sequence(noteSequence))
 #	print timeSpanTicks

 	for note in noteSequence:
 		note.startTime = note.startTime/delta_t
 		note.duration = note.duration/delta_t
 
 	return noteSequence
-
+"""
 
 # get_note_indices returns all the indices of all the notes in this velocity_sequence
 def get_note_indices(velocitySequence):
 	noteIndices = []