Cartesian 0.2.1 → 0.2.3

data/lib/URL desafio.txt

@@ -0,0 +1 @@
+http://www.ic.unicamp.br/~vignatti/desafio2.html

data/lib/cartesian.rb

@@ -43,11 +43,19 @@ module Cartesian
   #
   #   [1,2].cartesian %w(A B) #=> [[1, "A"], [1, "B"], [2, "A"], [2, "B"]]
   #
-  def Cartesian.product(first, second)
+  # optional parameter {:flatten => true}
+  #
+  def Cartesian.product(first, second, params={})
+    params[:flatten] ||= true
+
     result = []
     first.each do |a|
       second.each do |b|
-        result << [a, b]
+        if params[:flatten] == true
+          result << [a, b].flatten
+        else
+          result << [a, b]
+        end
       end
     end
     result
@@ -55,8 +63,8 @@ module Cartesian
 
   # Cartesian.product for mixin.
   #
-  def cartesian(other)
-    Cartesian.product(self, other)
+  def cartesian(other, params={})
+    Cartesian.product(self, other, params)
   end
 
   # Behaves as product, except for the elements are joined.
@@ -106,6 +114,38 @@ module Cartesian
   def x(other)
     CartesianIterator.new(self, other)
   end
+
+  # Concise way of iterating multi-dimensionally
+  # over the same array or range.
+  #
+  # For instance,
+  #
+  #   for x,y,z in [0,1]**3
+  #     puts [x, y, z].join(',')
+  #   end
+  #
+  # produces the following output
+  #
+  #   0,0,0
+  #   0,0,1
+  #   0,1,0
+  #   0,1,1
+  #   1,0,0
+  #   1,0,1
+  #   1,1,0
+  #   1,1,1
+  #
+  # It also works with Range objects.
+  #
+  def **(fixnum)
+    return self if fixnum <= 1
+    iter = CartesianIterator.new(self, self)
+    (fixnum-2).times do
+      iter.x(self)
+    end
+    iter
+  end
+  alias :power! :**
 end
 
 class Array

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: Cartesian
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-01-07 00:00:00 -03:00
+  version: 0.2.3
+date: 2007-01-13 00:00:00 -03:00
 summary: The Cartesian module provide methods for the calculation of the cartesian producted between two enumberable objects. It can also be easily mixed in into any enumberable class, i.e. any class with Enumerable module mixed in.
 require_paths: 
 - lib
@@ -33,6 +33,7 @@ files:
 - tests/tc_cartesian.rb
 - lib/cartesian.rb
 - lib/cartesian_iterator.rb
+- lib/URL desafio.txt
 test_files: 
 - tests/tc_cartesian.rb
 rdoc_options: []