post_tonal 0.1.1.pre → 0.2.0.pre

data/CHANGELOG.md

@@ -1,17 +1,24 @@
 #CHANGELOG
 
+####October 22, 2012 [0.2.0.pre]
+- Implements prime form
+- Fixes normal form logic and updates tests
+
+####October 21, 2012 [0.1.1.pre]
+- Adds homepage information to gem specification
+
 ####October 21, 2012 [0.1.1.pre]
--Add homepage information to gem specification
+- Adds homepage information to gem specification
 
 ####October 21, 2012 [0.1.0.pre]
--Implement transposition in PitchClassSet
--Change normal_form, inversion, and transpose so that they each return a PitchClassSet
+- Implements transposition in PitchClassSet
+- Changes normal_form, inversion, and transpose so that they each return a PitchClassSet
 
 ####October 20, 2012 [0.0.3.pre]
--Implement inversion in PitchClassSet
+- Implements inversion in PitchClassSet
 
 ####October 16, 2012 [0.0.2.pre]
--Implement normal form in PitchClassSet
+- Implements normal form in PitchClassSet
 
 ####October 15, 2012 [0.0.1.pre]
-- Create PitchClass, PitchClassSet, PitchClassInterval, PitchInterval, and NoteParser
+- Creates PitchClass, PitchClassSet, PitchClassInterval, PitchInterval, and NoteParser

data/lib/post_tonal/pitch_class_set.rb

@@ -7,8 +7,9 @@ module PostTonal
 
 		def initialize(pitch_classes = nil)
 			@pitch_classes = pitch_classes || []
-			@normalized_pitch_classes = pitch_classes ? self.class.to_normal_form(@pitch_classes) : []
-			@inverted_pitch_classes = pitch_classes ? invert(@pitch_classes) : []
+			@normalized_pitch_classes = @pitch_classes.size > 0 ? self.class.to_normal_form(@pitch_classes) : []
+			@inverted_pitch_classes = @pitch_classes.size > 0 ? invert(@pitch_classes) : []
+			@prime_pitch_classes = @pitch_classes.size > 0 ? to_prime_form : []
 		end
 
 		# Add a pitch to the pitch class set
@@ -31,16 +32,17 @@ module PostTonal
 				@pitch_classes << pc
 				@normalized_pitch_classes = self.class.to_normal_form(@pitch_classes)
 				@inverted_pitch_classes = invert(@pitch_classes)
+				@prime_pitch_classes = to_prime_form
 			end
 
 			pc
 		end
 
 		def eql?(pitch_class_set)
-			return false if @pitch_classes.size != pitch_class_set.pitch_classes.size
+			return false if @pitch_classes.size != pitch_class_set.pitch_classes.size || @pitch_classes.size == 0
 
-			@normalized_pitch_classes.each_with_index do |pitch_class, i|
-				return false if !pitch_class_set.normal_form.pitch_classes[i].eql?(pitch_class)
+			@pitch_classes.each_with_index do |pitch_class, i|
+				return false if !pitch_class.eql?(pitch_class_set.pitch_classes[i])
 			end
 
 			true
@@ -75,19 +77,14 @@ module PostTonal
 				if newLen < shortest[:length]
 					shortest = {:array => normal.dup, :length => newLen}
 				elsif newLen == shortest[:length]
-					(normal.size - 1).downto(q) do |r|
 
-						newLen = normal[r].value - normal.first.value
-						newLen += 12 if newLen < 0
-						newLen += 12 if newLen == 1 && normal.size > 2
+					rs = shortest[:array].reverse
+					normal.reverse.each_with_index do |pitch_class, i|
+						this_dist = (pitch_class.value - normal.first.value).abs
+						that_dist = (rs[i].value - rs.last.value).abs
 
-						sNewLen = shortest[:array][r].value - shortest[:array].first.value
-						sNewLen += 12 if sNewLen < 0
-						sNewLen += 12 if sNewLen == 1 && normal.size > 2
-
-						if newLen < sNewLen
-							shortest = {:array => normal.dup, :length => newLen}
-							break
+						if this_dist < that_dist
+							shortest = {:array => normal, :length => newLen}
 						end
 					end
 				end
@@ -106,9 +103,21 @@ module PostTonal
 			self.class.new(@normalized_pitch_classes)
 		end
 
