carray 1.3.3 → 1.4.0

data/ext/calculus/lib/math/calculus.rb

@@ -25,7 +25,7 @@ class CArray
     return self
   end
 
-  def solve (sc, val, eps = 100 * Float::EPSILON)
+  def solve (sc, val, type: "cubic", eps: 100 * Float::EPSILON)
     func = self - val
     list, output = [], []
     (0...dim0-1).each do |i|
@@ -43,13 +43,13 @@ class CArray
       sx[0], sx[3] = sc[i], sc[i+1]
       sy[0], sy[3] = func[i], func[i+1]
       sx[1], sx[2] = (2.0*sx[0]+sx[3])/3.0, (sx[0]+2.0*sx[3])/3.0
-      sy[1], sy[2] = func.interpolate(sc, sx[1], :type=>"linear"), func.interpolate(sc, sx[2], :type=>"linear")
-      output.push(sx.interpolate(sy, 0))
+      sy[1], sy[2] = func.interpolate(sc, sx[1], type: type), func.interpolate(sc, sx[2], type: type)
+      output.push(sx.interpolate(sy, 0, type: type))
     end
     return output.uniq
   end
 
-  def solve2 (sc, eps = 100 * Float::EPSILON)
+  def solve2 (sc, eps: 100 * Float::EPSILON)
     retvals = []
     self.dim1.times do |j|
       func = self[nil,j].to_ca

data/lib/carray.rb

@@ -24,5 +24,36 @@ require 'carray/base/math'
 require 'carray/base/iterator'
 require 'carray/base/struct'
 require 'carray/base/inspect'
-require 'carray/base/autoload'
 require 'carray/base/obsolete'
+require 'carray/base/string'
+
+require "carray/carray_mathfunc"
+require "carray/carray_calculus"
+require "carray/math/calculus"
+
+require 'carray/base/autoload'
+require 'carray/autoload/autoload_base'
+require 'carray/autoload/autoload_io_imagemagick'
+require 'carray/autoload/autoload_io_table'
+require 'carray/autoload/autoload_math_histogram'
+require 'carray/autoload/autoload_math_interp'
+require 'carray/autoload/autoload_math_recurrence'
+require 'carray/autoload/autoload_object_iterator'
+require 'carray/autoload/autoload_object_link'
+require 'carray/autoload/autoload_object_pack'
+
+require 'carray/autoload/autoload_gem_gnuplot'
+require 'carray/autoload/autoload_gem_narray'
+require 'carray/autoload/autoload_gem_numo_narray'
+require 'carray/autoload/autoload_gem_io_csv'
+require 'carray/autoload/autoload_gem_io_sqlite3'
+require 'carray/autoload/autoload_gem_rmagick'
+require 'carray/autoload/autoload_gem_cairo'
+require 'carray/autoload/autoload_gem_opencv'
+require 'carray/autoload/autoload_gem_ffi'
+
+#require 'carray/autoload/autoload_gem_io_pg'
+#require 'carray/autoload/autoload_gem_zimg'
+
+undef autoload_method
+

data/lib/carray/autoload/autoload_base.rb

@@ -17,7 +17,3 @@ end
 class Rational < Numeric
   include FloatFunction
 end
-
-module CA
-  autoload :NumPy, "carray/base/numpysh.rb"
-end

data/lib/carray/autoload/autoload_gem_cairo.rb

@@ -0,0 +1,9 @@
+
+module Cairo
+  class Surface
+  end
+  class ImageSurface < Surface
+    autoload_method "self.new_from_ca", "carray-cairo"
+    autoload_method "ca", "carray-cairo"
+  end
+end

data/lib/carray/autoload/autoload_gem_ffi.rb

@@ -0,0 +1,9 @@
+class CArray
+  autoload_method "mp", "carray-ffi"
+end
+
+module FFI
+  class MemoryPointer
+    autoload_method "ca", "carray-ffi"     
+  end
+end

data/lib/carray/autoload/autoload_gem_gnuplot.rb

@@ -0,0 +1,2 @@
+autoload_method "CA.gnuplot", "carray-gnuplot"
+

data/lib/carray/autoload/autoload_gem_io_csv.rb

@@ -0,0 +1,14 @@
+autoload_method "CArray.load_csv", "carray-io-csv"
+autoload_method "CArray.from_csv", "carray-io-csv"
+
+class CArray
+  autoload_method "save_csv", "carray-io-csv"
+  autoload_method "to_csv", "carray-io-csv"
+  autoload_method "to_tabular", "carray-io-csv"
+end
+
+module CA
+  autoload :CSVReader, "carray-io-csv"
+  autoload :CSVWriter, "carray-io-csv"
+end
+

data/lib/carray/autoload/autoload_gem_io_pg.rb

