mll 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d58bb50822e2731bcbf03713335a1445f697a8a9
-  data.tar.gz: 8c42d69f1444b610b797b2263854b67909e66e9b
+  metadata.gz: d67aa2bc083ee5926dba5e8ab794ec81579c3d94
+  data.tar.gz: 54b82009ff7fced4eadbdb48c663e9b046ae368d
 SHA512:
-  metadata.gz: d6aa2a6b3fa89f8a0dd28327c280458db1e4570716f1bc63d2efaed23df23ae4d305359374988e148ada03a9c3b5f6072900fae0ce5f4a1677946b81733ac2f4
-  data.tar.gz: 632e9c4422e12b7e6b5b860b2d56400fc5137cf02cfb325a61dd60c3ecbbf229322d91ad913f304700f9e4c5344cb316a0f264fc3222ca2b56724e41dcd560c2
+  metadata.gz: fdc4e70514e2e323f53cda619ce8b16b4a05f672c05666a1062fb43a53c86d9169df93c0100599fd2725a4802fc5686816160396388ef619a8995bf2b4cef8f4
+  data.tar.gz: 1e977a6fad2adf25434f6f899b919b71b6df0300032c4029ce8147c00429111e3e06c31972ea60d04726bfc7483bf975c721adec07deda72b9a790efbb67ad31

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mll (2.1.0)
+    mll (2.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -27,3 +27,6 @@ DEPENDENCIES
   bundler (~> 1.7)
   mll!
   rspec (~> 3.1.0)
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -136,6 +136,7 @@ module MLL
 # TODO maybe make indexes count from 0 not 1
 # TODO merge similar examples
 # TODO deprecate tests that would obviously fail another tests
+# TODO check if we check for ArgumentError without being sure we raise it
 describe MLL do
   describe "List Manipulation" do
     describe "Constructing Lists" do

data/lib/mll.rb

@@ -161,6 +161,48 @@ module MLL
       end
     end
 
+    def subdivide
+      lambda do |*args|
+        case args.size
+          when 1 ; subdivide[1, args[0]]
+          when 2 ; subdivide[0, args[0], args[1]]
+          when 3
+            # raise ArgumentError.new("can't divide into 0 parts") if args[2].zero?
+            range[args[0], args[1], (args[1] - args[0]) * 1.0 / args[2]]
+        else
+          raise ArgumentError.new("wrong number of arguments (#{args.size} for 1..3)")
+        end
+      end
+    end
+
+    def riffle
+      lambda do |*args|
+        case args.size
+          when 2
+            next riffle[*args, [2,-2,2]] unless args[1].respond_to?(:each) && args[0].size == args[1].size
+            Enumerator.new do |e|
+              args[0].zip(args[1]){ |i, j| e << i << j }
+            end
+          when 3
+            args[2] = [args[2], -2, args[2]] unless args[2].respond_to? :each
+            Enumerator.new do |e|
+              min = (args[2][0] < 0) ? (args[0].size + args[2][0]) : args[2][0] - 1
+              max = (args[2][1] < 0) ? (args[0].size + args[2][1]) : args[2][1]
+              min, max = max, min if args[2][0] < 0
+              step = args[2][2]
+              pos = 0
+              args[0].each_with_index do |x, i|
+                # TODO make it not destructive
+                (pos += 1; e << x)
+                (pos += 1; e << (args[1].respond_to?(:each) ? args[1].rotate!.last : args[1])) if min - 1 <= i && i <= max && (pos - min) % step == 0
+              end
+            end
+        else
+          raise ArgumentError.new("wrong number of arguments (#{args.size} for 2..3)")
+        end
+      end
+    end
+
     def define_listable_function name, &block
       (class << self; self end).class_eval do
         define_method name do
@@ -188,12 +230,13 @@ module MLL
     when 3
       case args[2] <=> 0
       when 0 ; raise ArgumentError.new("step can't be zero")
-      when 1 ; Range.new(args[0], args[1]).step args[2]
+      # when 1 ; Range.new(args[0], args[1]).step args[2]
       else
         Enumerator.new do |e|
           from, to, step = *args
-          # while (step > 0) ? from <= to : from >= to
-          while from >= to
+          step = step.abs * (to <=> from)
+          while (step > 0) ? (from <= to) : (from >= to)
+          # while from >= to
             e << from
             from += step
           end
@@ -204,20 +247,6 @@ module MLL
     end
   end
 
-  def self.subdivide
-    lambda do |*args|
-      case args.size
-        when 1 ; subdivide[1, args[0]]
-        when 2 ; subdivide[0, args[0], args[1]]
-        when 3
-          # raise ArgumentError.new("can't divide into 0 parts") if args[2].zero?
-          range[args[0], args[1], (args[1] - args[0]) * 1.0 / args[2]]
-      else
-        raise ArgumentError.new("wrong number of arguments (#{args.size} for 1..3)")
-      end
-    end
-  end
-
   define_listable_function(:subtract) { |*args| raise ArgumentError.new("need two arguments") unless args.size == 2 ; args[0] - args[1] }
   define_listable_function(:divide)   { |*args| raise ArgumentError.new("need two arguments") unless args.size == 2 ; args[0] / args[1] }
   define_listable_function(:_plus)    { |*args| raise ArgumentError.new("need two arguments") unless args.size == 2 ; args[0] + args[1] }

data/mll.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "mll"
-  spec.version       = "2.2.1"
+  spec.version       = "2.3.0"
   spec.authors       = ["Victor Maslov"]
   spec.email         = ["nakilon@gmail.com"]
   spec.summary       = "Mathematica Language Library in Ruby"

data/spec/_spec.rb

@@ -21,6 +21,8 @@ require_relative File.join "..", "lib", "mll"
 # TODO merge similar examples
 # TODO deprecate tests that would obviously fail another tests
 
+# TODO check if we check for ArgumentError without being sure we raise it
+
 
 # File.read("spec/_spec.rb").scan(/.*\n/).each_with_index{ |e,i| p [i+1,e] if e["\xe2\x80\x90"] || e["\xc3\x97"] }; 0
 
@@ -316,6 +318,10 @@ describe MLL do
         example "no args raise ArgumentError" do
           expect{ range[] }.to raise_error ArgumentError
         end
+        example "two args that are not numbers raise ArgumentError" do
+          skip "already caught by Ruby as 'ArgumentError: bad value for range'"
+          expect{ range[8,times] }.to raise_error ArgumentError
+        end
         example "more than 3 args raise ArgumentError" do
           expect{ range[1,2,3,4] }.to raise_error ArgumentError
         end
@@ -351,12 +357,18 @@ describe MLL do
 
         end
 
-        # NOTE: Wolfram Mathematica can't do this
+        # NOTE: even Wolfram Mathematica can't do this
         example "range[max, min, -step]" do
           expect(range[10,-5,-2]).to be_a Enumerator
           expect(range[10,-5,-2].to_a).to eq [10,8,6,4,2,0,-2,-4]
           expect(range[3,1,-1].to_a).to eq [3,2,1]
         end
+        # NOTE: even I'm not sure about this
+        example "range[max, min, +step]" do
+          expect(range[10,-5,2]).to be_a Enumerator
+          expect(range[10,-5,2].to_a).to eq [10,8,6,4,2,0,-2,-4]
+          expect(range[3,1,1].to_a).to eq [3,2,1]
+        end
 
         describe "Generalizations & Extensions:" do
 
@@ -436,7 +448,7 @@ describe MLL do
 
           example "generates a list of length n+1" do
             expect(subdivide[5]).to be_a Enumerator
-            expect(subdivide[5].size).to eq 6
+            expect(subdivide[5].to_a.size).to eq 6
           end
 
         end
@@ -543,6 +555,84 @@ describe MLL do
 
     end
 
+    # http://reference.wolfram.com/language/guide/RearrangingAndRestructuringLists.html
+    describe "Rearranging & Restructuring Lists" do
+
+      # http://reference.wolfram.com/language/ref/Riffle.html
+      describe "#riffle" do
+
+        example "Mathematica examples are missing the case where two arrays differ by length a lot?"
+
+        describe "Details:" do
+
+          example "riffle[[e],x] gives [e]" do
+            expect(riffle[[1], 0]).to be_a Enumerator
+            expect(riffle[[1], 0].to_a).to eq [1]
+          end
+          example "riffle[list,x] is equivalent to riffle[list,x,[2,-2,2]]" do
+            expect(riffle[[1,2,3,4,5], 0].to_a).to eq riffle[[1,2,3,4,5], 0, [2,-2,2]].to_a
+          end
+          example "riffle[list,x,n] is equivalent to riffle[list,x,[n,-2,n]]" do
+            expect(riffle[[1,2,3,4,5], 0, 3].to_a).to eq riffle[[1,2,3,4,5], 0, [3,-2,3]].to_a
+          end
+
+        end
+
+        describe "Basic Examples:" do
+
+          example "riffle 0 between successive elements in a list" do
+            expect(riffle[range[9], 0]).to be_a Enumerator
+            expect(riffle[range[9], 0].to_a).to eq [1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9]
+          end
+          example "riffle in 0 and 0.0 cyclically" do
+            expect(riffle[range[9], [0,0.0]]).to be_a Enumerator
+            expect(riffle[range[9], [0,0.0]].to_a).to eq [1,0,2,0.0,3,0,4,0.0,5,0,6,0.0,7,0,8,0.0,9]
+          end
+          example "riffle in 0 at every 3rd position" do
+            expect(riffle[range[9], 0, 3]).to be_a Enumerator
+            expect(riffle[range[9], 0, 3].to_a).to eq [1,2,0,3,4,0,5,6,0,7,8,0,9]
+          end
+
+        end
+
+        describe "Scope:" do
+
+          example "start riffling in 0 only at position 5" do
+            expect(riffle[range[9], 0, [5,-1,2]]).to be_a Enumerator
+            expect(riffle[range[9], 0, [5,-1,2]].to_a).to eq [1,2,3,4,0,5,0,6,0,7,0,8,0,9,0]
+          end
+          example "cyclically riffle in 0 and 0.0" do
+            expect(riffle[range[9], [0,0.0], [5,-1,2]]).to be_a Enumerator
+            expect(riffle[range[9], [0,0.0], [5,-1,2]].to_a).to eq [1,2,3,4,0,5,0.0,6,0,7,0.0,8,0,9,0.0]
+          end
+          example "intersperse two lists" do
+            # TODO check how it works for list2.size == list1.size + 1 in Mathematica
+            expect(riffle[[1,2,3,4], [5,6,7,8]]).to be_a Enumerator
+            expect(riffle[[1,2,3,4], [5,6,7,8]].to_a).to eq [1,5,2,6,3,7,4,8]
+          end
+
+        end
+
+        describe "Applications:" do
+
+          example "create a directory name from a path list" do
+            expect(riffle[%w{ usr local bin }, "/"].to_a.join).to eq "usr/local/bin"
+          end
+          example "alternate positive and negative integers" do
+            skip "unary #minus is yet to be implemented"
+            expect(riffle[range[9], minus[range[9]]]).to be_a Enumerator
+            expect(riffle[range[9], minus[range[9]]].to_a).to eq [1,-2,2,-2,3,-3,4,-4,5,-5,6,-6,7,-7,8,-8,9,-9]
+          end
+          example "insert commas at every 4th character" do
+            expect(riffle["4345252523535".chars, ",", [-4,1,-4]].to_a.join).to eq "4,345,252,523,535"
+          end
+
+        end
+
+      end
+
+    end
+
     # http://reference.wolfram.com/language/guide/ApplyingFunctionsToLists.html
     describe "Applying Functions to Lists" do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mll
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler