mll 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b4f658534716d142d0dedb616584ab5a016b71
-  data.tar.gz: 5253d8e36e96f2e4dba389268d64215a41b2befb
+  metadata.gz: 70676b9e4d6334e3e8391c256aa11c3ea5e9c033
+  data.tar.gz: 7e8b55eb690a4ee783358750fd25ca1045475508
 SHA512:
-  metadata.gz: 34e4ede0875ae7a9e5500bf10f081f4cb5dcecf9b357bc39b420886a190480b0e0ee07b499be9bf59cbb93cdea70aeeba5cb3a6b946a00cce7d7077076b96ef9
-  data.tar.gz: fe4688d9b0b2bcba1383bd7f8f6cfb51ff69e96be8d55d970adbe84fab34f80cdbfd7ee86f4d3d39840b097aa37c40effbe3ebcb37e15eebcfdfab70d884fe38
+  metadata.gz: 449a0ca50feab9413c62cc1a67d37bb4a349ab97f0c842f676cea2ddea06ba03b29d96d8200bd846c9700d3388f60112ab3b900408f5a47aa7aa4b38d78342fd
+  data.tar.gz: 8f5f8a226918468f4e3f636df329f4520c686181fccca13c26b04bd493018156da4f79101b07a27dfbbfab32de5306b223505dbc52f914d5a8a44bad8b9dd780

data/README.md

@@ -1,6 +1,6 @@
 # MLL (Mathematica Language Library)
 
-Этот гем не ставит перед собой цель полностью имитировать типы данных, синтаксис Математики, или научить Ruby крутым визуализациям. Целью является вложить в Ruby мощь стандартной библиотеки. Прежде всего, List manipulation. В перспективе визуализация возможна при помощи других гемов.
+Этот гем не ставит перед собой цель полностью имитировать типы данных, синтаксис Wolfram Mathematica Language, или научить Ruby крутым визуализациям. Целью является вложить в Ruby мощь стандартной библиотеки. Прежде всего, List Manipulation. В перспективе визуализация возможна при помощи других гемов.
 
 ## Usage
 
@@ -22,3 +22,12 @@
 ## Installation
 
     $ gem install mll
+
+### Testing with RSpec before contributing
+
+    rspec
+
+or
+
+    rake
+

data/lib/mll.rb

@@ -5,7 +5,7 @@ module MLL
     (class << self; self end).class_eval do
       define_method name do |*args|
         if args.size == 1 && args.first.respond_to?(:map)
-          args.first.map &method(name)
+          args.first.lazy.map &method(name)
         else
           block.call *args
         end
@@ -14,54 +14,44 @@ module MLL
   end
 
   define_function_that_can_enumerate :range do |*args|
-    raise ArgumentError.new("wrong number of arguments (#{args.size} for 1..3)") unless (1..3).include? args.size
-    next range 1, args[0] if args.size == 1
-    Range.new(args[0], args[1]).step(args[2] || 1)
-  end
-
-end
-
-
-=begin
-
-      # http://reference.wolfram.com/language/guide/HandlingArraysOfData.html
-      # http://reference.wolfram.com/language/guide/ComputationWithStructuredDatasets.html
-
-module Enumerable
-  STDERR.puts "WARNING: #{name}#range was already defined" if method_defined? "range"
-  def range
-    # if self.respond_to? :each
-      if self.first.respond_to? :each
-        raise ArgumentError.new("if the first #range parameter responds to :each, it should be the only argument") \
-          if self.size > 1
-        self.first.zip.map &:range
+    case args.size
+    when 1 ; range 1, args[0] # TODO do smth with #table(-n)
+    when 2 ; Range.new(args[0], args[1])
+    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]
       else
-        case self.size
-        when 1 ; [1,self.first].range
-        when 2 ; Range.new(*self.take(2)).step(1) # to convert Rage into Enumerator
-        when 3 ; Range.new(*self.take(2)).step(self.drop(2).first)
-        when 4 ; raise ArgumentError.new("wrong number of arguments (#{self.size} for 1..3)")
+        Enumerator.new do |e|
+          from, to, step = *args
+          while (step > 0) ? from <= to : from >= to
+            e << from
+            from += step
+          end
         end
       end
-    # else
-    #   [1, self].range
-    # end
+    else
+      raise ArgumentError.new("wrong number of arguments (#{args.size} for 1..3)") # unless (1..3).include? args.size
+    end
   end
-end
 