@@ -0,0 +1,6 @@
+autoload_method "CArray.load_pg", "carray-io-pg"
+
+class CArray
+  autoload_method "unescape_bytea", "carray-io-pg"
+  autoload_method "escape_bytea", "carray-io-pg"
+end

data/lib/carray/autoload/autoload_gem_io_sqlite3.rb

@@ -0,0 +1,12 @@
+autoload_method "CArray.load_sqlite3", "carray-io-sqlite3"
+
+class CArray
+  autoload_method "unblob", "carray-io-sqlite3"
+  autoload_method "to_sqlite3", "carray-io-sqlite3"
+end
+
+if Object.const_defined?(:SQLite3)
+  require "carray-io-sqlite3"
+else
+  autoload :SQLite3, "carray-io-sqlite3"
+end

data/lib/carray/autoload/autoload_gem_narray.rb

@@ -0,0 +1,10 @@
+class CArray
+  autoload_method :na,    "carray-narray"
+  autoload_method :to_na, "carray-narray"
+end
+
+class NArray
+  autoload_method :ca,    "carray-narray"
+  autoload_method :to_ca, "carray-narray"  
+end
+

data/lib/carray/autoload/autoload_gem_numo_narray.rb

@@ -0,0 +1,14 @@
+#autoload :Numo, "carray-numo-narray"
+
+class CArray
+  autoload_method :to_numo, "carray-numo-narray"
+  autoload_method :numo, "carray-numo-narray"
+end
+
+module Numo
+  class NArray
+    autoload_method :to_ca, "carray-numo-narray"
+    autoload_method :ca, "carray-numo-narray"
+  end
+end
+

data/lib/carray/autoload/autoload_gem_opencv.rb

@@ -0,0 +1,16 @@
+module OpenCV
+  class CvMat
+    autoload_method "ca", "carray-opencv"
+    autoload_method "to_ca", "carray-opencv"
+    autoload_method "from_ca", "carray-opencv"
+    autoload_method "image", "carray-opencv"
+  end
+  class IplImage < CvMat
+    autoload_method "ca", "carray-opencv"
+  end
+end
+
+class CArray
+  autoload_method "to_cvmat", "carray-opencv"
+  autoload_method "to_iplimage", "carray-opencv"
+end

data/lib/carray/autoload/autoload_gem_rmagick.rb

@@ -0,0 +1,23 @@
+module Magick
+  class Image
+    autoload_method "export_pixels_to_ca", "carray-rmagick"
+    autoload_method "import_pixels_from_ca", "carray-rmagick"
+  end
+end
+
+class CArray
+  autoload_method "self.load_image", "carray-rmagick"
+  autoload_method "save_image", "carray-rmagick"
+  autoload_method "display_image", "carray-rmagick"
+  autoload_method "to_image", "carray-rmagick"
+end
+
+autoload :CAMagickImage, "carray-rmagick"
+
+module Magick
+  class Image
+    autoload_method "ca", "carray-rmagick"
+    autoload_method "to_ca", "carray-rmagick"
+  end
+end
+

data/lib/carray/base/autoload.rb

@@ -13,7 +13,11 @@
 def autoload_method (method, library)
   eval %{
     def #{method} (*argv, &block)
-      require "#{library}"
+      begin
+        require "#{library}"
+      rescue LoadError
+        raise "error in autoloading '#{library}' hooked by method '#{method}', check gem installation."
+      end
       #{method}(*argv, &block)
     end
   }
@@ -23,7 +27,11 @@ class Class
   def autoload_method (method, library)
     class_eval %{
       def #{method} (*argv, &block)
-        require "#{library}"
+        begin
+          require "#{library}"
+        rescue LoadError
+          raise "error in autoloading '#{library}' hooked by method '#{method}', check gem installation."
+        end
         #{method}(*argv, &block)
       end
     }
@@ -34,7 +42,11 @@ class Module
   def autoload_method (method, library)
     class_eval %{
       def #{method} (*argv, &block)
-        require "#{library}"
+        begin
+          require "#{library}"
+        rescue LoadError
+          raise "error in autoloading '#{library}' hooked by method '#{method}', check gem installation."
+        end
         #{method}(*argv, &block)
       end
     }
@@ -46,7 +58,11 @@ class Module
     class_eval %{
       module_function
       def #{method} (*argv, &block)
-        require "#{library}"
+        begin
+          require "#{library}"
+        rescue LoadError
+          raise "error in autoloading '#{library}' hooked by method '#{method}', check gem installation."
+        end
         #{method}(*argv, &block)
       end
     }
@@ -87,6 +103,33 @@ module CA
 
 end
 
