musa-dsl 0.22.2 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700593377e2427ac571b039197f3fdb0c3d904dbe0ed74725e54f1c4421f074c
-  data.tar.gz: a0bb8dbf80d824eaf5543db333964d5cb449819c22a60fb54670a007c9b327b6
+  metadata.gz: 193117ba393c58eaf2387d7b0a5ba54bc7fbad0c6ac2e5a7171997b1629d5f69
+  data.tar.gz: 5ac3515f62f3c5d8ea34cd91552fb6d0f8d53e40f60d1383fa34a28c0b11289d
 SHA512:
-  metadata.gz: de57aaaf8a10d8a1b6ab68ae8ae9e6660488cbc3efce53fa7a1c9a4bd84872a8225ab6d854f9101deb5c7b872389789fbe653dc5b608c809cdd387f1351e53c5
-  data.tar.gz: 2719f0f97281138feb53542ea842759e965d0c1f756fdbd92797935963c9adaffe91e67212f5efd3ac2e3e2ef2d956da60cce73efbefce764aef224d8042f0bf
+  metadata.gz: 13ec912683ee5e0f0f0865ff9197e641671c430ed5a59d438b15acb5423f6d18f3f57624d5dd4c348daa69c93ac1d47428809cea84953893a4cb7f9b224613f9
+  data.tar.gz: b64ee9f844989e4db527787f763089c6bcd5aa050254da270c2c5c3461145aefef9b701da6944cda20b53286bfee2e42650c2a21de864ee8ea53f5d48aff0791

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.22.2'
+  VERSION = '0.22.3'
 end
 
 require_relative 'musa-dsl/core-ext'

data/lib/musa-dsl/sequencer/{base-sequencer-public.rb → base-sequencer.rb}

@@ -30,6 +30,7 @@ module Musa
         else
           @logger = Musa::Logger::Logger.new(sequencer: self, position_format: log_position_format)
 
+          @logger.fatal!
           @logger.error! if do_error_log || do_error_log.nil?
           @logger.debug! if do_log
         end

data/lib/musa-dsl/sequencer/sequencer.rb

@@ -1,3 +1,3 @@
-require_relative 'base-sequencer-public'
+require_relative 'base-sequencer'
 require_relative 'base-sequencer-implementation'
 require_relative 'sequencer-dsl'

data/lib/musa-dsl/series/hash-or-array-serie-splitter.rb

@@ -6,6 +6,8 @@ module Musa
       end
 
       class Splitter
+        include Enumerable
+
         def initialize(proxy)
           @proxy = proxy
           @series = {}
@@ -19,6 +21,30 @@ module Musa
           end
         end
 
+        def each
+          if block_given?
+            if @proxy.hash_mode?
+              @proxy.components.each do |key|
+                yield [key, self[key]]
+              end
+            elsif @proxy.array_mode?
+              @proxy.components.each do |index|
+                yield self[index]
+              end
+            else
+              # do nothing
+            end
+          else
+            if @proxy.hash_mode?
+              @proxy.components.collect { |key| [key, self[key]] }.each
+            elsif @proxy.array_mode?
+              @proxy.components.collect { |index| self[index] }.each
+            else
+              [].each
+            end
+          end
+        end
+
         class BufferedProxy
           include SeriePrototyping
 
@@ -29,6 +55,11 @@ module Musa
             mark_regarding! @source
           end
 
+          attr_reader :components
+
+          def hash_mode?; @hash_mode; end
+          def array_mode?; @array_mode; end
+
           protected def _instance!
             super
             restart
@@ -36,22 +67,39 @@ module Musa
 
           def restart(restart_source: true)
             @source.restart if restart_source
-            @values = nil
+
+            source = @source.instance
+            sample = source.current_value || source.peek_next_value
+
+            case sample
+            when Array
+              @components = (0..sample.size-1).to_a
+              @values = []
+              @array_mode = true
+              @hash_mode = false
+            when Hash
+              @components = sample.keys.clone
+              @values = {}
+              @array_mode = false
+              @hash_mode = true
+            else
+              @components = []
+              @values = nil
+              @array_mode = @hash_mode = false
+            end
           end
 
           def next_value(key_or_index)
-            if @values.nil? || @values[key_or_index].nil? || @values[key_or_index].empty?
+            if @values[key_or_index].nil? || @values[key_or_index].empty?
               hash_or_array_value = @source.next_value
 
               case hash_or_array_value
               when Hash
-                @values ||= {}
                 hash_or_array_value.each do |k, v|
                   @values[k] ||= []
                   @values[k] << v
                 end
               when Array
-                @values ||= []
                 hash_or_array_value.each_index do |i|
                   @values[i] ||= []
                   @values[i] << hash_or_array_value[i]

data/lib/musa-dsl/series/main-serie-constructors.rb

@@ -268,9 +268,7 @@ module Musa
         @to.nil?
       end
 
-      private
-
-      def sign_adjust_step
+      private def sign_adjust_step
         @step = (-@step if @to && (@from < @to && @step < 0 || @from > @to && @step > 0)) || @step
       end
     end
@@ -337,9 +335,7 @@ module Musa
         end
       end
 
