carray 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed57e98ceb7b9a6dd20bdcc198768e05f2f813c90fb8b01b66aa22ff1533dea0
-  data.tar.gz: 0bcb559bed2952b2b409fa4a775ed42f333940983b9be9ae1a10519d601ae35b
+  metadata.gz: 19670c9fa370952b777655dbbfc938a93deecbbe62452559f572951d8a083078
+  data.tar.gz: bc7dae442eee84400725a45c804332426f72a0405299d785ecccb3cae27f1d2b
 SHA512:
-  metadata.gz: 33dc237571154a0e4cdd9982e6fb42d0d22689491b0c59d4a8384942acf016c4407faaa5695a1c38939727128849743445d7f182f5b0689a3c4b62adc9e50c43
-  data.tar.gz: d0794dfe656fbe639ecfdc1c2104aebf24e6b1a44e784e6f8cfa4845c9c1bc57dc84076d27604c02455defbdf8e1a98fb3123f3073044235d511f3b4c58f813b
+  metadata.gz: d1f76a7cdc3448844557c05c0375b01221a2d7a6d9d48ed36223cbc3a39b379e3dab966a48c8a6aaa57d0d6521e4222f2849dca8749e7137e693ec9379d12b9f
+  data.tar.gz: 82b3ff4f50775df6f6699533826e8494a29a34f15256d2874b271dc6cd64f1c24878d4639185c4837a66ee15daf33fa25c1ec3f0bf80c487b80553c353939cbd

data/README.md

@@ -10,14 +10,7 @@ Requirements
 * C compiler 
   + IEEE754 floating point number
   + C99 complex number
-* Optionally required gems
-  + narray
-  + narray_miss
-  + axlsx
-  + spreadsheet
-  + sqlite3
 * Optional command
-  + Gnuplot
   + ImageMagick (stream, convert, display, identify)
 
 Directories

data/Rakefile

@@ -2,12 +2,43 @@
 #
 #
 
+GEMSPEC = "carray.gemspec"
+
+task :install do
+  spec = eval File.read(GEMSPEC)
+  version_h = `ruby version.rb`.chomp
+  if spec.version.to_s != version_h
+    STDERR.puts "Mismatch in version between carray.gemspec and version.h"
+    STDERR.puts "  carray.gemspec - #{spec.version.to_s }"
+    STDERR.puts "  version.h      - #{version_h}"
+    STDERR.puts "Please check!"
+    exit(1)
+  end
+  system %{
+    gem build #{GEMSPEC}; gem install #{spec.full_name}.gem
+  }
+end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+
+
+__END__
 require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 
 task :default => :test
 
+GEMSPEC = "carray.gemspec"
+
+task :install do
+  spec = eval File.read(GEMSPEC)
+  system %{
+    gem build #{GEMSPEC}; gem install #{spec.full_name}.gem
+  }
+end
+
 desc "Run the tests"
 Rake::TestTask::new(:test) do |t|
   t.test_files = FileList['test/test_ALL.rb']

data/carray.gemspec

@@ -1,17 +1,14 @@
-
-
 Gem::Specification::new do |s|
-  require_relative "./version"
-  
-  version, date = carray_version()
+
+  version = "1.4.0"
 
   files = Dir.glob("**/*") - [ 
-                            Dir.glob("vendor"),
-                            Dir.glob("ext/**/{Makefile,mkmf.log}"),
-                            Dir.glob("**/*.{o,so,bundle}"),
-                            Dir.glob("**/*~"),
-                            Dir.glob("carray-*.gem"), 
-                           ].flatten
+                               Dir.glob("carray-*.gem"), 
+                               Dir.glob("ext/**/{Makefile,mkmf.log}"),
+                               Dir.glob("**/*.{o,so,bundle}"),
+                               Dir.glob("**/*~"),
+                               Dir.glob("doc/**/*"),
+                             ].flatten
 
   s.platform    = Gem::Platform::RUBY
   s.name        = "carray"
@@ -38,7 +35,5 @@ Gem::Specification::new do |s|
 		Dir.glob("lib/carray/**/*.rb"),
 	].flatten
   s.required_ruby_version = ">= 1.8.1"
