Refactoring variable assignments, conditional clauses and adsr

Refactored rules and removed duplicates. ADSR envelopes are now longer relative by default. Variable assignments can now be used in conditional clauses. Added index as n variable for list functions. Added thue morse sequence to enumerators.

Author: amiika

lib/defaults.rb

@@ -12,6 +12,22 @@ def int_to_length(val,map=nil)
       end
     end
 
+    def port(port_value)
+      if !port_value
+        @@default_opts.delete(:port)
+      else
+        @@default_opts[:port] = port_value
+      end
+    end
+
+    def channel(channel_value)
+      if !channel_value
+        @@default_opts.delete(:channel)
+      else
+        @@default_opts[:channel] = channel_value
+      end
+    end
+
     def get_default_opts
       @@default_opts
     end
@@ -28,10 +44,6 @@ def set_default_opts(opts)
       @@default_opts.merge!(opts)
     end
 
-    def port(port_string)
-      @@default_port = port_string
-    end
-
     def merge_synth_defaults
       @@default_opts.merge!(Hash[current_synth_defaults.to_a])
     end

lib/enumerables.rb

@@ -420,21 +420,26 @@ def sterns
 
     # https://oeis.org/A000265
     def frac2
-    Enumerator.new do |y|
-    1.step do |n|
-      n>>=1 while n%2==0
-      y << n
-    end
+      Enumerator.new do |y|
+      1.step do |n|
+        n>>=1 while n%2==0
+        y << n
+      end
+      end
     end
+
+    # http://oeis.org/A010060
+    def thue_morse(base=2,mod=base)
+      (0..Float::INFINITY).lazy.collect {|n| n.to_s(base).split("").map{|v| v.to_i}.reduce(0, :+) % mod } #.count('1') % base}
     end
 
     # https://oeis.org/A001316
     def dress(e=Float::INFINITY)
-      (0..e).lazy.collect {|n| A001316(n) }
+      (0..e).lazy.collect {|n| A001316_recursion(n) }
     end
 
     # Dress sequence https://oeis.org/A001316
-    def A001316(n)
+    def A001316_recursion(n)
       return n+1 if n <= 1
       A001316(n/2) << n%2
     end
@@ -456,13 +461,27 @@ def A342585(n)
     new_val
   end
 
-    # https://oeis.org/A030101
-    def binrev(base=2)
+    # Van Ecks sequence: http://oeis.org/A181391
+    def vanecks
     Enumerator.new do |y|
-    0.step do |n|
-      y << n.to_s(base).reverse.to_i(base)
-    end
+      last = 0
+      counts = {}
+      0.step do |i|
+        current = last
+        last = i - (counts[current] || i)
+        counts[current] = i
+        y << current
+      end
     end
+  end
+
+    # https://oeis.org/A030101
+    def binrev(base=2)
+      Enumerator.new do |y|
+      0.step do |n|
+        y << n.to_s(base).reverse.to_i(base)
+      end
+      end
     end
 
     # https://oeis.org/A000217

lib/generators.rb

@@ -170,7 +170,7 @@ def parse_binary(val)
 
   # Creates "scales" out of things
   def scalenator(val)
-    bools_to_intervals(parse_binary(val))
+    bools_to_intervals(parse_binary(val)).compact
   end
 
   # Tonnetz moves