-class Fixnum
-  STDERR.puts "WARNING: #{name}#range was already defined" if method_defined? "range"
-  def range
-    # if self.respond_to? :each
-    #   if self.first.respond_to? :each
-    #     self.map &:range
-    #   else
-    #     Range.new(*self[0,2]).step(self[2] || 1)
-    #   end
-    # else
-      [self].range
-    # end
+  def self.table f, *args
+    # TODO make it lazy?
+
+    [].tap do |result|
+      [[result, args.map{ |r| range(*r).to_a }]].tap do |stack|
+        stack.each do |ai, ri|
+          ai.replace ri.first.map{ |i|
+            if ri.size == 1
+              f.call(*ai, i)
+            else
+              [*ai.dup, i].tap{ |t| stack << [t, ri.drop(1)] }
+            end
+          }
+        end
+      end
+    end
+
   end
-end
 
-=end
+end

data/mll.gemspec

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

data/spec/_spec.rb

@@ -11,7 +11,9 @@ describe MLL do
     describe "Constructing Lists" do
 
       # http://reference.wolfram.com/language/ref/Range.html
-      describe "range" do
+      describe "#range" do
+
+        # TODO negative step and add it to README.rb
 
         example "range( >3 args )" do
           expect{ MLL::range(1,2,3,4) }.to raise_error ArgumentError
@@ -20,43 +22,40 @@ describe MLL do
         describe "Basic Examples" do
 
           example "range(n)" do
-            expect(MLL::range(4)).to be_a Enumerator
+            expect(MLL::range(4)).to be_a Range
             expect(MLL::range(4).to_a).to eq [1,2,3,4]
           end
           example "range(imin, imax)" do
-            expect(MLL::range(2,5)).to be_a Enumerator
+            expect(MLL::range(2,5)).to be_a Range
             expect(MLL::range(2,5).to_a).to eq [2,3,4,5]
           end
           example "range(imin, imax, id)" do
             expect(MLL::range(1,2,3)).to be_a Enumerator
-            expect(MLL::range(1,2,0.5).to_a).to eq [1,1.5,2]
+            expect(MLL::range(1,2,0.5).to_a).to eq [1,1.5,2] # can be precision problems
             expect(MLL::range(2,6,2).to_a).to eq [2,4,6]
             expect(MLL::range(-4,9,3).to_a).to eq [-4,-1,2,5,8]
+            # Ruby can't negative Range#step, haha!
+            expect(MLL::range(10,-5,-2).to_a).to eq [10,8,6,4,2,0,-2,-4]
+            expect(MLL::range(3,1,-1).to_a).to eq [3,2,1]
           end
-          # example "range(imin, imax, id)" do
-          #   expect(MLL::range(2,5,2)).to be_a Enumerator
-          #   expect(MLL::range(2,5,2).to_a).to eq [2,4]
-          #   expect(MLL::range(2,6,2).to_a).to eq [2,4,6]
-          # end
         end
 
         describe "Generalizations & Extensions" do
 
           example "range([n1, n2, n3, n4])" do
-            # expect(MLL::range([2,3])).to be_a Enumerator # TODO revive me
+            expect(MLL::range([5,2,6,3])).to be_a Enumerator
             MLL::range([5,2,6,3]).each do |i|
-              expect(i).to be_a Enumerator
+              expect(i).to be_a Range
             end
-            expect(MLL::range([5,2,6,3]).map(&:to_a)).to eq [[1,2,3,4,5],[1,2],[1,2,3,4,5,6],[1,2,3]]
+            expect(MLL::range([5,2,6,3]).to_a.map(&:to_a)).to eq [[1,2,3,4,5],[1,2],[1,2,3,4,5,6],[1,2,3]]
           end
 
         end
 
         describe "Applications" do
 
-          example "power(2, range(5))" do
+          example "power(n1, range(n2))" do
             pending "#power is yet to be implemented"
-            p power(2, range(5))
             expect(power(2, range(5))).to eq [2,4,8,16,32]
           end
 
@@ -64,19 +63,25 @@ describe MLL do
 
         describe "Neat Examples" do
 
-          example "range(1..3)" do
-            # expect(MLL::range(MLL::range(3))).to be_a Enumerator # TODO revive me
+          example "range(imin..imax)" do
+            expect(MLL::range(MLL::range(3))).to be_a Enumerator
             MLL::range(MLL::range(3)).each do |i|
-              expect(i).to be_a Enumerator
+              expect(i).to be_a Range
             end
-            expect(MLL::range(1..3).map(&:to_a)).to eq [[1],[1,2],[1,2,3]]
+            expect(MLL::range(1..3).to_a.map(&:to_a)).to eq [[1],[1,2],[1,2,3]]
           end
           example "range(range(range(n)))" do