-  s.add_runtime_dependency 'narray', '~> 0.6.1.1'
-  s.add_runtime_dependency 'narray_miss', '~> 1.3'
-  s.add_runtime_dependency 'sqlite3', '~> 1.3'
 end
+

data/carray.h

@@ -710,6 +710,7 @@ enum {
   CA_REG_METHOD_CALL,
   CA_REG_UNBOUND_REPEAT,
   CA_REG_MEMBER,
+  CA_REG_ATTRIBUTE,
 }; /* CA_REGION_TYPE */
 
 enum {
@@ -1070,7 +1071,10 @@ int     rb_ca_is_type (VALUE arg, int type);
 void    rb_ca_scan_index (int ca_rank, ca_size_t *ca_dim, ca_size_t elements,
                           long argc, VALUE *argv, CAIndexInfo *info);
 
+
 /* cast */
+int     rb_ca_test_castable (VALUE other);
+VALUE   rb_ca_binop_pass_to_other (VALUE self, VALUE other, ID method);
 void    rb_ca_cast_self (volatile VALUE *self);
 void    rb_ca_cast_self_or_other (volatile VALUE *self, volatile VALUE *other);
 void    rb_ca_cast_other (VALUE *self, volatile VALUE *other);

data/carray_access.c

@@ -510,9 +510,15 @@ rb_ca_scan_index (int ca_rank, ca_size_t *ca_dim, ca_size_t ca_elements,
       }
     }
 
-    if ( TYPE(arg) == T_STRING ) {  /* ca["field"] -> CA_REG_MEMBER */
-      info->type   = CA_REG_MEMBER;
-      info->symbol = ID2SYM(rb_intern(StringValuePtr(arg)));
+    if ( TYPE(arg) == T_STRING ) {  
+      if ( StringValuePtr(arg)[0] == '@' ) { /* ca["@name"] -> CA_REG_ATTRIBUTE */
+        info->type   = CA_REG_ATTRIBUTE;
+        info->symbol = rb_str_new2(StringValuePtr(arg)+1);
+      }
+      else {                                 /* ca["field"] -> CA_REG_MEMBER */
+        info->type   = CA_REG_MEMBER;
+        info->symbol = ID2SYM(rb_intern(StringValuePtr(arg)));
+      }
       return;
     }
 
@@ -612,8 +618,18 @@ rb_ca_scan_index (int ca_rank, ca_size_t *ca_dim, ca_size_t ca_elements,
         iv_end  = RANGE_END(arg);
         iv_excl = RANGE_EXCL(arg);
         index_type[i] = CA_IDX_BLOCK; /* convert to block */
-        first = NUM2SIZE(iv_beg);
-        last  = NUM2SIZE(iv_end);
+        if ( NIL_P(iv_beg) ) {
+          first = 0;                    
+        }
+        else {
+          first = NUM2SIZE(iv_beg);          
+        }
+        if ( NIL_P(iv_end) ) {
+          last  = -1;
+        }
+        else {
+          last  = NUM2SIZE(iv_end);          
+        }
         excl  = RTEST(iv_excl);
         CA_CHECK_INDEX_AT(first, ca_dim[i], i);
 
@@ -687,9 +703,23 @@ rb_ca_scan_index (int ca_rank, ca_size_t *ca_dim, ca_size_t ca_elements,
           }
           else if ( rb_obj_is_kind_of(arg0, rb_cRange) ) { /* ca[--,[i..j,k],--]*/
             ca_size_t start, last, excl, count, step, bound;
-            start = NUM2SIZE(RANGE_BEG(arg0));
-            last  = NUM2SIZE(RANGE_END(arg0));
-            excl  = RTEST(RANGE_EXCL(arg0));
+            volatile VALUE iv_beg, iv_end, iv_excl;
+            iv_beg  = RANGE_BEG(arg0);
+            iv_end  = RANGE_END(arg0);
+            iv_excl = RANGE_EXCL(arg0);
+            if ( NIL_P(iv_beg) ) {
+              start = 0;                    
+            }
+            else {
+              start = NUM2SIZE(iv_beg);          
+            }
+            if ( NIL_P(iv_end) ) {
+              last  = -1;
+            }
+            else {
+              last  = NUM2SIZE(iv_end);          
+            }
+            excl  = RTEST(iv_excl);
             step  = NUM2SIZE(arg1);
             if ( step == 0 ) {
               rb_raise(rb_eRuntimeError, 
@@ -1298,6 +1328,11 @@ rb_ca_fetch_method (int argc, VALUE *argv, VALUE self)
     }
     break;
   }
+  case CA_REG_ATTRIBUTE: {
+    obj = rb_funcall(self, rb_intern("attribute"), 0);
+    obj = rb_hash_aref(obj, info.symbol);
+    break;
+  }
   default:
     rb_raise(rb_eIndexError, "invalid index specified");
   }
@@ -1403,6 +1438,11 @@ rb_ca_store_method (int argc, VALUE *argv, VALUE self)
     }
     break;
   }
+  case CA_REG_ATTRIBUTE: {
+    obj = rb_funcall(self, rb_intern("attribute"), 0);
+    obj = rb_hash_aset(obj, info.symbol, rval);
+    break;
+  }
   }
   return obj;
 }
@@ -1547,6 +1587,7 @@ rb_ca_s_scan_index (VALUE self, VALUE rdim, VALUE ridx)
   case CA_REG_METHOD_CALL:
   case CA_REG_UNBOUND_REPEAT:
   case CA_REG_MEMBER:  
+  case CA_REG_ATTRIBUTE:  
     break;
   default:
     rb_raise(rb_eArgError, "unknown index specification");
@@ -1828,6 +1869,7 @@ Init_carray_access ()
   rb_define_const(rb_cObject, "CA_REG_UNBOUND_REPEAT",
                                                  INT2NUM(CA_REG_UNBOUND_REPEAT));
   rb_define_const(rb_cObject, "CA_REG_MEMBER",   INT2NUM(CA_REG_MEMBER));
+  rb_define_const(rb_cObject, "CA_REG_ATTRIBUTE",   INT2NUM(CA_REG_ATTRIBUTE));
 
 }
 

data/carray_conversion.c

@@ -508,10 +508,10 @@ Init_carray_conversion ()
   /* DO NOT define CArray#to_ary, it makes trouble with various situations */
   /* rb_define_method(rb_cCArray, "to_ary", rb_ca_to_a, 0); */ 
 
-  rb_define_method(rb_cCArray, "frmt", rb_ca_format, -1); 
+  rb_define_method(rb_cCArray, "str_format", rb_ca_format, -1); 
 
-  rb_define_method(rb_cCArray, "strptime", rb_ca_strptime, 1);
-  rb_define_method(rb_cCArray, "strftime", rb_ca_strftime, 1);
+  rb_define_method(rb_cCArray, "str_strptime", rb_ca_strptime, 1);
+  rb_define_method(rb_cCArray, "str_strftime", rb_ca_strftime, 1);
 
   rb_define_method(rb_cCArray, "test_ca_to_cptr", rb_test_ca_to_cptr, 0);
 

data/carray_generate.c

@@ -562,7 +562,7 @@ rb_ca_swap_bytes (VALUE self)
 
 /* ----------------------------------------------------------------- */
 
-#define proc_trim_bang(type, from)                                 \
+#define proc_trim_bang2(type, from)                                 \
   {                                                                \
     type *ptr = (type *) ca->ptr;                                  \
     boolean8_t *m = (ca->mask) ? (boolean8_t*) ca->mask->ptr : NULL; \
@@ -601,6 +601,72 @@ rb_ca_swap_bytes (VALUE self)
     }                                                              \
   }
 
