comparison Syncopation models/syncopation.py @ 10:a3ed7d2b57d8

updating main py files to point at new
file names

 	elif timesig == None and subdivision_seq == None:
 		print 'Error: please indicate either time signature or subdivision sequence.'
 	
 	else:
 		while subdivision_seq == None:
-			from BasicFuncs import get_subdivision_seq
+			from basic_functions import get_subdivision_seq
 			subdivision_seq = get_subdivision_seq(timesig, L_max)
 
 		# The get_rhythm_category function is used to detect rhythm category: monorhythm or polyrhythm.
 		# For monorhythms, all prime factors of the length of minimum time-span representation of this sequence are
 		# elements of its subdivision_seq, otherwise it is polyrhythm; 
 		# e.g. prime_factors of polyrhythm 100100101010 in 4/4 is [2,3] but subdivision_seq = [1,2,2] for 4/4 
 		def get_rhythm_category():
 			rhythm_category = 'mono'
-			from BasicFuncs import get_min_timeSpan, find_prime_factors
+			from basic_functions import get_min_timeSpan, find_prime_factors
 			for f in find_prime_factors(len(get_min_timeSpan(seq))):
 				if not (f in subdivision_seq): 
 					rhythm_category = 'poly'
 					break
 			return rhythm_category