music_set_theory 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a54615c8b9ddf6ecabe27b78c6d84d76fb9c618fb3120267eadd21ed67e7267
-  data.tar.gz: 9d56b5499b87e6eed6e6c36cf3d396885b6cfb28340f855e79ae8ce2e8fecc0c
+  metadata.gz: ebde4ba3edcbccaba9146b39ee39fbe29757cb5283924768c953a517782e09f8
+  data.tar.gz: be3cfa795e830ce5f5f0534eb3f62368127dfa70e3abcb5055815dc63cad822c
 SHA512:
-  metadata.gz: ffabf6585aade8f22055f93594e9b0f265f4da8fc110917a0460072abb67b2b82953a72c4d31dab145ea9bccdf91bb51743d26f371a1e112f41a201c82b62831
-  data.tar.gz: d5e6d8ed0e69e4e9a865cb233ff96efe92ba48690ae5ac3a7a087ec03e6a8b77e4d3d57e46d96a43528fce92985b6111cba4c86252f0f0dab033591f8a63d45f
+  metadata.gz: d03972156c15ecc210b0fcb02df239e743e96e6b22f415d3ec153e4769b9e07d44b5bd721b5c5417ef91e836d1c4fa847e7d5c4abfb28840ab4a87d064d2cc8a
+  data.tar.gz: 697638e92311f8f085c4d82537169c6a80fe38df64224df8ab597b77f86c22626c36f69cd47c393454ad3260ae575d155c27b61cc00dd019ef08acd9b1add1af

data/README.md

@@ -9,20 +9,19 @@ The music theory treats notes and the relationships among them, i.e., temperamen
 
 ## Installation
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
 Install the gem and add to the application's Gemfile by executing:
 
 ```bash
-bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+bundle add music_set_theory
 ```
 
 If bundler is not being used to manage dependencies, install the gem by executing:
 
 ```bash
-gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+gem install music_set_theory
 ```
 
+
 ## Usage
 
 See the `examples/` directory. The scripts for listing chords and scales are there.
@@ -43,13 +42,13 @@ If you want to test all:
 bundle exec rake test
 ```
 
-test a specified one:
+test a specified test case:
 
 ```bash
 TEST=./test/something_test.rb  bundle exec rake test
 ```
 
-If you want to test a test in a specified file, then:
+If you want to test specified test method(s), then:
 
 ```bash
 TESTOPTS=--name=/pattern-matches-to-the-description/ TEST=./test/something_test.rb  bundle exec rake test

data/lib/music_set_theory/musutility.rb

@@ -264,17 +264,35 @@ end
 
 require 'active_support'
 require 'active_support/core_ext/object/deep_dup'
+require 'ice_nine'
 module MusicSetTheory
   module MusUtility
 
     def deep_freeze( obj )
+      IceNine.deep_freeze(obj)
+    end
+
+    def deep_melt( obj )
       case obj
       when Hash
-        obj.each { |k, v| deep_freeze(k); deep_freeze(v) }
+        obj.each_with_object({}) do |(key, value), new_hash|
+          new_hash[deep_melt(key)] = deep_melt(value)
+        end
       when Array
-        obj.each { |e| deep_freeze(e) }
+        obj.map { |element| deep_melt(element) }
+      when Object
+        # インスタンス変数の解除
+        obj.instance_variables.each do |var|
+          deep_melt(var)
+          value = obj.instance_variable_get(var)
+          obj.remove_instance_variable(var)
+          obj.instance_variable_set(var, deep_melt(value))
+        end
+        obj.dup rescue obj # 凍結状態を解除
+      else
+        obj.dup rescue obj
       end
-      obj.freeze
+      obj.dup rescue obj
     end
 
   end

data/lib/music_set_theory/scales.rb

@@ -121,6 +121,9 @@ module MusicSetTheory
     # Note: it is easier to define scales using the noteseq_scale class (this
     # file) and chord using the noteseq_chord class (in chords.py)
     #
+    # ==== Warning
+    # - ! This method updates `nseq_temp`.
+    #
     attr_accessor :nseq_name, :nseq_type, :nseq_temp, :nseq_posn
     attr_accessor :nseq_nat_posns, :nseq_abbrev, :nseq_synonyms,
                   :nseq_other_abbrevs
@@ -132,7 +135,10 @@ module MusicSetTheory
                     nseq_other_abbrevs: [] )
       self.nseq_name = nseq_name
       self.nseq_type = nseq_type
+
       self.nseq_temp = nseq_temp
+      # self.nseq_temp = deep_melt(nseq_temp.deep_dup)
+
       self.nseq_posn = nseq_posn
 
       self.nseq_nat_posns     = nseq_nat_posns
@@ -140,7 +146,8 @@ module MusicSetTheory
       self.nseq_synonyms      = nseq_synonyms
       self.nseq_other_abbrevs = nseq_other_abbrevs
 
-      self.register_with_temp()
+      #
+      self.register_with_temp(self.nseq_temp)
     end
 
     #
@@ -189,8 +196,10 @@ module MusicSetTheory
 
     # Registers this note sequence with the underlying temperament, so
     # that it can be looked up by name, by abbreviation or by sequence.
+    # ==== Warning
+    # - This methods updates `self.nseq_temp`
     #
-    def register_with_temp
+    def register_with_temp( nseq_temp = self.nseq_temp )
       if self.nseq_synonyms
         #if self.nseq_name not in self.nseq_synonyms
         if !(self.nseq_synonyms.include? self.nseq_name)
@@ -212,7 +221,9 @@ module MusicSetTheory
       else
         our_abbrevs = [self.nseq_abbrev]
       end
-      self.nseq_temp.seq_maps.add_elem(
+
+      #
+      nseq_temp.seq_maps.add_elem(
         self, self.nseq_type, our_names, our_abbrevs, self.nseq_posn)
     end
 
@@ -344,55 +355,114 @@ module MusicSetTheory
   DISC_MIN_NOTE_POS   = [0, 2, 3, 5, 6, 9, 11]
   HUNGARIAN_NOTE_POS  = [0, 3, 4, 6, 7, 9, 10]
 
+
   # For ease of comprehension, we have the list of modes as arrays which 
   # can be browsed from outside.
-  MAJORMODES = [ "Ionian",
+  MAJOR_MODES = [ "Ionian",
     "Dorian",
     "Phrygian",
     "Lydian",
     "Mixolydian",
     "Aeolian",
     "Locrian", ]
+  MAJORMODES = MAJOR_MODES
 
-  MELMINORMODES = [ "Jazz Minor",
+  MEL_MINOR_MODES = [ "Jazz Minor",
     "Dorian " + M_FLAT + "9",
     "Lydian Augmented",
     "Lydian Dominant",
     "Mixolydian " + M_FLAT + "13",
     "Semilocrian",
     "Superlocrian", ]
+  MELMINORMODES = MEL_MINOR_MODES
 
-  HARMINORMODES = [ "Harmonic Minor",
+  HARM_MINOR_MODES = [ "Harmonic Minor",
     "Locrian " + M_SHARP + "6",
     "Ionian Augmented",
     "Romanian",
     "Phrygian Dominant",
     "Lydian " + M_SHARP + "2",
     "Ultralocrian", ]
+  HARMINORMODES  = HARM_MINOR_MODES  # for compatibility... typo?
 
-  HARMMAJORMODES = [ "Harmonic Major",
+  HARM_MAJOR_MODES = [ "Harmonic Major",
     "Dorian " + M_FLAT + "6",
     "Phrygian " + M_FLAT + "4",
     "Lydian " + M_FLAT + "3",
     "Mixolydian " + M_FLAT + "9",
     "Lydian " + M_SHARP + "2 " + M_SHARP + "5",
     "Locrian " + M_FLAT + M_FLAT + "7", ]
+  HARMMAJORMODES = HARM_MAJOR_MODES
 
-  DISCORDMINMODES = [ "Melodic Minor " + M_FLAT + "5",
+  DISCORD_MIN_MODES = [ "Melodic Minor " + M_FLAT + "5",
     "Dorian " + M_FLAT + "9 " + M_FLAT + "4",
     "Minor Lydian Augmented",
     "Lydian Dominant " + M_FLAT + "9",
     "Lydian Augmented " + M_SHARP + "2 " + M_SHARP + "3",
     "Semilocrian " + M_FLAT + M_FLAT + "7",
     "Superlocrian " + M_FLAT + M_FLAT + "6", ]
+  DISCORDMINMODES = DISCORD_MIN_MODES
 
-  HUNGARIANMODES = [ "Hungarian",
+  HUNGARIAN_MODES = [ "Hungarian",
     "Superlocrian " + M_FLAT + M_FLAT + "6 " + M_FLAT + M_FLAT + "7",
     "Harmonic Minor " + M_FLAT + "5",
     "Superlocrian " + M_SHARP + "6",
     "Melodic Minor " + M_SHARP + "5",
     "Dorian " + M_FLAT + "9 " + M_SHARP + "11",
     "Lydian Augmented " + M_SHARP + "3", ]
+  HUNGARIANMODES = HUNGARIAN_MODES
+
+  MODE_ARRAY = [
+    MAJOR_MODES,
+    MEL_MINOR_MODES,
+    HARM_MINOR_MODES,
+    HARM_MAJOR_MODES,
+    DISCORD_MIN_MODES,
+    HUNGARIAN_MODES,
+  ]
+end
+
+module MusicSetTheory
+
+  #
+  #
+  #
+  Pentatonic_NAT_POSNS = (0...5).to_a     # 5音音階
+  Hexatonic_NAT_POSNS  = (0...6).to_a     # 6音音階
+  Heptatonic_NAT_POSNS = HEPT_NAT_POSNS   # 7音音階
+  Octatonic_NAT_POSNS  = (0...8).to_a     # 8音音階
+
+  # Pentatonic.
+  #
+  #
+  MAJOR_PENTA_NOTE_POS  = [ 0, 2, 4, 7,  9, ]
+  MINOR_PENTA_NOTE_POS  = [ 0, 3, 5, 7, 10, ]
+  RYUKYU_PENTA_NOTE_POS = [ 0, 4, 5, 7, 11, ]
+
+  BLUES_HEXA_NOTE_POS   = [ 0, 3, 5, 6, 7, 10, ]
+
+  def self.def_scale( const_name, name: , tment: ,
+                      note_pos: , modes: [],
+                      scale_array: :ScaleArray )
+    posns = (0...(note_pos.size)).to_a
+
+    tmp = NoteSeqScale.new(name, tment, note_pos, posns, modes)
+    self.const_set(const_name, tmp)
+    ret = self.const_get(const_name)
+
+    self.const_get(scale_array).const_set(const_name,ret)
+
+    ret
+  end
+
+  def self.undef_scale( const_name, scale_array: :ScaleArray )
+    self.const_get(scale_array).send(:remove_const, const_name)
+    self.send(:remove_const, const_name)
+  end
+
+  def self.scales( scale_array: :ScaleArray )
+    self.const_get(scale_array).constants
+  end
 
 end
 
@@ -401,23 +471,51 @@ end
 #
 #
 module MusicSetTheory
-  MajorScale     = NoteSeqScale.new("Major", WestTemp,
-                     CHROM_NAT_NOTE_POS, HEPT_NAT_POSNS, MAJORMODES)
-
-  MelMinorScale  = NoteSeqScale.new("Melodic Minor", WestTemp,
-                     MEL_MIN_NOTE_POS, HEPT_NAT_POSNS, MELMINORMODES)
-
-  HarmMinorScale = NoteSeqScale.new("Harmonic Minor", WestTemp,
-                     HARM_MIN_NOTE_POS, HEPT_NAT_POSNS, HARMINORMODES)
-
-  HarmMajorScale = NoteSeqScale.new("Harmonic Major", WestTemp,
-                     HARM_MAJ_NOTE_POS, HEPT_NAT_POSNS, HARMMAJORMODES)
-
-  DiscMinorScale = NoteSeqScale.new("Discordant Minor", WestTemp,
-                     DISC_MIN_NOTE_POS, HEPT_NAT_POSNS, DISCORDMINMODES)
+  #ScaleArray = []
+  module ScaleArray; end
+
+  #MajorScale     = NoteSeqScale.new("Major", WestTemp,
+  #                   CHROM_NAT_NOTE_POS, HEPT_NAT_POSNS, MAJORMODES)
+  #MelMinorScale  = NoteSeqScale.new("Melodic Minor", WestTemp,
+  #                   MEL_MIN_NOTE_POS, HEPT_NAT_POSNS, MELMINORMODES)
+  #HarmMinorScale = NoteSeqScale.new("Harmonic Minor", WestTemp,
+  #                   HARM_MIN_NOTE_POS, HEPT_NAT_POSNS, HARMINORMODES)
+  #HarmMajorScale = NoteSeqScale.new("Harmonic Major", WestTemp,
+  #                   HARM_MAJ_NOTE_POS, HEPT_NAT_POSNS, HARMMAJORMODES)
+  #DiscMinorScale = NoteSeqScale.new("Discordant Minor", WestTemp,
+  #                   DISC_MIN_NOTE_POS, HEPT_NAT_POSNS, DISCORDMINMODES)
+  #HungarianScale = NoteSeqScale.new("Hungarian", WestTemp,
+  #                   HUNGARIAN_NOTE_POS, HEPT_NAT_POSNS, HUNGARIANMODES)
+  def_scale :MajorScale, name: "Major", tment: WestTemp,
+    note_pos: CHROM_NAT_NOTE_POS, modes: MAJOR_MODES
+
+  def_scale :MelMinorScale, name: "Melodic Minor", tment: WestTemp,
+    note_pos: MEL_MIN_NOTE_POS, modes: MEL_MINOR_MODES
+
+  def_scale :HarmMinorScale, name: "Harmonic Minor", tment: WestTemp,
+    note_pos: HARM_MIN_NOTE_POS, modes: HARM_MINOR_MODES
+
+  def_scale :HarmMajorScale, name: "Harmonic Major", tment: WestTemp,
+    note_pos: HARM_MAJ_NOTE_POS, modes: HARM_MAJOR_MODES
+
+  def_scale :DiscMinorScale, name: "Discordant Minor", tment: WestTemp,
+    note_pos: DISC_MIN_NOTE_POS, modes: DISCORD_MIN_MODES
+
+  def_scale :HungarianScale, name: "Hungarian", tment: WestTemp,
+    note_pos: HUNGARIAN_NOTE_POS, modes: HUNGARIAN_MODES
+
+  # Pentatonic scales.
+  def_scale :MajorPentaScale, name: "Major Pentatonic", tment: WestTemp,
+    note_pos: MAJOR_PENTA_NOTE_POS
+  def_scale :MinorPentaScale, name: "Minor Pentatonic", tment: WestTemp,
+    note_pos: MINOR_PENTA_NOTE_POS
+  def_scale :RyukyuPentaScale, name: "Ryukyu Pentatonic", tment: WestTemp,
+    note_pos: RYUKYU_PENTA_NOTE_POS
+
+  # Hexatonic scales.
+  def_scale :BluesHexaScale, name: "Blues", tment: WestTemp,
+    note_pos: BLUES_HEXA_NOTE_POS
 
-  HungarianScale = NoteSeqScale.new("Hungarian", WestTemp,
-                     HUNGARIAN_NOTE_POS, HEPT_NAT_POSNS, HUNGARIANMODES)
 end
 
 

data/lib/music_set_theory/temperament.rb

@@ -760,8 +760,14 @@ end
 module MusicSetTheory
   module Temperament
 
+    #
+    # CHROM_SIZE:: number of semitones.
+    # CHROM_NAT_NOTE_POS:: position in number of semitones.
+    #   ex. D = 2 (i.e., C + #*2), E = 4 (C + #*4), etc.
+    # CHROM_NAT_NOTES:: natural notes.
+    #
     CHROM_NAT_NOTES     = ["C", "D", "E", "F", "G", "A", "B"]
-    CHROM_NAT_NOTE_POS  = [0, 2, 4, 5, 7, 9, 11]
+    CHROM_NAT_NOTE_POS  = [  0,   2,   4,   5,   7,   9,  11]
     CHROM_SIZE          = 12
     def self.WestTempNew
       Temperament.new(CHROM_SIZE, CHROM_NAT_NOTES, CHROM_NAT_NOTE_POS)
@@ -772,9 +778,13 @@ module MusicSetTheory
 
     #WestTemp = deep_freeze(WestTempNew()) # the last failed in chords_test(1).
     #WestTemp = WestTempNew()  # the last failed in chords_test(1).
-    WestTemp = MusicSetTheory.deep_freeze(WestTempNew())
     #ng. WestTemp.deep_freeze
 
+    ### freeze for debug.
+    # WestTemp = MusicSetTheory.deep_freeze(WestTempNew())
+    WestTemp  = WestTempNew()  # ok. (dependancied removed in test cases).
+    WestTment = WestTemp  # alias.
+
   end
 end
 

data/lib/music_set_theory/version.rb

@@ -4,7 +4,7 @@
 #
 
 module MusicSetTheory
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music_set_theory
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - YAMAMOTO, Masayuki
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ice_nine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 description: A music theory library based on Python's `musictheory` package.
 email:
 - mephistobooks@users.noreply.github.com