carray 1.3.3 → 1.4.0

data/lib/carray/base/struct.rb

@@ -97,7 +97,7 @@ class CA::Struct
   class << self
     
     def inspect
-      return name.empty? ? "AnonStruct" : name
+      return name.nil? ? "AnonStruct" : name
     end
     
     def [] (*argv)
@@ -267,7 +267,7 @@ end
 class CA::Union < CA::Struct
   class << self
     def inspect
-      return name.empty? ? "AnonUnion" : name
+      return name.nil? ? "AnonUnion" : name
     end
   end
 end
@@ -562,7 +562,7 @@ class CA::Struct
     output = ""
     table  = self::MEMBER_TABLE
     stlist = []
-    if self.name.empty?
+    if self.name.nil?
       if self <= CA::Union
         prefix = "union"
       else
@@ -584,7 +584,7 @@ class CA::Struct
       when Class
         if type < CA::Struct
           stlist << type
-          if type.name.empty?
+          if type.name.nil?
             if type <= CA::Union
               prefix = "union"
             else

data/lib/carray/io/table.rb

@@ -72,6 +72,7 @@ class CArray
   def extend_as_table (column_names)
     self.extend CA::TableMethods
     self.column_names = column_names
+    self
   end
     
 end

data/mkmath.rb

@@ -289,7 +289,12 @@ ca_binop_#{name}_#{type} (ca_size_t n, boolean8_t *m, char *ptr1, ca_size_t i1,
   io.puts
   io.print %{
 static VALUE rb_ca_#{name} (VALUE self, VALUE other)
-{ return rb_ca_call_binop(self, other, ca_binop_#{name}); }
+{ 
+  if ( ! rb_ca_test_castable(other) ) {
+    return rb_ca_binop_pass_to_other(self, other, rb_intern("#{op}"));
+  }
+  return rb_ca_call_binop(self, other, ca_binop_#{name}); 
+}
 static VALUE rb_ca_#{name}_bang (VALUE self, VALUE other)
 { return rb_ca_call_binop_bang(self, other, ca_binop_#{name}); }
   }
@@ -529,7 +534,12 @@ ca_bincmp_#{name}_#{type} (ca_size_t n, boolean8_t *m,
   io.puts
   io.print %{
 static VALUE rb_ca_#{name} (VALUE self, VALUE other)
-{ return rb_ca_call_bincmp(self, other, ca_bincmp_#{name}); }
+{ 
+  if ( ! rb_ca_test_castable(other) ) {
+    return rb_ca_binop_pass_to_other(self, other, rb_intern("#{op}"));
+  }
+  return rb_ca_call_bincmp(self, other, ca_bincmp_#{name});
+}
   }
   DEFINITIONS << io.string
   if op

data/version.h

@@ -10,9 +10,9 @@
 
 ---------------------------------------------------------------------------- */
 
-#define CA_VERSION "1.3.3"
-#define CA_VERSION_CODE 133
+#define CA_VERSION "1.4.0"
+#define CA_VERSION_CODE 140
 #define CA_VERSION_MAJOR 1
-#define CA_VERSION_MINOR 3
-#define CA_VERSION_TEENY 3
-#define CA_VERSION_DATE "2019/08/06"
+#define CA_VERSION_MINOR 4
+#define CA_VERSION_TEENY 0
+#define CA_VERSION_DATE "2020/06/15"

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: carray
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: narray
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.1.1
-- !ruby/object:Gem::Dependency
-  name: narray_miss
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+date: 2020-06-15 00:00:00.000000000 Z
+dependencies: []
 description: |2
       CArray is a uniform multi-dimensional rectangular array class.
       It provides the various types of sub-arrays and references
@@ -61,17 +19,12 @@ email: ''
 executables: []
 extensions:
 - extconf.rb
-- ext/calculus/extconf.rb
-- ext/fortio/extconf.rb
-- ext/imagemap/extconf.rb
 - ext/mathfunc/extconf.rb
-- ext/narray/extconf.rb
+- ext/calculus/extconf.rb
 extra_rdoc_files: []
 files:
 - COPYING
 - GPL
-- Gemfile
-- Gemfile.lock
 - LEGAL
 - NOTE
 - README.md
@@ -126,75 +79,33 @@ files:
 - carray_undef.c
 - carray_utils.c
 - devel/guess_shape.rb
+- devel/im2col.rb
 - ext/calculus/carray_calculus.c
 - ext/calculus/carray_interp.c
 - ext/calculus/extconf.rb
-- ext/calculus/lib/autoload/autoload_math_calculus.rb
 - ext/calculus/lib/math/calculus.rb
 - ext/calculus/lib/math/interp/adapter_interp1d.rb
-- ext/fortio/extconf.rb
-- ext/fortio/lib/carray/autoload/autoload_fortran_format.rb
-- ext/fortio/lib/carray/io/fortran_format.rb
-- ext/fortio/lib/fortio.rb
-- ext/fortio/lib/fortio/fortran_format.rb
-- ext/fortio/lib/fortio/fortran_format.tab.rb
-- ext/fortio/lib/fortio/fortran_format.y
-- ext/fortio/lib/fortio/fortran_namelist.rb
-- ext/fortio/lib/fortio/fortran_namelist.tab.rb
-- ext/fortio/lib/fortio/fortran_namelist.y
-- ext/fortio/lib/fortio/fortran_sequential.rb
-- ext/fortio/ruby_fortio.c
-- ext/fortio/test/test_H.rb
-- ext/fortio/test/test_T.rb
-- ext/fortio/test/test_fortran_format.rb
-- ext/fortio/test/test_namelist.rb
-- ext/fortio/test/test_namelist_write.rb
-- ext/fortio/test/test_sequential.rb
-- ext/fortio/test/test_sequential2.rb
-- ext/fortio/work/test.rb
-- ext/fortio/work/test_e.rb
-- ext/fortio/work/test_ep.rb
-- ext/fortio/work/test_parse.rb
-- ext/imagemap/carray_imagemap.c
-- ext/imagemap/doc/call_graph.dot
-- ext/imagemap/draw.c
-- ext/imagemap/extconf.rb
-- ext/imagemap/lib/autoload/autoload_graphics_imagemap.rb
-- ext/imagemap/lib/graphics/imagemap.rb
-- ext/imagemap/lib/image_map.rb
-- ext/imagemap/test/swath_index.rb
-- ext/imagemap/test/swath_warp.rb
-- ext/imagemap/test/test.rb
-- ext/imagemap/test/test_image.rb
-- ext/imagemap/test/test_line.rb
-- ext/imagemap/test/test_rotate.rb
-- ext/imagemap/test/test_triangle.rb
-- ext/imagemap/test/test_warp.rb
 - ext/mathfunc/carray_mathfunc.c
 - ext/mathfunc/extconf.rb
-- ext/mathfunc/lib/autoload/autoload_math_mathfunc.rb
-- ext/mathfunc/lib/math/mathfunc.rb
 - ext/mathfunc/test/test_hypot.rb
 - ext/mathfunc/test/test_j0.rb
 - ext/mathfunc/test/test_jn.rb
 - ext/mathfunc/test/test_sph.rb
-- ext/narray/README
-- ext/narray/ca_wrap_narray.c
-- ext/narray/carray_narray.c
-- ext/narray/extconf.rb
-- ext/narray/lib/autoload/autoload_math_narray.rb
-- ext/narray/lib/autoload/autoload_math_narray_miss.rb
-- ext/narray/lib/math/narray.rb
-- ext/narray/lib/math/narray_miss.rb
 - extconf.rb
 - lib/carray.rb
 - lib/carray/autoload/autoload_base.rb
-- lib/carray/autoload/autoload_graphics_gnuplot.rb
-- lib/carray/autoload/autoload_graphics_zimg.rb
-- lib/carray/autoload/autoload_io_csv.rb
+- lib/carray/autoload/autoload_gem_cairo.rb
+- lib/carray/autoload/autoload_gem_ffi.rb
+- lib/carray/autoload/autoload_gem_gnuplot.rb
+- lib/carray/autoload/autoload_gem_io_csv.rb
+- lib/carray/autoload/autoload_gem_io_pg.rb
+- lib/carray/autoload/autoload_gem_io_sqlite3.rb
+- lib/carray/autoload/autoload_gem_narray.rb
+- lib/carray/autoload/autoload_gem_numo_narray.rb
+- lib/carray/autoload/autoload_gem_opencv.rb
+- lib/carray/autoload/autoload_gem_rmagick.rb
+- lib/carray/autoload/autoload_gem_zimg.rb
 - lib/carray/autoload/autoload_io_imagemagick.rb
-- lib/carray/autoload/autoload_io_pg.rb
-- lib/carray/autoload/autoload_io_sqlite3.rb
 - lib/carray/autoload/autoload_io_table.rb
 - lib/carray/autoload/autoload_math_histogram.rb
 - lib/carray/autoload/autoload_math_interp.rb
@@ -209,14 +120,10 @@ files:
 - lib/carray/base/math.rb
 - lib/carray/base/obsolete.rb
 - lib/carray/base/serialize.rb
+- lib/carray/base/string.rb
 - lib/carray/base/struct.rb
-- lib/carray/graphics/gnuplot.rb
-- lib/carray/graphics/zimg.rb
 - lib/carray/info.rb
-- lib/carray/io/csv.rb
 - lib/carray/io/imagemagick.rb
-- lib/carray/io/pg.rb
-- lib/carray/io/sqlite3.rb
 - lib/carray/io/table.rb
 - lib/carray/math/histogram.rb
 - lib/carray/math/interp.rb
@@ -227,7 +134,6 @@ files:
 - lib/carray/object/ca_obj_link.rb
 - lib/carray/object/ca_obj_pack.rb
 - mkmath.rb
-- mkmf.log
 - mt19937ar.c
 - mt19937ar.h
 - rdoc_main.rb
@@ -309,44 +215,46 @@ rdoc_options:
 - rdoc_ext.rb
 - rdoc_math.rb
 - rdoc_stat.rb
-- lib/carray/autoload/autoload_base.rb
-- lib/carray/autoload/autoload_graphics_gnuplot.rb
-- lib/carray/autoload/autoload_graphics_zimg.rb
-- lib/carray/autoload/autoload_io_csv.rb
-- lib/carray/autoload/autoload_io_imagemagick.rb
-- lib/carray/autoload/autoload_io_pg.rb
-- lib/carray/autoload/autoload_io_sqlite3.rb
+- lib/carray/info.rb
+- lib/carray/io/table.rb
+- lib/carray/io/imagemagick.rb
+- lib/carray/math/interp.rb
+- lib/carray/math/interp/adapter_gsl_spline.rb
+- lib/carray/math/histogram.rb
+- lib/carray/math/recurrence.rb
+- lib/carray/object/ca_obj_iterator.rb
+- lib/carray/object/ca_obj_pack.rb
+- lib/carray/object/ca_obj_link.rb
 - lib/carray/autoload/autoload_io_table.rb
+- lib/carray/autoload/autoload_gem_narray.rb
 - lib/carray/autoload/autoload_math_histogram.rb
 - lib/carray/autoload/autoload_math_interp.rb
+- lib/carray/autoload/autoload_io_imagemagick.rb
+- lib/carray/autoload/autoload_gem_cairo.rb
+- lib/carray/autoload/autoload_gem_numo_narray.rb
+- lib/carray/autoload/autoload_gem_zimg.rb
 - lib/carray/autoload/autoload_math_recurrence.rb
-- lib/carray/autoload/autoload_object_iterator.rb
+- lib/carray/autoload/autoload_gem_io_pg.rb
+- lib/carray/autoload/autoload_gem_ffi.rb
+- lib/carray/autoload/autoload_gem_gnuplot.rb
+- lib/carray/autoload/autoload_gem_opencv.rb
+- lib/carray/autoload/autoload_gem_io_sqlite3.rb
+- lib/carray/autoload/autoload_gem_io_csv.rb
+- lib/carray/autoload/autoload_gem_rmagick.rb
+- lib/carray/autoload/autoload_base.rb
 - lib/carray/autoload/autoload_object_link.rb
 - lib/carray/autoload/autoload_object_pack.rb
-- lib/carray/base/autoload.rb
-- lib/carray/base/basic.rb
+- lib/carray/autoload/autoload_object_iterator.rb
+- lib/carray/mkmf.rb
+- lib/carray/base/struct.rb
+- lib/carray/base/string.rb
+- lib/carray/base/math.rb
 - lib/carray/base/inspect.rb
 - lib/carray/base/iterator.rb
-- lib/carray/base/math.rb
+- lib/carray/base/basic.rb
+- lib/carray/base/autoload.rb
 - lib/carray/base/obsolete.rb
 - lib/carray/base/serialize.rb
-- lib/carray/base/struct.rb
-- lib/carray/graphics/gnuplot.rb
-- lib/carray/graphics/zimg.rb
-- lib/carray/info.rb
-- lib/carray/io/csv.rb
-- lib/carray/io/imagemagick.rb
-- lib/carray/io/pg.rb
-- lib/carray/io/sqlite3.rb
-- lib/carray/io/table.rb
-- lib/carray/math/histogram.rb
-- lib/carray/math/interp/adapter_gsl_spline.rb
-- lib/carray/math/interp.rb
-- lib/carray/math/recurrence.rb
-- lib/carray/mkmf.rb
-- lib/carray/object/ca_obj_iterator.rb
-- lib/carray/object/ca_obj_link.rb
-- lib/carray/object/ca_obj_pack.rb
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -360,8 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Multi-dimesional array class

data/Gemfile

@@ -1,8 +0,0 @@
-# A sample Gemfile
-source "https://rubygems.org"
-
-# gem "rails"
-gem "narray"
-gem "narray_miss"
-gem "spreadsheet"
-gem "sqlite3"

data/Gemfile.lock

@@ -1,33 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    axlsx (2.0.1)
-      htmlentities (~> 4.3.1)
-      nokogiri (>= 1.4.1)
-      rubyzip (~> 1.0.0)
-    htmlentities (4.3.4)
-    mini_portile2 (2.0.0)
-    narray (0.6.1.2)
-    narray_miss (1.3.0)
-      numru-narray
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    numru-narray (1.0.3)
-    ruby-ole (1.2.12)
-    rubyzip (1.0.0)
-    spreadsheet (1.1.2)
-      ruby-ole (>= 1.0)
-    sqlite3 (1.3.11)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  axlsx
-  narray
-  narray_miss
-  spreadsheet
-  sqlite3
-
-BUNDLED WITH
-   1.11.2

data/ext/calculus/lib/autoload/autoload_math_calculus.rb

@@ -1,2 +0,0 @@
-require "carray/carray_calculus"
-require "carray/math/calculus"

data/ext/fortio/extconf.rb

@@ -1,3 +0,0 @@
-require "mkmf"
-
-create_makefile("fortio_ext")

data/ext/fortio/lib/carray/autoload/autoload_fortran_format.rb

@@ -1,5 +0,0 @@
-
-class CArray
-  autoload_method "self.from_fortran_format",  "carray/io/fortran_format"
-  autoload_method "to_fortran_format",  "carray/io/fortran_format"
-end

data/ext/fortio/lib/carray/io/fortran_format.rb

@@ -1,43 +0,0 @@
-require "fortio"
-
-class CArray
-
-  def self.from_fortran_format (fmt, io)
-    case io
-    when String
-      io = StringIO.new(io)
-    end
-    case fmt
-    when String
-      fmt = FortranFormat.new(fmt)
-    end
-    data = []
-    begin
-      data << fmt.read(io)
-    end until io.eof?
-    return data.to_ca
-  end
-
-  def to_fortran_format (fmt, input="")
-    case input
-    when String
-      io = StringIO.new(input)
-    else
-      io = input
-    end
-    case fmt
-    when String
-      fmt = FortranFormat.new(fmt)
-    end
-    n = fmt.count_args
-    attach {
-      self[nil].blocks(0...n).each do |blk|
-        fmt.write(io, *blk.to_a)
-      end
-    }
-    return input
-  end
-
-end
-
-