-      private
-
-      def adjust_step
+      private def adjust_step
         @step = (-@step if @from < @to && @step < 0 || @from > @to && @step > 0) || @step
         @step_count = ((@to - @from) / @step).to_i
       end
@@ -411,9 +407,7 @@ module Musa
         value
       end
 
-      private
-
-      def adjust_step
+      private def adjust_step
         @step = (-@step if @from < @to && @step < 0 || @from > @to && @step > 0) || @step
         @step_count = ((@to - @from) / @step).to_i
       end

data/lib/musa-dsl/series/series.rb

@@ -13,3 +13,4 @@ require_relative 'hash-or-array-serie-splitter'
 
 require_relative 'quantizer-serie'
 require_relative 'flattener-timed-serie'
+require_relative 'union-timed-series'

data/lib/musa-dsl/series/union-timed-series.rb

@@ -0,0 +1,109 @@
+require_relative '../datasets/e'
+
+module Musa
+  module Series
+
+    extend self
+
+    def TIMED_UNION(*timed_series)
+      TimedUnion.new(timed_series)
+    end
+
+    class TimedUnion
+      include Serie
+
+      attr_reader :sources
+
+      def initialize(series)
+        @sources = if series[0].prototype?
+                     series.collect(&:prototype).freeze
+                   else
+                     series.collect(&:instance)
+                   end
+
+        _restart false
+
+        mark_regarding! series[0]
+      end
+
+      private def _restart(restart_sources = true)
+        @sources.each { |serie| serie.restart } if restart_sources
+        @sources_next_values = Array.new(@sources.size)
+
+        @components = nil
+        @hash_mode = @array_mode = nil
+      end
+
+      private def _next_value
+        sources_values = @sources_next_values.each_index.collect do |i|
+          @sources_next_values[i] || (@sources_next_values[i] = @sources[i].next_value)
+        end
+
+        infer_components(sources_values) if !@components
+
+        time = sources_values.collect { |_| _&.[](:time) }.compact.min
+
+        if time
+          selected_values = sources_values.collect { |_| _ if _&.[](:time) == time }
+
+          @sources_next_values.each_index do |i|
+            if @sources_next_values[i]&.[](:time) == time
+              @sources_next_values[i] = nil
+            end
+          end
+
+          if @hash_mode
+            result = {}
+          elsif @array_mode
+            result = []
+          else # value mode
+            result = []
+          end
+
+          @components.each do |target_key_or_index, source_placement|
+            result[target_key_or_index] = selected_values.dig(*source_placement)
+          end
+
+          { time: time,
+            value: result }
+        else
+          nil
+        end
+      end
+
+      def infinite?
+        !!@sources.find(&:infinite?)
+      end
+    end
+
+    private def infer_components(sources_values)
+      @components = {}
+      target_index = 0
+
+      sources_values.each_with_index do |source_value, i|
+        case source_value[:value]
+        when Hash
+          @hash_mode = true
+
+          source_value[:value].keys.each do |key|
+            @components[key] = [i, :value, key]
+          end
+        when Array
+          @array_mode = true
+
+          (0..source_value[:value].size - 1).each do |index|
+            @components[target_index] = [i, :value, index]
+            target_index += 1
+          end
+        else
+          @components[target_index] = [i, :value]
+          target_index += 1
+        end
+      end
+
+      raise RuntimeError, "source series values are of incompatible type (can't combine Hash and Array values)" if @array_mode && @hash_mode
+    end
+
+    private_constant :TimedUnion
+  end
+end

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.22.2'
-  s.date        = '2020-11-11'
+  s.version     = '0.22.3'
+  s.date        = '2020-11-12'
   s.summary     = 'A simple Ruby DSL for making complex music'
   s.description = 'Musa-DSL: A Ruby DSL for algorithmic music composition, device language neutral (MIDI, OSC, etc)'
   s.authors     = ['Javier Sánchez Yeste']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.22.3
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -170,9 +170,9 @@ files:
 - lib/musa-dsl/sequencer/base-sequencer-implementation-play-timed.rb
 - lib/musa-dsl/sequencer/base-sequencer-implementation-play.rb
 - lib/musa-dsl/sequencer/base-sequencer-implementation.rb
-- lib/musa-dsl/sequencer/base-sequencer-public.rb
 - lib/musa-dsl/sequencer/base-sequencer-tick-based.rb
 - lib/musa-dsl/sequencer/base-sequencer-tickless-based.rb
+- lib/musa-dsl/sequencer/base-sequencer.rb
 - lib/musa-dsl/sequencer/sequencer-dsl.rb
 - lib/musa-dsl/sequencer/sequencer.rb
 - lib/musa-dsl/sequencer/timeslots.rb
@@ -188,6 +188,7 @@ files:
 - lib/musa-dsl/series/quantizer-serie.rb
 - lib/musa-dsl/series/queue-serie.rb
 - lib/musa-dsl/series/series.rb
+- lib/musa-dsl/series/union-timed-series.rb
 - lib/musa-dsl/transcription.rb
 - lib/musa-dsl/transcription/from-gdv-to-midi.rb
 - lib/musa-dsl/transcription/from-gdv-to-musicxml.rb