Added new "scalenator" method and some helpers for forte & ais sets

New "scalenator" method can be used to create new scales from anything from it's binary form that is turned to interval array. See wiki info for scaled for more info. Forte & AIS sets yet to be documented.

Author: amiika

lib/generators.rb

@@ -152,18 +152,27 @@ def bools_to_durations(arr, default_dur=1.0, rhythm_map=nil)
     end
   end
 
-  def parse_binary(val, default_dur=1.0, rhythm_map=nil)
+  def parse_binary_as_rhythm(val, default_dur=1.0, rhythm_map=nil)
+    bools_to_durations(parse_binary(val), default_dur, rhythm_map)
+  end
+
+  def parse_binary(val)
     if val.is_a?(Integer)
-      bools_to_durations(val.to_s(2).split("").map{|b| b=="1" ? true : false }.flatten, default_dur, rhythm_map)
+      val.to_s(2).split("").map{|b| b=="1" ? true : false }.flatten
     elsif val.is_a?(String)
-      bools_to_durations(val.bytes.map {|v| v.to_s(2).split("").map{|b| b=="1" ? true : false } }.flatten, default_dur, rhythm_map)
+      val.bytes.map {|v| v.to_s(2).split("").map{|b| b=="1" ? true : false } }.flatten
     elsif val.is_a?(Array) or val.is_a?(SonicPi::Core::RingVector)
-      bools_to_durations(val,default_dur,rhythm_map)
+      val
     else
-      raise "Not that shit!"
+      raise "Could not parse binary!"
     end
   end
 
+  # Creates "scales" out of things
+  def scalenator(val)
+    bools_to_intervals(parse_binary(val))
+  end
+
   # Tonnetz moves
   def get_move(move,triad)
     moves = {

lib/pc_sets.rb

@@ -1,5 +1,19 @@
-# From  http //www.stephenandrewtaylor.net/setfinder/index.html
+module Ziffers
+
+  def forte(n)
+    if n.is_a?(String)
+      r = FORTE.key(n)
+    elsif n.is_a?(Integer)
+      r = FORTE.keys[n]
+    elsif n.is_a?(Array)
+      r = n.sort
+      r = FORTE[r]
+      r = "No forte name for: "+n.to_s if !r
+    end
+    r ? r : []
+  end
 
+# From  http //www.stephenandrewtaylor.net/setfinder/index.html
 FORTE = {
   [0, 1, 2] =>  "3-1",
   [0, 1, 3] =>  "3-2",
@@ -211,6 +225,19 @@
   [0, 1, 2, 4, 5, 6, 8, 9, 10] =>  "9-12"
 }
 
+def ais(n)
+  if n.is_a?(String)
+    r = AIS.key(n)
+  elsif n.is_a?(Integer)
+    r = AIS.keys[n]
+  elsif n.is_a?(Array)
+    r = n.sort
+    r = AIS[r]
+    r = "Not an AIS name for: "+n.to_s if !r
+  end
+  r ? r : []
+end
+
 # From  https //github.com/marcobn/TheHichhikersGuideToAIS
 AIS = {
   [0, 1, 3, 7, 2, 5, 11, 10, 8, 4, 9, 6] =>  "12-0P",
@@ -1132,3 +1159,5 @@
   [0, 4, 3, 1, 9, 11, 8, 2, 7, 10, 5, 6] =>  "12-916",
   [0, 4, 3, 1, 9, 2, 8, 5, 7, 10, 11, 6] =>  "12-917L"
 }
+
+end

lib/ziffarray.rb

@@ -571,12 +571,12 @@ def modify_rhythm(val, loop_n=0, rhythm_map=nil)
       new_arr = self.deep_clone
       val = val.() if val.is_a? Proc
       if val.is_a?(Array) and (!val.union([true,false]).difference([true,false]).any? or !val.union([1,0]).difference([1,0]).any?)
-        pattern = parse_binary(val, 1.0, rhythm_map) # If boolean or bool as int array
+        pattern = parse_binary_as_rhythm(val, 1.0, rhythm_map) # If boolean or bool as int array
       elsif val.is_a?(Array)
         pattern = val.map {|v| v.is_a?(Float) ? v : int_to_length(v)}
       elsif val.is_a?(SonicPi::Core::RingVector)
         if !val.to_a.union([true,false]).difference([true,false]).any? or !val.to_a.union([1,0]).difference([1,0]).any?
-          pattern = parse_binary(val, 1.0, rhythm_map) # If boolean ring
+          pattern = parse_binary_as_rhythm(val, 1.0, rhythm_map) # If boolean ring
         else
           pattern = val.map {|v| v.is_a?(Float) ? v : int_to_length(v)}
         end
@@ -589,7 +589,7 @@ def modify_rhythm(val, loop_n=0, rhythm_map=nil)
           pattern = map_pcs_to_durations(numbers)
         elsif val[:binary]
           val[:binary] = val[:binary].() if val[:binary].is_a? Proc
-          pattern = parse_binary(val[:binary], (val[:ratio] ? val[:ratio] : 1.0), rhythm_map)
+          pattern = parse_binary_as_rhythm(val[:binary], (val[:ratio] ? val[:ratio] : 1.0), rhythm_map)
         elsif val[:minor] and val[:major]
           pattern = schillinger(val, rhythm_map)
         elsif val[:pattern]