Cartesian 0.2.3 → 0.3.0

data/lib/cartesian.rb

@@ -138,12 +138,19 @@ module Cartesian
   # 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)
+    if fixnum < 0
+      raise ArgumentError, "power must be non-negative"
+    elsif fixnum == 0
+      return []
+    elsif fixnum == 1
+      return self
+    else
+      iter = CartesianIterator.new(self, self)
+      (fixnum-2).times do
+        iter.x(self)
+      end
+      iter
     end
-    iter
   end
   alias :power! :**
 end

data/lib/cartesian_iterator.rb

@@ -1,4 +1,9 @@
-class CartesianIterator
+require 'grid_search'
+
+class CartesianIterator
+
+  include GridSearch
+
   def initialize(foo, bar)
     @lists = []
     @tot_iter = 1
@@ -7,7 +12,7 @@ class CartesianIterator
   end
 
   def x(other)
-    @lists << other.to_a
+    @lists << other.to_a.dup
     @tot_iter *= @lists[-1].size
     self
   end
@@ -41,7 +46,8 @@ class CartesianIterator
     array = []
     self.each {|*element| array << element }
     array
-  end
+  end
+
 end
 
 module Iterable

data/lib/extensions.rb

@@ -0,0 +1,12 @@
+class Object
+
+  # Syntax sugar for "is this object among this array?"
+  #
+  #   1.among? [1,2,3] #=> true
+  #   0.among? [4,5] #=> false
+  #
+  def among?(ary)
+    ary.include? self
+  end
+
+end

data/lib/grid_search.rb

@@ -0,0 +1,39 @@
+module GridSearch
+
+  # Finds the argument which maximizes the function given in the block trhu grid-search maximization.
+  #   [-1,0,1,2].argmax {|x| x**2 } #=> 2
+  #
+  def argmax(&block)
+    argbest(:>, &block)
+  end
+  
+  # Finds the argument which minimizes the function given in the block trhu grid-search minimization.
+  #   [-1,0,1,2].argmin {|x| x**2 } #=> 0
+  #
+  def argmin(&block)
+    argbest(:<, &block)
+  end
+
+  private
+  
+  def argbest(cmp)
+    best_arg, best_val = nil, nil
+    self.each do |*curr_arg|
+      curr_val = yield(*curr_arg)
+      if best_val.nil? || curr_val.send(cmp, best_val)
+        best_val = curr_val
+        best_arg = curr_arg
+      end
+    end
+    best_arg
+  end
+
+end
+
+module Enumerable
+  include GridSearch
+end
+
+class Array
+  include GridSearch
+end

data/tests/tc_cartesian.rb

@@ -1,7 +1,8 @@
 require 'test/unit'
 
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'cartesian'
+require 'cartesian'
+require 'extensions'
 
 class TestCartesian < Test::Unit::TestCase
   def test_arrays
@@ -26,5 +27,29 @@ class TestCartesian < Test::Unit::TestCase
     expected = [[1, "a"], [1, "b"], [1, "c"], [2, "a"], [2, "b"],
                 [2, "c"], [3, "a"], [3, "b"], [3, "c"]]
     assert(foo.x(bar).to_a == expected)
+  end
+  
+  def test_power
+    ary = [1,2,3]
+    assert_raise(ArgumentError) { ary**(-1) }
+    assert_equal [], ary**0
+    assert_equal ary, ary**1
+    expected = [[0, 0, 0], [0, 0, 1], [0, 1, 0],\
+                [0, 1, 1], [1, 0, 0], [1, 0, 1],\
+                [1, 1, 0], [1, 1, 1]]
+    assert_equal expected, ([0,1]**3).to_a
+  end
+  
+  def test_argmin
+    assert_equal [0,0], ((-3..3)**2).argmin {|x,y| x**2+y**2 }
   end
+
+  def test_argmax
+    values = []
+    -3.step(3, 0.25) {|val| values << val }
+    x, y = (values**2).argmax {|x,y| x**2+y**2 }
+    assert x.among?([-3,3])
+    assert y.among?([-3,3])
+  end
+
 end

data/tests/tc_extensions.rb

@@ -0,0 +1,12 @@
+require 'test/unit'
+
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'extensions'
+
+class TestExtensions < Test::Unit::TestCase
+  def test_among?
+    assert 1.among?([1,2,3])
+    assert ! 7.among?([1,2,3])
+    assert (3.0).among?([1,2,3])
+  end
+end

data/tests/tc_grid_search.rb

@@ -0,0 +1,15 @@
+require 'test/unit'
+
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'grid_search'
+
+class TestCartesian < Test::Unit::TestCase
+  def test_argmin
+    assert_equal 0, *[-1,0,1].argmin {|x| x**2 }
+  end
+
+  def test_argmax
+    assert_equal 0, *[-2,-1,0].argmax {|x| x**3 }
+  end
+
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: Cartesian
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
-date: 2007-01-13 00:00:00 -03:00
+  version: 0.3.0
+date: 2007-10-29 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
@@ -29,11 +29,14 @@ post_install_message:
 authors: 
 - Adriano Brito Mitre
 files: 
-- tests/benchmark.rb
 - tests/tc_cartesian.rb
-- lib/cartesian.rb
+- tests/benchmark.rb
+- tests/tc_extensions.rb
+- tests/tc_grid_search.rb
 - lib/cartesian_iterator.rb
-- lib/URL desafio.txt
+- lib/cartesian.rb
+- lib/grid_search.rb
+- lib/extensions.rb
 test_files: 
 - tests/tc_cartesian.rb
 rdoc_options: []

data/lib/URL desafio.txt

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