-            # expect(MLL::range(MLL::range(3))).to be_a Enumerator # TODO revive me
-            # MLL::range(MLL::range(MLL::range(3))).each do |i|
-            #   expect(i).to be_a Enumerator
-            # end
-            expect(MLL::range(MLL::range(MLL::range(3))).map{ |i| i.map(&:to_a) }).to eq [[[1]],[[1],[1,2]],[[1],[1,2],[1,2,3]]]
+            # TODO do the same .tap thing in other type tests
+            MLL::range(MLL::range(MLL::range(3))).tap do |o|
+              expect(o).to be_a Enumerator
+              o.each do |i|
+                expect(i).to be_a Enumerator
+                i.each do |j|
+                  expect(j).to be_a Range
+                end
+              end
+            end
+            expect(MLL::range(MLL::range(MLL::range(3))).to_a.map{ |i| i.to_a.map(&:to_a) }).to eq [[[1]],[[1],[1,2]],[[1],[1,2],[1,2,3]]]
           end
 
           # TODO Nest[Range,3,6]
@@ -88,55 +93,43 @@ describe MLL do
 
       end
 
-    end
-
-    # http://reference.wolfram.com/language/guide/ElementsOfLists.html
-    # http://reference.wolfram.com/language/guide/RearrangingAndRestructuringLists.html
-    # http://reference.wolfram.com/language/guide/ApplyingFunctionsToLists.html
-    # http://reference.wolfram.com/language/guide/MathematicalAndCountingOperationsOnLists.html
+      # http://reference.wolfram.com/language/ref/Table.html
+      describe "#table" do
 
-  end
-
-  # http://reference.wolfram.com/language/guide/FunctionalProgramming.html
-
-end
+        describe "Basic Examples" do
 
+          example "table(lambda, [n])" do
+            expect(MLL::table(->(i){ i**2 }, [10])).to eq [1,4,9,16,25,36,49,64,81,100]
+          end
+          example "table(lambda, [imin, imax, id])" do
+            expect(MLL::table(->(i){ i+2 }, [0, 20, 2])).to eq [2,4,6,8,10,12,14,16,18,20,22]
+          end
+          example "table(lambda, [n1], [n2])" do
+            expect(MLL::table(->(i, j){ 10*i + j }, [4], [3])).to eq [[11,12,13],[21,22,23],[31,32,33],[41,42,43]]
+          end
 
-=begin
+          example "matrix_form table(lambda, [n1], [n2])" do
+            pending "#matrix_form is yet to be implemented"
+            expect(MLL::matrix_form MLL::table(->(i, j){ 10*i + j }, [4], [3])).to eq "
+            "
+          end
 
-describe "range" do
+        end
 
-  example "n.range" do
-    expect(5.range).to be_a Enumerator
-    expect(5.range.to_a).to eq [1,2,3,4,5]
-  end
+      end
 
-  example "[imin, imax].range" do
-    expect([2,5].range).to be_a Enumerator
-    expect([2,5].range.to_a).to eq [2,3,4,5]
-  end
-  example "[imin, imax, id].range" do
-    expect([2,5,2].range).to be_a Enumerator
-    expect([2,5,2].range.to_a).to eq [2,4]
-    expect([2,6,2].range.to_a).to eq [2,4,6]
-  end
-  example "[[n1,n2]].range" do
-    # expect([[2,3]].range).to be_a Enumerator # TODO revive me
-    [[2,3]].range.each do |i|
-      expect(i).to be_a Enumerator
     end
-    # expect([[2,3]].range.map(&:to_a)).to eq [[1,2],[1,2,3]]
-    expect([[2,3]].range.map(&:to_a)).to eq [[1,2],[1,2,3]]
-  end
 
-  # using methods instead of functions helps us with method_missing but forces to add []
-  example "n.range.range" do
-    # expect([3.range].range).to be_a Enumerator # TODO revive me
-    expect([3.range].range.map(&:to_a)).to eq [[1],[1,2],[1,2,3]]
+    # http://reference.wolfram.com/language/guide/ElementsOfLists.html
+    # http://reference.wolfram.com/language/guide/RearrangingAndRestructuringLists.html
+    # http://reference.wolfram.com/language/guide/ApplyingFunctionsToLists.html
+    # http://reference.wolfram.com/language/guide/MathematicalAndCountingOperationsOnLists.html
+
   end
 
-  # TODO 4 args should fail
+  # http://reference.wolfram.com/language/guide/FunctionalProgramming.html
 
 end
 
-=end
+      # http://reference.wolfram.com/language/guide/HandlingArraysOfData.html
+      # http://reference.wolfram.com/language/guide/ComputationWithStructuredDatasets.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mll
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler