carray 1.2.0 → 1.3.0

data/lib/carray/io/imagemagick.rb

@@ -163,6 +163,10 @@ class CArray
       depth = "-depth 8"
     when CA_INT16, CA_UINT16
       depth = "-depth 16"
+    when CA_FLOAT32
+      depth = "-depth 32"
+    when CA_FLOAT64
+      depth = "-depth 64"
     when CA_FIXLEN
       depth = "-depth #{8*bytes}"
     else
@@ -229,3 +233,6 @@ end
 
 
 
+
+
+

data/lib/carray/io/sqlite3.rb

@@ -70,11 +70,13 @@ class CArray
     else
       begin
         dim0.times do |i|
-          insert.execute self[i,nil].to_a
+          begin
+           insert.execute self[i,nil].to_a
+          rescue
+            puts self[i,nil].to_a
+            raise $!
+          end
         end
-      rescue
-        puts self[i,nil].to_a
-        raise $!
       end
     end
     database.commit if transaction

data/mkmath.rb

@@ -27,11 +27,11 @@ def monfunc (op, name, hash)
         omp_ok = ( type != "VALUE" ) ? 1 : 0
         io.print %{
 static void
-ca_monop_#{name}_#{type} (int32_t n, boolean8_t *m, char *ptr1, int32_t i1, char *ptr2, int32_t i2)
+ca_monop_#{name}_#{type} (ca_size_t n, boolean8_t *m, char *ptr1, ca_size_t i1, char *ptr2, ca_size_t i2)
 {
   #{type} *q1 = (#{type} *) ptr1, *q2 = (#{type} *) ptr2;
   #{type} *p1 = q1, *p2 = q2;
-  int32_t k;
+  ca_size_t k;
   if ( m ) {
     boolean8_t *pm;
     #if defined(_OPENMP) && #{omp_ok}
@@ -94,7 +94,7 @@ static VALUE rb_ca_#{name} (VALUE self)
 static VALUE rb_ca_#{name} (VALUE self)
 { 
   if ( rb_ca_is_integer_type(self) ) {
-    self = rb_ca_wrap_readonly(self, INT2FIX(CA_FLOAT64));
+    self = rb_ca_wrap_readonly(self, INT2NUM(CA_FLOAT64));
   }
   return rb_ca_call_monop(self, ca_monop_#{name}); 
 }
@@ -138,11 +138,11 @@ def monop (op, name, hash)
         omp_ok = ( type != "VALUE" ) ? 1 : 0
         io.print %{
 static void
-ca_monop_#{name}_#{type} (int32_t n, boolean8_t *m, char *ptr1, int32_t i1, char *ptr2, int32_t i2)
+ca_monop_#{name}_#{type} (ca_size_t n, boolean8_t *m, char *ptr1, ca_size_t i1, char *ptr2, ca_size_t i2)
 {
   #{type} *q1 = (#{type} *) ptr1, *q2 = (#{type} *) ptr2;
   #{type} *p1 = q1, *p2 = q2;
-  int32_t k;
+  ca_size_t k;
   if ( m ) {
     boolean8_t *pm;
     #if defined(_OPENMP) && #{omp_ok}
@@ -228,11 +228,11 @@ def binop (op, name, hash)
         omp_ok = ( type != "VALUE" ) ? 1 : 0
         io.print %{
 static void
-ca_binop_#{name}_#{type} (int32_t n, boolean8_t *m, char *ptr1, int32_t i1, char *ptr2, int32_t i2, char *ptr3, int32_t i3)
+ca_binop_#{name}_#{type} (ca_size_t n, boolean8_t *m, char *ptr1, ca_size_t i1, char *ptr2, ca_size_t i2, char *ptr3, ca_size_t i3)
 {
   #{type} *q1 = (#{type} *) ptr1, *q2 = (#{type} *) ptr2, *q3 = (#{type} *) ptr3;
   #{type} *p1 = q1, *p2 = q2, *p3 = q3;
-  int32_t k;
+  ca_size_t k;
   if ( m ) {
     boolean8_t *pm;
     #if defined(_OPENMP) && #{omp_ok}
@@ -320,13 +320,13 @@ def moncmp (op, name, hash)
         omp_ok = ( type != "VALUE" ) ? 1 : 0
         io.print %{
 static void
-ca_moncmp_#{name}_#{type} (int32_t n, boolean8_t *m, char *ptr1, int32_t i1, boolean8_t *ptr2, int32_t i2)
+ca_moncmp_#{name}_#{type} (ca_size_t n, boolean8_t *m, char *ptr1, ca_size_t i1, boolean8_t *ptr2, ca_size_t i2)
 {
   #{type} *q1 = (#{type} *) ptr1;
   #{type} *p1 = q1;
   boolean8_t *q2 = (boolean8_t *) ptr2;
   boolean8_t *p2 = q2;
-  int32_t k;
+  ca_size_t k;
   if ( m ) {
     boolean8_t *pm = m;
     #if defined(_OPENMP) && #{omp_ok}
@@ -415,16 +415,16 @@ def bincmp (op, name, hash)
           omp_ok = ( type != "VALUE" ) ? 1 : 0
           io.print %{
 static void
-ca_bincmp_#{name}_#{type} (int32_t n, boolean8_t *m, 
-                           char *ptr1, int32_t b1, int32_t i1, 
-                           char *ptr2, int32_t b2, int32_t i2, 
-                           char *ptr3, int32_t b3, int32_t i3)
+ca_bincmp_#{name}_#{type} (ca_size_t n, boolean8_t *m, 
+                           char *ptr1, ca_size_t b1, ca_size_t i1, 
+                           char *ptr2, ca_size_t b2, ca_size_t i2, 
+                           char *ptr3, ca_size_t b3, ca_size_t i3)
 {
   #{type} *q1 = (#{type} *) ptr1, *q2 = (#{type} *) ptr2;
   #{type} *p1 = q1, *p2 = q2;
   boolean8_t *q3 = (boolean8_t *) ptr3;
   boolean8_t *p3 = q3;
-  int32_t k;
+  ca_size_t k;
   if ( m ) {
     boolean8_t *pm = m;
     #if defined(_OPENMP) && #{omp_ok}
@@ -461,17 +461,17 @@ ca_bincmp_#{name}_#{type} (int32_t n, boolean8_t *m,
           omp_ok = 1
           io.print %{
 static void
-ca_bincmp_#{name}_#{type} (int32_t n, boolean8_t *m, 
-                           char *ptr1, int32_t b1, int32_t i1, 
-                           char *ptr2, int32_t b2, int32_t i2, 
-                           char *ptr3, int32_t b3, int32_t i3)
+ca_bincmp_#{name}_#{type} (ca_size_t n, boolean8_t *m, 
+                           char *ptr1, ca_size_t b1, ca_size_t i1, 
+                           char *ptr2, ca_size_t b2, ca_size_t i2, 
+                           char *ptr3, ca_size_t b3, ca_size_t i3)
 {
   char *q1 = ptr1, *q2 = ptr2;
   char *p1 = q1, *p2 = q2;
   boolean8_t *q3 = (boolean8_t *) ptr3;
   boolean8_t *p3 = q3;
-  int32_t s1 = b1*i1, s2 = b2*i2, s3 = b3*i3;
-  int32_t k;
+  ca_size_t s1 = b1*i1, s2 = b2*i2, s3 = b3*i3;
+  ca_size_t k;
   if ( m ) {
     boolean8_t *pm = m;
     #if defined(_OPENMP) && #{omp_ok}

data/ruby_carray.c

@@ -164,6 +164,8 @@ Init_carray_ext ()
   rb_define_const(rb_cObject, "CA_DOUBLE",      INT2NUM(CA_DOUBLE));
   rb_define_const(rb_cObject, "CA_COMPLEX",     INT2NUM(CA_COMPLEX));
   rb_define_const(rb_cObject, "CA_DCOMPLEX",    INT2NUM(CA_DCOMPLEX));
+  rb_define_const(rb_cObject, "CA_SIZE",        INT2NUM(CA_SIZE));
+
 
   rb_define_const(rb_cObject, "CA_ALIGN_VOIDP",    INT2NUM(CA_ALIGN_VOIDP));
   rb_define_const(rb_cObject, "CA_ALIGN_FIXLEN",   INT2NUM(CA_ALIGN_INT8));

data/ruby_ccomplex.c

@@ -76,7 +76,7 @@ rb_num2cc(VALUE num)
   }
   switch ( TYPE(num) ) {
   case T_FIXNUM:
-    return (double complex) FIX2LONG(num);
+    return (double complex) NUM2LONG(num);
   case T_BIGNUM:
     return (double complex) rb_big2dbl(num);
   case T_FLOAT:
@@ -108,7 +108,7 @@ rb_num_to_cc (VALUE num)
   }
   switch ( TYPE(num) ) {
   case T_FIXNUM:
-    return rb_ccomplex_new((double complex) FIX2LONG(num));
+    return rb_ccomplex_new((double complex) NUM2LONG(num));
   case T_BIGNUM:
     return rb_ccomplex_new((double complex) rb_big2dbl(num));
   case T_FLOAT:
@@ -175,7 +175,7 @@ rb_cc_initialize (int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, double complex, cp);
 
-  rb_scan_args(argc, argv, "11", &rre, &rim);
+  rb_scan_args(argc, argv, "11", (VALUE *)&rre, (VALUE *)&rim);
 
   if ( NIL_P(rim) ) {
     *cp = NUM2DBL(rre);

data/test/test_130.rb

@@ -0,0 +1,23 @@
+$:.unshift("../lib", "..")
+
+require 'test/unit'
+require 'carray'
+
+class Test130 < Test::Unit::TestCase
+
+  def test_float_arithmetic
+    assert_equal((CA_FLOAT([100])+1)[0], 101.0)
+  end
+  
+  def test_int64
+    assert_raise(RangeError) { CA_INT64([0xffffffffffffffff]) }
+    assert_equal(CA_INT64([0x7fffffffffffffff])[0], 
+                           0x7fffffffffffffff)
+    assert_equal(CA_INT64([0x7fffffffffffffff])+1,
+                 CA_INT64([-0x8000000000000000]))
+    assert_equal(CA_INT64([0x7fffffffffffffff, 0x7fffffffffffffff]).sum,
+                 (2*0x7fffffffffffffff).to_f)
+  end
+
+
+end

data/test/test_ALL.rb

@@ -37,7 +37,7 @@ load 'test_extream.rb'
 load 'test_generate.rb'
 load 'test_index.rb'
 load 'test_mask.rb'
-#load 'test_math.rb'
+load 'test_math.rb'
 load 'test_narray.rb' if defined?(CArray::HAVE_NARRAY)
 load 'test_order.rb'
 load 'test_random.rb'
@@ -48,3 +48,4 @@ load 'test_virtual.rb'
 #
 load 'test_creation.rb'
 #
+load 'test_130.rb'

data/test/test_order.rb

@@ -9,7 +9,7 @@ class TestCArrayOrder < Test::Unit::TestCase
     # ---
     a = CArray.int(3,3).seq!
     c = (a % 2).eq(0)
-    assert_equal(a[c], c.where)
+    assert_equal(a[c], c.where.int)
   end
 
   def test_index
@@ -66,14 +66,14 @@ class TestCArrayOrder < Test::Unit::TestCase
                   [0,1,2],
                   [8,7,6]])
     # ---
-    assert_equal(CA_INT32([[3,4,5],
+    assert_equal(CA_SIZE([[3,4,5],
                            [2,1,0],
                            [8,7,6]]), a.sort_addr)
     assert_equal(CA_INT32([[5,4,3],
                            [0,1,2],
                            [8,7,6]]), a.order)
     # ---
-    assert_equal(CA_INT32([[6,7,8],
+    assert_equal(CA_SIZE([[6,7,8],
                            [0,1,2],
                            [5,4,3]]), a.sort_addr.reverse)
     assert_equal(CA_INT32([[3,4,5],

data/test/test_stat.rb

@@ -9,7 +9,7 @@ class TestCArrayStat < Test::Unit::TestCase
     # ---
     a = CArray.int32(10).seq!(1) ### [1, 2, ..., 10]
     s = a.min
-    assert_instance_of(Fixnum, s)
+    #assert_instance_of(Integer, s)
     assert_equal(1, s)
 
     # ---
@@ -53,7 +53,7 @@ class TestCArrayStat < Test::Unit::TestCase
     # ---
     a = CArray.int32(10).seq!(1) ### [1, 2, ..., 10]
     s = a.max
-    assert_instance_of(Fixnum, s)
+    #assert_instance_of(Integer, s)
     assert_equal(10, s)
 
     # ---

data/version.h

@@ -10,9 +10,9 @@
 
 ---------------------------------------------------------------------------- */
 
-#define CA_VERSION "1.2.0"
-#define CA_VERSION_CODE 120
+#define CA_VERSION "1.3.0"
+#define CA_VERSION_CODE 130
 #define CA_VERSION_MAJOR 1
-#define CA_VERSION_MINOR 2
+#define CA_VERSION_MINOR 3
 #define CA_VERSION_TEENY 0
-#define CA_VERSION_DATE "2017/02/09"
+#define CA_VERSION_DATE "2017/11/18"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carray
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: axlsx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: spreadsheet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -154,8 +126,6 @@ files:
 - carray_undef.c
 - carray_utils.c
 - devel/guess_shape.rb
-- examples/ex001.rb
-- examples/test-int.rb
 - ext/calculus/carray_calculus.c
 - ext/calculus/carray_interp.c
 - ext/calculus/extconf.rb
@@ -222,7 +192,6 @@ files:
 - 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_excel.rb
 - lib/carray/autoload/autoload_io_imagemagick.rb
 - lib/carray/autoload/autoload_io_pg.rb
 - lib/carray/autoload/autoload_io_sqlite3.rb
@@ -245,7 +214,6 @@ files:
 - lib/carray/graphics/zimg.rb
 - lib/carray/info.rb
 - lib/carray/io/csv.rb
-- lib/carray/io/excel.rb
 - lib/carray/io/imagemagick.rb
 - lib/carray/io/pg.rb
 - lib/carray/io/sqlite3.rb
@@ -278,6 +246,7 @@ files:
 - spec/CArray/object/s_new_spec.rb
 - spec/CArray/serialize/Serialization_spec.rb
 - spec/spec_all.rb
+- test/test_130.rb
 - test/test_ALL.rb
 - test/test_CABitfield.rb
 - test/test_CABlock.rb
@@ -343,7 +312,6 @@ rdoc_options:
 - 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_excel.rb
 - lib/carray/autoload/autoload_io_imagemagick.rb
 - lib/carray/autoload/autoload_io_pg.rb
 - lib/carray/autoload/autoload_io_sqlite3.rb
@@ -366,7 +334,6 @@ rdoc_options:
 - lib/carray/graphics/zimg.rb
 - lib/carray/info.rb
 - lib/carray/io/csv.rb
-- lib/carray/io/excel.rb
 - lib/carray/io/imagemagick.rb
 - lib/carray/io/pg.rb
 - lib/carray/io/sqlite3.rb
@@ -393,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Multi-dimesional array class

data/examples/ex001.rb

@@ -1,10 +0,0 @@
-require "carray"
-
-data = <<HERE_END
-time,temp,humidity
-
-
-HERE_END
-
-ca = CArray.int(3,3).seq!
-

data/examples/test-int.rb

@@ -1,13 +0,0 @@
-require "carray"
-
-a = CArray.double(10).seq(0.1,0.1)
-b = CA_DOUBLE([0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1])
-a1 = (a/0.1)
-b1 = (b/0.1)
-
-p a
-p b
-p a1
-p b1
-p a1.int
-p b1.int

data/lib/carray/autoload/autoload_io_excel.rb

@@ -1,5 +0,0 @@
-autoload_method "CArray.load_excel", "carray/io/excel"
-
-class CArray
-  autoload_method "save_excel", "carray/io/excel"
-end

data/lib/carray/io/excel.rb

@@ -1,26 +0,0 @@
-require "spreadsheet"
-
-class CArray
-  
-  def save_excel (filename, &block)
-    if self.rank >= 3
-      raise "too large rank (>2) to write excel file"
-    end
-    book = Spreadsheet::Workbook.new
-    worksheet = book.create_worksheet
-    self.dim0.times do |i|
-      worksheet.row(i).push *self[i,nil]
-    end
-    if block
-      block.call(worksheet)
-    end
-    book.write(filename)    
-  end
-  
-  def self.load_excel (filename, sheet=0)
-    book = Spreadsheet.open(filename)
-    sheet = book.worksheet(sheet)
-    return sheet.map(&:to_a).to_ca
-  end
-  
-end