-		# Transposes the set by a degree (integer)
+		# Returns a PitchClassSet of the current PitchClassSet in prime form
+		def prime_form
+			prime1 = normal_form.transpose_to_zero
+			prime2 = inversion.normal_form.transpose_to_zero
+			return prime2 if prime2.is_more_packed_than? prime1
+			prime1
+		end
+
+		# Transposes the set
+		# 
+		# degree - The number of steps to transpose. May be positive or negative
+		# reset_octave - If true, resets octave attribute to 0 for all pitch classes
+		# 
 		# Returns PitchClassSet of the transposed set
-		def transpose(degree)
+		def transpose(degree, reset_octave = false)
 			transposed = self.class.new
 
 			@pitch_classes.each do |pitch_class|
@@ -117,8 +126,12 @@ module PostTonal
 
 				val += degree
 
-				oct += val / 12
-				oct -= 1 if val < 0 && val % 12 == 0
+				if reset_octave
+					oct = 0
+				else
+					oct += val / 12
+					oct -= 1 if val < 0 && val % 12 == 0
+				end
 
 				transposed.add_pitch(val, oct)
 			end
@@ -126,7 +139,34 @@ module PostTonal
 			transposed
 		end
 
-		private
+		def reset_octave
+			ro = []
+
+			@pitch_classes.each do |pitch_class|
+				ro << PitchClass.new(pitch_class.value)
+			end
+
+			self.class.new(ro)
+		end
+
+		# Check if this pitch class set is more tightly packed to the left than the comparison pitch class set.
+		#
+		# Returns false if less tightly packed or if is the same set
+		def is_more_packed_than?(pitch_class_set)
+			return false if (@pitch_classes.size != pitch_class_set.pitch_classes.size || @pitch_classes.size == 0) || eql?(pitch_class_set)
+
+			rpcs = pitch_class_set.pitch_classes.reverse
+			@pitch_classes.reverse.each_with_index do |pitch_class, i|
+				this_dist = (pitch_class.value - @pitch_classes.first.value).abs
+				that_dist = (rpcs[i].value - rpcs.last.value).abs
+
+				return true if this_dist < that_dist
+			end
+
+			false
+		end
+
+		protected
 
 		# Inverts an array of pitch classes. The PitchClass attribute octave may become invalid after inversion.
 		# Returns a PitchClassSet of the inverted pitch classes
@@ -141,5 +181,22 @@ module PostTonal
 			inverted
 		end
 
+		# Returns the normal form of an array of pitch classes
+		def to_prime_form
+			#prime1 = normal_form.transpose_to_zero.pitch_classes
+			#prime2 = inversion.normal_form.transpose_to_zero
+
+			#return prime1.pitch_classes if prime1.is_more_packed_than? prime2
+			#return prime2.pitch_classes_classes
+			[]
+		end
+
+		def transpose_to_zero
+			dist = 12 - @pitch_classes[0].value
+			"TT0: #{@pitch_classes}, dist: #{dist}"
+			return transpose(dist, true) if dist % 12 != 0
+			self
+		end
+
 	end
 end

data/lib/post_tonal/version.rb

@@ -1,3 +1,3 @@
 module PostTonal
-	VERSION = '0.1.1.pre'
+	VERSION = '0.2.0.pre'
 end

data/test/unit/pitch_class_set_test.rb

@@ -118,6 +118,20 @@ class PitchClassSetTest < Test::Unit::TestCase
 		[6,7,0].each_with_index do |n, i|
 			assert_equal(n, @p7.normal_form.pitch_classes[i].value)
 		end
+
+		@p8 = PostTonal::PitchClassSet.new
+		@p8.add_pitch(0)
+		@p8.add_pitch(3)
+		@p8.add_pitch(8)
+		@p8.add_pitch(9)
+
+		@p8n = PostTonal::PitchClassSet.new
+		@p8n.add_pitch(8)
+		@p8n.add_pitch(9)
+		@p8n.add_pitch(0)
+		@p8n.add_pitch(3)
+
+		assert_equal(@p8n, @p8.normal_form, "Normal form of #{@p8} should be #{@p8n}")
 	end
 
 	def test_inversion