+__END__
+names = {"carray" => true}
+Gem.path.each do |path|
+  gems = File.join(path, "gems")
+  if File.directory?(gems)
+    Dir.chdir(gems) {
+      Dir["carray-*"].sort.reverse.each do |dir|
+        name = dir.sub(/\-\d+\.\d+\.\d+\z/, '')
+        next if names[name]
+        lib = File.join(dir, "lib")
+        if File.directory?(lib)
+          Dir.chdir(lib) {
+            Dir["carray/autoload/autoload_*"].each do |loader|
+              begin
+                load File.expand_path(File.join(gems, dir, lib, loader.sub(/\.rb\z/, "")))
+              rescue LoadError
+              end
+            end
+          }
+        end
+        names[name] = true
+      end
+    }
+  end
+end
+
+__END__
 CA.each_load_path("carray/autoload") {
   Dir["autoload_*.rb"].each do |basename|
     if basename =~ /\A(autoload_.+)\.rb\Z/
@@ -98,4 +141,3 @@ CA.each_load_path("carray/autoload") {
   end
 }
 
-undef autoload_method

data/lib/carray/base/basic.rb

@@ -374,15 +374,23 @@ class CArray
   # Reutrns the reference which rank is reduced 
   # by eliminating the dimensions which size == 1 
   def compacted
-    newdim = dim.reject{|x| x == 1 }
-    return ( rank != newdim.size ) ? reshape(*newdim) : self[]
+    if rank == 1
+      return self[]
+    else
+      newdim = dim.reject{|x| x == 1 }
+      return ( rank != newdim.size ) ? reshape(*newdim) : self[]
+    end
   end
 
   # Returns the array which rank is reduced 
   # by eliminating the dimensions which size == 1 
   def compact
-    newdim = dim.reject{|x| x == 1 }
-    return ( rank != newdim.size ) ? reshape(*newdim).to_ca : self.to_ca
+    if rank == 1
+      return self.to_ca
+    else
+      newdim = dim.reject{|x| x == 1 }
+      return ( rank != newdim.size ) ? reshape(*newdim).to_ca : self.to_ca
+    end
   end
 
   # Returns the reference which elements are sorted by the comparison method
@@ -421,6 +429,50 @@ class CArray
     end
   end
 
+  def nlargest (n)
+    obj = self.to_ca
+    list = []
+    n.times do |i|
+      k = obj.max_addr
+      list << obj[k]
+      obj[k] = UNDEF
+    end
+    list.to_ca.to_type(data_type)
+  end
+
+  def nlargest_addr (n)
+    obj = self.to_ca
+    list = []
+    n.times do |i|
+      k = obj.max_addr
+      list << k
+      obj[k] = UNDEF
+    end
+    CA_INT64(list)
+  end
+
+  def nsmallest (n)
+    obj = self.to_ca
+    list = []
+    n.times do |i|
+      k = obj.min_addr
+      list << obj[k]
+      obj[k] = UNDEF
+    end
+    list.to_ca.to_type(data_type)
+  end
+
+  def nsmallest_addr (n)
+    obj = self.to_ca
+    list = []
+    n.times do |i|
+      k = obj.min_addr
+      list << k
+      obj[k] = UNDEF
+    end
+    CA_INT64(list)
+  end
+
   # Returns (1,n) array from 1-dimensional array 
   def to_row 
     if rank != 1
@@ -688,7 +740,7 @@ class CArray
     return CArray.int32(*dim).seq!
   end
 
-  def index (n)
+  def index (n = 0)
     unless n.is_a?(Integer)
       raise ArgumentError, "argument should be an integer"
     end
@@ -735,6 +787,18 @@ class CArray
     return template(:boolean) { 1 }
   end
 
+  def contains (*list)
+    result = self.false()
+    list.each do |item|
+      result = result | self.eq(item)
+    end
+    return result 
+  end
+
+  def between (a, b)
+    return (self >= a) & (self <= b)
+  end
+
   # Returns map
   def map (&block)
     return self.convert(CA_OBJECT, &block).to_a
@@ -794,8 +858,8 @@ class CArray
     return obj
   end
 
-end
 
+end
 
 class CArray
 

data/lib/carray/base/math.rb

@@ -148,7 +148,7 @@ class CArray
   def quo (other)
     case 
     when integer?
-      return double/other
+      return object.quo_i(other)
     when object?
       return quo_i(other)
     else

data/lib/carray/base/string.rb

@@ -0,0 +1,242 @@
+require "date"
+
+class CArray
+
+  def test (&block)
+    return convert(:boolean) {|v| yield(v) ? true : false }
+  end
+
+  def str_len ()
+    return convert(:int, &:length)
+  end
+
+  def str_size ()
+    return convert(:int, &:size)
+  end
+
+  def str_bytesize ()
+    return convert(:int, &:bytesize)
+  end
+
+  def str_gsub (*args, &block)
+    return convert() {|s| s.gsub(*args, &block) }
+  end
+
+  def str_sub (*args, &block)
+    return convert() {|s| s.sub(*args, &block) }
+  end
+
+  def str_encode (*args)
+    return convert() {|s| s.encode(*args) }
+  end
+
+  def str_force_encoding (encoding)
+    return convert() {|s| s.force_encoding(encoding) }
+  end
+
+  def str_encoding ()
+    return convert(&:encoding)
+  end
+
+  def str_is_end_with (*args)
+    return test {|s| s.end_with?(*args) }
+  end
+
+  def str_is_start_with (*args)
+    return test {|s| s.start_with?(*args) }
+  end
+
+  def str_includes (substr)
+    return test {|s| s.include?(substr) }
+  end
+
+  alias str_contains str_includes
+
+  def str_index (*args)
+    return convert(:int) {|s| s.index(*args) }
+  end
+
+  def str_rindex (*args)
+    return convert(:int) {|s| s.rindex(*args) }
+  end
+
+  def str_intern ()
+    return convert(&:intern)
+  end
+
+  def str_scrub ()
+    return convert(&:scrub)
+  end
+
+  def str_downcase ()
+    return convert(&:downcase)
+  end
+
+  def str_upcase ()
+    return convert(&:upcase)
+  end
+
+  def str_capitalize ()
+    return convert(&:capitalize)
+  end
+
+  def str_swapcase ()
+    return convert(&:swapcase)
+  end
+
+  def str_chomp (*args)
+    return convert() {|s| s.chomp(*args) }
+  end
+
+  def str_chop ()
+    return convert(&:chop)
+  end
+
+  def str_chr ()
+    return convert(&:chr)
+  end
+
+  def str_clear ()
+    return convert(&:clear)
+  end
+
+  def str_count (*args)
+    return convert(:int) {|s| s.count(*args) }
+  end
+
+  def str_delete (*args)
+    return convert() {|s| s.delete(*args) }
+  end
+
+  def str_delete_prefix (prefix)
+    return convert() {|s| s.delete_prefix(prefix) }
+  end
+
+  def str_delete_suffix (suffix)
+    return convert() {|s| s.delete_suffix(suffix) }
+  end
+
+  def str_dump ()
+    return convert(&:dump)
+  end
+
+  def str_center (*args)
+    return convert() {|s| s.center(*args) }
+  end
+
+  def str_ljust (*args)
+    return convert() {|s| s.ljust(*args) }
+  end
+
+  def str_rjust (*args)
+    return convert() {|s| s.rjust(*args) }
+  end
+
+  def str_to_i ()
+    return convert(&:to_i)
+  end
+
+  def str_to_f ()
+    return convert(&:to_f)
+  end
+
+  def str_to_r ()
+    return convert(&:to_r)
+  end
+
+  def str_strip ()
+    return convert(&:strip)
+  end
+
+  def str_rstrip ()
+    return convert(&:rstrip)
+  end
+
+  def str_lstrip ()
+    return convert(&:lstrip)
+  end
+
+  def str_is_empty ()
+    return test(&:empty?)
+  end
+
+  def str_matches (*args)
+    if args.size == 1 && args.first.is_a?(Regexp)
+      regexp = args.first
+      return test {|v| v =~ regexp }
+    else
+      mask = template(:boolean) { false }
+      args.each do |str|
+        addr = search(str)
+        mask[addr] = true if addr
+      end
+      return mask
+    end
+  end
+  
+  def str_extract (regexp, replace = '\0')
+    return convert {|s| regexp.match(s) {|m| m[0].sub(regexp, replace) } || "" }
+  end
+    
+  def str_to_datetime (template = nil)
+    if template
+      return convert() {|v| DateTime.strptime(v, template) }
+    else
+      return convert() {|v| DateTime.parse(v) }
+    end
+  end
+
+  def str_to_time (template = nil)
+    if template
+      return str_strptime(template)
+    else
+      return convert() {|v| Time.parse(v) }
+    end
+  end
+
+  def time_format (template = nil)
+    if template
+      return str_strftime(template)
+    else
+      return convert(&:to_s)
+    end    
+  end
+
+  def time_year
+    return convert(:int, &:year)
+  end
+
+  def time_month
+    return convert(:int, &:month)
+  end
+
+  def time_day
+    return convert(:int, &:day)
+  end
+
+  def time_hour 
+    return convert(:int, &:hour)
+  end
+
+  def time_minute
+    return convert(:int, &:minute)
+  end
+
+  def time_second
+    return convert(:double) {|d| d.second + d.second_fraction }
+  end
+
+  def time_jd
+    return convert(:int, &:jd)
+  end
+
+  def time_ajd
+    return convert(:double, &:ajd)
+  end
+
+  def time_is_leap
+    return test(&:leap?)
+  end
+
+end
+