ruby-mpfi 0.0.9 → 0.0.10

data/ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.h

@@ -5,9 +5,9 @@
 
 VALUE r_mpfi_matrix, r_mpfi_square_matrix, r_mpfi_col_vector, r_mpfi_row_vector, r_mpfi_vector_module;
 
-void r_mpfi_matrix_free(void *ptr);
+void r_mpfi_matrix_free (void *ptr);
 
 void r_mpfi_matrix_suitable_matrix_init (VALUE *other, MPFIMatrix **ptr_other, int row, int column);
-VALUE r_mpfi_matrix_robj(MPFIMatrix *x);
+VALUE r_mpfi_matrix_robj (MPFIMatrix *x);
 
 #endif

data/lib/mpfi.rb

@@ -0,0 +1,21 @@
+require "mpfr"
+require "mpfi.so"
+
+class MPFI < Numeric
+  def subdivision(num)
+    each_subdivision(num).to_a
+  end
+
+  def each_subdivision_by_size(size, &block)
+    if block_given?
+      num = (self.diam_abs / size).ceil
+      each_subdivision(num, &block)
+    else
+      to_enum(:each_subdivision_by_size, size)
+    end
+  end
+
+  def subdivision_by_size(size)
+    each_subdivision_by_size(size).to_a
+  end
+end

data/lib/mpfi/matrix.rb

@@ -1,8 +1,9 @@
+require "mpfi"
 require "mpfr/matrix"
 require "mpfi/matrix.so"
 # If we do not load "mpfr/matrix" before load of "mpfi/matrix.so", segmentation fault error raises.
 
-class MPFI
+class MPFI < Numeric
   class Matrix
     def inspect
       tmp = str_ary_for_inspect2
@@ -37,6 +38,70 @@ class MPFI
       str_ary_for_inspect.join(delimiter)
     end
 
+    def each_subdivision(nums)
+      if block_given?
+        row_size = self.row_size
+        col_size = self.column_size
+        if (row_size != nums.size) || !(nums.all? { |col_nums| col_nums.size == col_size })
+          raise ArgumentError, "Invalid numbers to specify split"
+        end
+        dim = row_size * col_size
+        num_current = 0
+        elements = []
+        row_size.times do |r|
+          col_size.times do |c|
+            elements << self[r, c].subdivision(nums[r][c])
+          end
+        end
+        indices = Array.new(dim, 0)
+        args = Array.new(row_size) { Array.new(col_size) }
+        while num_current >= 0
+          while num_current < dim
+            row_num, col_num = num_current.divmod(col_size)
+            if args[row_num][col_num] = elements[num_current][indices[num_current]]
+              indices[num_current] += 1
+            else
+              indices[num_current] = 0
+              num_current -= 1
+              break
+            end
+            num_current += 1
+          end
+          if num_current == dim
+            yield(self.class.new(args))
+            num_current -= 1
+          end
+        end
+      else
+        to_enum(:each_subdivision, nums)
+      end
+    end
+
+    def each_subdivision_by_size(size, &block)
+      if block_given?
+        row_size = self.row_size
+        col_size = self.column_size
+        row_num, col_num = num.divmod(col_size)
+        nums = Array.new(row_size) { Array.new(col_size) }
+        row_size.times do |r|
+          col_size.times do |c|
+            nums[r][c] = (self[r, c].diam_abs / size).ceil
+          end
+        end
+        each_subdivision(nums, &block)
+      else
+        to_enum(:each_subdivision_by_size, size)
+      end
+    end
+
+    def subdivision(nums)
+      each_subdivision(nums).to_a
+    end
+
+    def subdivision_by_size(size)
+      each_subdivision_by_size(size).to_a
+    end
+
     def self.create(a)
       case a
       when MPFI::Vector
@@ -64,7 +129,6 @@ class MPFI
       else
         self.new(a)
       end
-
     end
     
     # ary is two-dimensional Array.
@@ -106,7 +170,6 @@ class MPFI
       end
       ret
     end
-    
   end
 
   module Vector
@@ -134,28 +197,54 @@ class MPFI
       str_ary_for_inspect.join(delimiter)
     end
 
-    def subdivision_by_size(size)
-      division = []
-      each { |el| division << el.subdivision((el.diam_abs / size).ceil) }
-      ary_size = division.inject(1) { |mul, a| mul * a.size }
-      ary = Array.new(ary_size) { Array.new }
-      num = ary_size
-      division.each do |div|
-        j = 0
-        repeat = ary_size / num
-        num = num / div.size
-        repeat.times do
-          div.size.times do |i|
-            num.times do
-              ary[j] << div[i]
-              j += 1
+    def each_subdivision(*nums)
+      if block_given?
+        dim = self.size
+        unless dim == nums.size
+          raise ArgumentError, "Invalid numbers to specify split"
+        end
+        num_current = 0
+        elements = nums.each_with_index.map { |num, i| self[i].subdivision(num) }
+        indices = Array.new(dim, 0)
+        args = []
+        while num_current >= 0
+          while num_current < dim
+            if args[num_current] = elements[num_current][indices[num_current]]
+              indices[num_current] += 1
+            else
+              indices[num_current] = 0
+              num_current -= 1
+              break
             end
+            num_current += 1
+          end
+          if num_current == dim
+            yield(self.class.new(args))
+            num_current -= 1
           end
         end
+      else
+        to_enum(:each_subdivision, *nums)
       end
-      ary.map! { |a| self.class.new(a) }
     end
-    
+
+    def each_subdivision_by_size(size, &block)
+      if block_given?
+        nums = self.size.times.map { |i| (self[i].diam_abs / size).ceil }
+        each_subdivision(*nums, &block)
+      else
+        to_enum(:each_subdivision_by_size, size)
+      end
+    end
+
+    def subdivision(*nums)
+      each_subdivision(*nums).to_a
+    end
+
+    def subdivision_by_size(size)
+      each_subdivision_by_size(size).to_a
+    end
+
     def self.inner_product(a, b)
       a.inner_product(b)
     end
@@ -163,7 +252,6 @@ class MPFI
     def self.distance(a, b)
       a.distance_from(b)
     end
-
   end
 
   class ColumnVector
@@ -185,6 +273,4 @@ class MPFI
       end
     end
   end
-  
 end
-

data/lib/mpfi/version.rb

@@ -1,3 +1,3 @@
-class MPFI
-  VERSION = '0.0.9'
+class MPFI < Numeric
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mpfi
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Takayuki YAMAGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -99,6 +99,7 @@ files:
 - ext/mpfi_matrix/mpfi/func_mpfi_matrix.h
 - ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.c
 - ext/mpfi_matrix/mpfi/ruby_mpfi_matrix.h
+- lib/mpfi.rb
 - lib/mpfi/matrix.rb
 - lib/mpfi/version.rb
 - ruby-mpfi.gemspec