+#define proc_trim_bang(type, from)                                 \
+  {                                                                \
+    type *ptr = (type *) ca->ptr;                                  \
+    boolean8_t *m = (ca->mask) ? (boolean8_t*) ca->mask->ptr : NULL; \
+    if ( ! NIL_P(rmin) ) {                                          \
+      type min  = (type) from(rmin);                                 \
+      ca_size_t i;                                                     \
+      if ( m && rfval == CA_UNDEF) {                                 \
+        for (i=ca->elements; i; i--, ptr++, m++) {                   \
+          if ( ! *m ) {                                              \
+            if ( *ptr < min )                                        \
+              *m = 1;                                                \
+          }                                                          \
+        }                                                            \
+      }                                                              \
+      else {                                                         \
+        int  has_fill = ! ( NIL_P(rfval) );                          \
+        type fill = (has_fill) ? (type) from(rfval) : (type) 0;      \
+        if ( m ) {                                                   \
+          for (i=ca->elements; i; i--, ptr++) {                      \
+            if ( ! *m++ ) {                                          \
+              if ( *ptr < min )                                 \
+                *ptr = (has_fill) ? fill : min;                      \
+            }                                                        \
+          }                                                          \
+        }                                                            \
+        else {                                                       \
+          for (i=ca->elements; i; i--, ptr++) {                      \
+            if ( *ptr < min )                                   \
+              *ptr = (has_fill) ? fill : min;                        \
+          }                                                          \
+        }                                                            \
+      }                                                              \
+    }                                                              \
+    if ( ! NIL_P(rmax) ) {                                          \
+      type max  = (type) from(rmax);                                 \
+      ca_size_t i;                                                     \
+      if ( m && rfval == CA_UNDEF) {                                 \
+        for (i=ca->elements; i; i--, ptr++, m++) {                   \
+          if ( ! *m ) {                                              \
+            if ( *ptr >= max )                         \
+              *m = 1;                                                \
+          }                                                          \
+        }                                                            \
+      }                                                              \
+      else {                                                         \
+        int  has_fill = ! ( NIL_P(rfval) );                          \
+        type fill = (has_fill) ? (type) from(rfval) : (type) 0;             \
+        if ( m ) {                                                   \
+          for (i=ca->elements; i; i--, ptr++) {                      \
+            if ( ! *m++ ) {                                          \
+              if ( *ptr >= max )                                     \
+                *ptr = (has_fill) ? fill : max;                      \
+            }                                                        \
+          }                                                          \
+        }                                                            \
+        else {                                                       \
+          for (i=ca->elements; i; i--, ptr++) {                      \
+            if ( *ptr >= max )                                       \
+              *ptr = (has_fill) ? fill : max;                        \
+          }                                                          \
+        }                                                            \
+      }                                                              \
+    }                                                              \    
+  }
+
 /* rdoc:
   class CArray
     # trims the data into the range between min and max. If `fill_value`

data/carray_math.rb

@@ -228,22 +228,22 @@ binop("pmin", "pmin",
       CMPLX_TYPES => nil,
       OBJ_TYPES =>'(#3) = rb_funcall(rb_assoc_new((#1),(#2)), rb_intern("min"), 0);')
 
-binop("add", "add",
+binop("+", "add",
       ALL_TYPES =>"(#3) = (#1) + (#2);",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = (#1) + (#2);" : nil,
       OBJ_TYPES =>'(#3) = rb_funcall((#1), id_plus, 1, (#2));')
 
-binop("sub", "sub",
+binop("-", "sub",
       ALL_TYPES => "(#3) = (#1) - (#2);",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = (#1) - (#2);" : nil,
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_minus, 1, (#2));')
 
-binop("mul", "mul",
+binop("*", "mul",
       ALL_TYPES => "(#3) = (#1) * (#2);",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = (#1) * (#2);" : nil,
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_star, 1, (#2));')
 
-binop("div", "div",
+binop("/", "div",
       INT_TYPES => "if ((#2)==0) {ca_zerodiv();}; (#3) = (#1) / (#2);",
       FLOAT_TYPES => "(#3) = (#1) / (#2);",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = (#1) / (#2);" : nil,
@@ -258,21 +258,21 @@ binop("rcp_mul", "rcp_mul",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = (#2) / (#1);" : nil,
       OBJ_TYPES => '(#3) = rb_funcall((#2), id_slash, 1, (#1));')
 
-binop("mod", "mod",
+binop("%", "mod",
       INT_TYPES => "if ((#2)==0) {ca_zerodiv();}; (#3) = (#1) % (#2);",
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_percent, 1, (#2));')
 
-binop("bit_and", "bit_and_i",
+binop("&", "bit_and_i",
       BOOL_TYPES => "(#3) = (#1) & (#2);",
       INT_TYPES => "(#3) = (#1) & (#2);",
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_and, 1, (#2));')
 
-binop("bit_or", "bit_or_i",
+binop("|", "bit_or_i",
       BOOL_TYPES => "(#3) = (#1) | (#2);",
       INT_TYPES => "(#3) = (#1) | (#2);",
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_or, 1, (#2));')
 
-binop("bit_xor", "bit_xor_i",
+binop("^", "bit_xor_i",
       BOOL_TYPES => "(#3) = ((#1) != (#2)) ? 1 : 0;",
       INT_TYPES => "(#3) = (#1) ^ (#2);",
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_xor, 1, (#2));')
@@ -329,11 +329,11 @@ METHODS << %{
   rb_define_method(rb_cCArray, "bit_xor", rb_ca_bit_xor, 1);
 }
 
-binop("bit_lshift", "bit_lshift",
+binop("<<", "bit_lshift",
       INT_TYPES => "(#3) = (#1) << (#2);",
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_lshift, 1, (#2));')
 
-binop("bit_rshift", "bit_rshift",
+binop(">>", "bit_rshift",
       INT_TYPES => "(#3) = (#1) >> (#2);",
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_rshift, 1, (#2));')
 
@@ -461,16 +461,16 @@ METHODS << %{
   rb_define_method(rb_cCArray, "xor", rb_ca_xor, 1);
 }
 
-alias_op("+", "add")
-alias_op("-", "sub")
-alias_op("*", "mul")
-alias_op("/", "div")
-alias_op("%", "mod")
-alias_op("&", "bit_and")
-alias_op("|", "bit_or")
-alias_op("^", "bit_xor")
-alias_op("<<", "bit_lshift")
-alias_op(">>", "bit_rshift")
+alias_op("add", "+")
+alias_op("sub", "-")
+alias_op("mul", "*")
+alias_op("div", "/")
+alias_op("mod", "%")
+alias_op("bit_and", "&")
+alias_op("bit_or", "|")
+alias_op("bit_xor", "^")
+alias_op("bit_lshift", "<<")
+alias_op("bit_rshift", ">>")
 
 #alias_op("==", "eq")
 #alias_op("!=", "ne")
@@ -752,7 +752,7 @@ rb_ca_ipower_bang (VALUE self, VALUE other)
 
 }
 
-binop("power", "power",
+binop("**", "power",
       INT_TYPES   => "(#3) = op_powi_<type>((#1), (#2));",
       FLOAT_TYPES => "(#3) = pow((#1), (#2));",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = cpow((#1), (#2));" : nil,
@@ -803,7 +803,7 @@ METHODS << %{
   rb_define_method(rb_cCArray, "pow!", rb_ca_pow_bang, 1);
 }
 
-alias_op("**", "pow")
+alias_op("pow", "**")
 
 METHODS << %{
   id_equal = rb_intern("==");

data/carray_operator.c

@@ -84,6 +84,29 @@ rb_ca_call_monop_bang (VALUE self, ca_monop_func_t func[])
   return self;
 }
 
+int
+rb_ca_test_castable (VALUE other)
+{
+  volatile VALUE retval;
+  if ( rb_respond_to(other, rb_intern("castable_to_carray?")) ) {
+    retval = rb_funcall(other, rb_intern("castable_to_carray?"), 0);
+    return RTEST(retval); 
+  }
+  else {
+    return 1;
+  }
+}
+
+VALUE 
+rb_ca_binop_pass_to_other (VALUE self, VALUE other, ID method)
+{
+  volatile VALUE pair;
+  pair = rb_funcall(other, rb_intern("coerce"), 1, self);
+  self  = rb_ary_entry(pair, 0);
+  other = rb_ary_entry(pair, 1);
+  return rb_funcall(self, method, 1, other);
+}
+
 VALUE
 rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
                                          ca_binop_func_t func[])