@@ -156,4 +170,117 @@ class PitchClassSetTest < Test::Unit::TestCase
 		end
 	end
 
+	def test_prime_form
+		@p1 = PostTonal::PitchClassSet.new
+		@p1.add_pitch(0)
+		@p1.add_pitch(1)
+		@p1.add_pitch(4)
+		@p1.add_pitch(7)
+
+		@p1p = PostTonal::PitchClassSet.new
+		@p1p.add_pitch(0)
+		@p1p.add_pitch(1)
+		@p1p.add_pitch(4)
+		@p1p.add_pitch(7)
+
+		assert_equal(@p1p, @p1.prime_form)
+
+
+		@p2 = PostTonal::PitchClassSet.new
+		@p2.add_pitch(6)
+		@p2.add_pitch(7)
+		@p2.add_pitch(8)
+
+		@p2p = PostTonal::PitchClassSet.new
+		@p2p.add_pitch(0)
+		@p2p.add_pitch(1)
+		@p2p.add_pitch(2)
+
+		assert_equal(@p2p, @p2.prime_form)
+
+		@p3 = PostTonal::PitchClassSet.new
+		@p3.add_pitch(0)
+		@p3.add_pitch(3)
+		@p3.add_pitch(8)
+		@p3.add_pitch(9)
+
+		@p3p = PostTonal::PitchClassSet.new
+		@p3p.add_pitch(0)
+		@p3p.add_pitch(1)
+		@p3p.add_pitch(4)
+		@p3p.add_pitch(7)
+
+		assert_equal(@p3p, @p3.prime_form)
+
+
+		@p4 = PostTonal::PitchClassSet.new
+		@p4.add_pitch(1)
+		@p4.add_pitch(5)
+		@p4.add_pitch(6)
+		@p4.add_pitch(7)
+
+		@p4p = PostTonal::PitchClassSet.new
+		@p4p.add_pitch(0)
+		@p4p.add_pitch(1)
+		@p4p.add_pitch(2)
+		@p4p.add_pitch(6)
+
+		assert_equal(@p4p, @p4.prime_form)
+
+		@p5 = PostTonal::PitchClassSet.new
+		@p5.add_pitch(0)
+		@p5.add_pitch(2)
+		@p5.add_pitch(4)
+		@p5.add_pitch(7)
+		@p5.add_pitch(11)
+
+		@p5p = PostTonal::PitchClassSet.new
+		@p5p.add_pitch(0)
+		@p5p.add_pitch(1)
+		@p5p.add_pitch(3)
+		@p5p.add_pitch(5)
+		@p5p.add_pitch(8)
+
+		assert_equal(@p5p, @p5.prime_form)
+
+		@p6 = PostTonal::PitchClassSet.new
+		@p6.add_pitch(3)
+		@p6.add_pitch(6)
+		@p6.add_pitch(7)
+		@p6.add_pitch(8)
+		@p6.add_pitch(9)
+		@p6.add_pitch(10)
+
+		@p6p = PostTonal::PitchClassSet.new
+		@p6p.add_pitch(0)
+		@p6p.add_pitch(1)
+		@p6p.add_pitch(2)
+		@p6p.add_pitch(3)
+		@p6p.add_pitch(4)
+		@p6p.add_pitch(7)
+
+		assert_equal(@p6p, @p6.prime_form)
+
+		@p7 = PostTonal::PitchClassSet.new
+		@p7.add_pitch(0)
+		@p7.add_pitch(2)
+		@p7.add_pitch(5)
+		@p7.add_pitch(6)
+		@p7.add_pitch(7)
+		@p7.add_pitch(9)
+		@p7.add_pitch(10)
+		@p7.add_pitch(11)
+
+		@p7p = PostTonal::PitchClassSet.new
+		@p7p.add_pitch(0)
+		@p7p.add_pitch(1)
+		@p7p.add_pitch(2)
+		@p7p.add_pitch(4)
+		@p7p.add_pitch(5)
+		@p7p.add_pitch(6)
+		@p7p.add_pitch(7)
+		@p7p.add_pitch(9)
+
+		assert_equal(@p7p, @p7.prime_form)
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: post_tonal
 version: !ruby/object:Gem::Version
-  version: 0.1.1.pre
+  version: 0.2.0.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda