carray 1.5.1 → 1.5.2

data/ext/carray_operator.c

@@ -3,10 +3,8 @@
   carray_operator.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -28,7 +26,6 @@ ca_zerodiv ()
   rb_raise(rb_eZeroDivError, "divided by 0");
 }
 
-
 VALUE
 rb_ca_call_monop (VALUE self, ca_monop_func_t func[])
 {
@@ -50,7 +47,7 @@ rb_ca_call_monop (VALUE self, ca_monop_func_t func[])
   ca_attach(ca1);
   ca_copy_mask_overlay(ca2, ca2->elements, 1, ca1);
   func[ca1->data_type](ca1->elements,
-                       ( ca2->mask ) ? ca2->mask->ptr : NULL,
+                       ( ca2->mask ) ? (boolean8_t *)ca2->mask->ptr : NULL,
                        ca1->ptr, 1,
                        ca2->ptr, 1);
   ca_detach(ca1);
@@ -58,7 +55,7 @@ rb_ca_call_monop (VALUE self, ca_monop_func_t func[])
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca1->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca1;
-    out = rb_ca_ubrep_new(out, cx->rep_ndim, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, out), cx->rep_ndim, cx->rep_dim);
   }
 
   return out;
@@ -75,7 +72,7 @@ rb_ca_call_monop_bang (VALUE self, ca_monop_func_t func[])
 
   ca_attach(ca1);
   func[ca1->data_type](ca1->elements,
-                       ( ca1->mask ) ? ca1->mask->ptr : NULL,
+                       ( ca1->mask ) ? (boolean8_t *)ca1->mask->ptr : NULL,
                        ca1->ptr, 1,
                        ca1->ptr, 1);
   ca_sync(ca1);
@@ -134,7 +131,8 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
       out = ca_wrap_struct(ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, 0,
                            ca2->ptr, 0,
                            ca3->ptr, 0);
@@ -149,7 +147,8 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
       out = ca_wrap_struct(ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca2->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca2->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, 0,
                            ca2->ptr, 1,
                            ca3->ptr, 1);
@@ -166,7 +165,8 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
       out = ca_wrap_struct(ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, 1,
                            ca2->ptr, 0,
                            ca3->ptr, 1);
@@ -185,7 +185,8 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
       out = ca_wrap_struct(ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, 1,
                            ca2->ptr, 1,
                            ca3->ptr, 1);
@@ -197,13 +198,13 @@ rb_ca_call_binop (volatile VALUE self, volatile VALUE other,
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca1->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca1;
-    out = rb_ca_ubrep_new(out, cx->rep_ndim, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, out), cx->rep_ndim, cx->rep_dim);
   }
 
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca2->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca2;
-    out = rb_ca_ubrep_new(out, cx->rep_ndim, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(other, out), cx->rep_ndim, cx->rep_dim);
   }
 
   return out;
@@ -228,7 +229,8 @@ rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[])
   if ( rb_obj_is_cscalar(self) ) {
     if ( rb_obj_is_cscalar(other) ) { /* scalar vs scalar */
       ca_copy_mask_overlay(ca1, ca1->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca1->mask ) ? ca1->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca1->mask ) ? (boolean8_t *) ca1->mask->ptr : NULL,
                            ca1->ptr, 0,
                            ca2->ptr, 0,
                            ca1->ptr, 0);
@@ -240,7 +242,8 @@ rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[])
       }
 
       ca_copy_mask_overlay(ca1, ca1->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca1->mask ) ? ca1->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca1->mask ) ? (boolean8_t *) ca1->mask->ptr : NULL,
                            ca1->ptr, 0,
                            ca2->ptr, 0,
                            ca1->ptr, 0);
@@ -249,7 +252,8 @@ rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[])
   else {
     if ( rb_obj_is_cscalar(other) ) { /* array vs scalar */
       ca_copy_mask_overlay(ca1, ca1->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca1->mask ) ? ca1->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca1->mask ) ? (boolean8_t *) ca1->mask->ptr : NULL,
                            ca1->ptr, 1,
                            ca2->ptr, 0,
                            ca1->ptr, 1);
@@ -261,7 +265,8 @@ rb_ca_call_binop_bang (VALUE self, VALUE other, ca_binop_func_t func[])
       }
 
       ca_copy_mask_overlay(ca1, ca1->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca1->mask ) ? ca1->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca1->mask ) ? (boolean8_t *) ca1->mask->ptr : NULL,
                            ca1->ptr, 1,
                            ca2->ptr, 1,
                            ca1->ptr, 1);
@@ -294,15 +299,16 @@ rb_ca_call_moncmp (VALUE self, ca_moncmp_func_t func[])
 
   ca_attach(ca1);
   ca_copy_mask_overlay(ca2, ca2->elements, 1, ca1);
-  func[ca1->data_type](ca1->elements, ( ca2->mask ) ? ca2->mask->ptr : NULL,
+  func[ca1->data_type](ca1->elements, 
+                       ( ca2->mask ) ? (boolean8_t *) ca2->mask->ptr : NULL,
                        ca1->ptr, 1,
-                       ca2->ptr, 1);
+                       (boolean8_t *) ca2->ptr, 1);
   ca_detach(ca1);
 
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca1->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca1;
-    out = rb_ca_ubrep_new(out, cx->rep_ndim, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, out), cx->rep_ndim, cx->rep_dim);
   }
 
   return out;
@@ -321,10 +327,10 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
 
   /* check for comparison with CA_UNDEF */
   if ( other == CA_UNDEF ) {
-    if ( func == ca_bincmp_eq ) {      /* a.eq(UNDEF) -> a.is_masked */
+    if ( (ca_bincmp_func_t) func == (ca_bincmp_func_t) ca_bincmp_eq ) {  /* a.eq(UNDEF) -> a.is_masked */
       return rb_ca_is_masked(self);
     }
-    else if ( func == ca_bincmp_ne ) { /* a.ne(UNDEF) -> a.is_not_masked */
+    else if ( (ca_bincmp_func_t) func == (ca_bincmp_func_t) ca_bincmp_ne ) { /* a.ne(UNDEF) -> a.is_not_masked */
       return rb_ca_is_not_masked(self);
     }
     else {
@@ -347,7 +353,8 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
       Data_Get_Struct(out, CArray, ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, ca1->bytes, 0,
                            ca2->ptr, ca2->bytes, 0,
                            ca3->ptr, ca3->bytes, 0);
@@ -357,7 +364,8 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
       Data_Get_Struct(out, CArray, ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca2->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca2->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, ca1->bytes, 0,
                            ca2->ptr, ca2->bytes, 1,
                            ca3->ptr, ca3->bytes, 1);
@@ -369,7 +377,8 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
       Data_Get_Struct(out, CArray, ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, ca1->bytes, 1,
                            ca2->ptr, ca2->bytes, 0,
                            ca3->ptr, ca3->bytes, 1);
@@ -383,7 +392,8 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
       Data_Get_Struct(out, CArray, ca3);
 
       ca_copy_mask_overlay(ca3, ca3->elements, 2, ca1, ca2);
-      func[ca1->data_type](ca1->elements, ( ca3->mask ) ? ca3->mask->ptr : NULL,
+      func[ca1->data_type](ca1->elements, 
+                           ( ca3->mask ) ? (boolean8_t *) ca3->mask->ptr : NULL,
                            ca1->ptr, ca1->bytes, 1,
                            ca2->ptr, ca2->bytes, 1,
                            ca3->ptr, ca3->bytes, 1);
@@ -395,7 +405,7 @@ rb_ca_call_bincmp (volatile VALUE self, volatile VALUE other,
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca1->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca1;
-    out = rb_ca_ubrep_new(out, cx->rep_ndim, cx->rep_dim);
+    out = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, out), cx->rep_ndim, cx->rep_dim);
   }
 
   return out;
@@ -458,11 +468,9 @@ ca_math_call (VALUE mod, VALUE arg, ID id)
   }
 }
 
-/* rdoc:
-  class CArray
-    def coerce (other)
-    end
-  end
+/* @overload coerece (other)
+
+[TBD]
 */
 
 static VALUE
@@ -524,6 +532,11 @@ rb_ca_coerce (VALUE self, VALUE other)
     } \
   }
 
+/* @overload mul_add (weight, min_count=nil, fill_value=nil)
+
+[TBD]
+*/
+
 static VALUE
 rb_ca_mul_add (int argc, VALUE *argv, volatile VALUE self)
 {

data/ext/carray_order.c

@@ -3,10 +3,8 @@
   carray_order.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -140,26 +138,24 @@ ca_project (CArray *ca, CArray *ci, char *lfill, char *ufill)
   return co;
 }
 
-/* rdoc:
-  class CArray
-    def project (idx,lval=nil,uval=nil)
-    end
-  end
+/* @overload project (idx, lval=nil, uval=nil)
+
+[TBD]. Creates new array the element of the object as address.
 */
 
 VALUE
 rb_ca_project (int argc, VALUE *argv, VALUE self)
 {
-  volatile VALUE obj, rindex, vlfval, vufval;
+  volatile VALUE obj, ridx, vlfval, vufval;
   CArray *ca, *ci, *co;
   char *lfval, *ufval;
 
-  rb_scan_args(argc, argv, "12", (VALUE *) &rindex, (VALUE *) &vlfval, (VALUE *) &vufval);
+  rb_scan_args(argc, argv, "12", (VALUE *)&ridx, (VALUE *) &vlfval, (VALUE *) &vufval);
 
   Data_Get_Struct(self, CArray, ca);
 
-  rb_check_carray_object(rindex);
-  ci = ca_wrap_readonly(rindex, CA_SIZE);
+  rb_check_carray_object(ridx);
+  ci = ca_wrap_readonly(ridx, CA_SIZE);
 
   lfval = malloc_with_check(ca->bytes);
   ufval = malloc_with_check(ca->bytes);
@@ -227,12 +223,9 @@ rb_ca_project (int argc, VALUE *argv, VALUE self)
     free(v);                                            \
   }
 
-/* rdoc:
-  class CArray
-    # Reverses the elements of +ca+ in place.
-    def reverse!
-    end
-  end
+/* @overload reverse!
+
+Reverses the elements of +ca+ in place.
 */
 
 static VALUE
@@ -279,13 +272,10 @@ rb_ca_reverse_bang (VALUE self)
   return self;
 }
 
-/* rdoc:
-  class CArray
-    # Returns a new CArray object containing <i>ca</i>'s elements in
-    # reverse order.
-    def reverse
-    end
-  end
+/* @overload reverse
+
+Returns a new CArray object containing <i>ca</i>'s elements in
+reverse order.
 */
 
 static VALUE
@@ -384,12 +374,9 @@ ca_qsort_cmp[CA_NTYPE] = {
   qcmp_VALUE,
 };
 
-/* rdoc:
-  class CArray
-    # Sorts <i>ca</i>'s elements in place.
-    def sort!
-    end
-  end
+/* @overload sort!
+
+Sorts <i>ca</i>'s elements in place.
 */
 
 static VALUE
@@ -433,12 +420,9 @@ rb_ca_sort_bang (VALUE self)
   return self;
 }
 
-/* rdoc:
-  class CArray
-    # Returns a new CArray object containing <i>ca</i>'s elements sorted.
-    def sort
-    end
-  end
+/* @overload sort
+
+Returns a new CArray object containing <i>ca</i>'s elements sorted.
 */
 
 static VALUE
@@ -452,11 +436,9 @@ rb_ca_sorted_copy (VALUE self)
 
 /* --------------------------------------------------------------- */
 
-/* rdoc:
-  class CArray
-    def bsearch
-    end
-  end
+/* @overload bsearch
+
+Returns a new CArray object containing <i>ca</i>'s elements sorted.
 */
 
 static VALUE
@@ -561,11 +543,9 @@ rb_ca_binary_search (VALUE self, volatile VALUE rval)
   return out;
 }
 
-/* rdoc:
-  class CArray
-    def bsearch_index
-    end
-  end
+/* @overload bsearch_index
+
+[TBD]. 
 */
 
 static VALUE
@@ -630,6 +610,33 @@ rb_ca_binary_search_index (VALUE self, volatile VALUE rval)
     }                                                        \
   }
 
+#define proc_find_value_float128(type, defeps)                  \
+  {                                                          \
+    type *ptr = (type *) ca->ptr;                            \
+    boolean8_t *m = (ca->mask) ? (boolean8_t*) ca->mask->ptr : NULL; \
+    type val  = (type) NUM2DBL(value);                       \
+    float128_t eps  = (NIL_P(veps)) ? defeps*fabsl(val) : NUM2DBL(veps); \
+    ca_size_t i;                                               \
+    if ( m ) {                                               \
+      for (i=0; i<ca->elements; i++, ptr++) {                \
+        if ( ! *m++ ) {                                      \
+          if ( fabsl(*ptr - val) <= eps ) {                   \
+            addr = i;                                        \
+            break;                                           \
+          }                                                  \
+        }                                                    \
+      }                                                      \
+    }                                                        \
+    else {                                                   \
+      for (i=0; i<ca->elements; i++, ptr++) {                \
+        if ( fabsl(*ptr - val) <= eps ) {                     \
+          addr = i;                                          \
+          break;                                             \
+        }                                                    \
+      }                                                      \
+    }                                                        \
+  }
+
 #define proc_find_value_cmplx(type, defeps)                  \
   {                                                          \
     type *ptr = (type *) ca->ptr;                            \
@@ -683,11 +690,9 @@ rb_ca_binary_search_index (VALUE self, volatile VALUE rval)
   }
 
 
-/* rdoc:
-  class CArray
-    def search
-    end
-  end
+/* @overload search
+
+[TBD]. 
 */
 
 static VALUE
@@ -717,7 +722,7 @@ rb_ca_linear_search (int argc, VALUE *argv, VALUE self)
   case CA_UINT64:   proc_find_value(uint64_t); break;
   case CA_FLOAT32:  proc_find_value_float(float32_t, FLT_EPSILON); break;
   case CA_FLOAT64:  proc_find_value_float(float64_t, DBL_EPSILON); break;
-  case CA_FLOAT128: proc_find_value_float(float128_t, DBL_EPSILON); break;
+  case CA_FLOAT128: proc_find_value_float128(float128_t, DBL_EPSILON); break;
 #ifdef HAVE_COMPLEX_H
   case CA_CMPLX64:  proc_find_value_cmplx(cmplx64_t, FLT_EPSILON); break;
   case CA_CMPLX128: proc_find_value_cmplx(cmplx128_t, DBL_EPSILON); break;
@@ -733,11 +738,9 @@ rb_ca_linear_search (int argc, VALUE *argv, VALUE self)
   return ( addr == -1 ) ? Qnil : SIZE2NUM(addr);
 }
 
-/* rdoc:
-  class CArray
-    def search_index
-    end
-  end
+/* @overload search_index
+
+[TBD]. 
 */
 
 static VALUE
@@ -811,11 +814,9 @@ rb_ca_linear_search_index (int argc, VALUE *argv, VALUE self)
     }                                                   \
   }
 
-/* rdoc:
-  class CArray
-    def search_nearest
-    end
-  end
+/* @overload search_nearest
+
+[TBD]. 
 */
 
 static VALUE
@@ -856,6 +857,11 @@ rb_ca_linear_search_nearest (VALUE self, VALUE value)
   return ( addr == -1 ) ? Qnil : SIZE2NUM(addr);
 }
 
+/* @overload search_nearest_index
+
+[TBD]. 
+*/
+
 static VALUE
 rb_ca_linear_search_nearest_index (VALUE self, VALUE value)
 {
@@ -876,6 +882,9 @@ Init_carray_order ()
   rb_define_method(rb_cCArray,  "sort!", rb_ca_sort_bang, 0);
   rb_define_method(rb_cCArray,  "sort", rb_ca_sorted_copy, 0);
 
+  rb_define_method(rb_cCArray,  "bsearch", rb_ca_binary_search, 1);
+  rb_define_method(rb_cCArray,  "bsearch_index", rb_ca_binary_search_index, 1);
+
   rb_define_method(rb_cCArray,  "search", rb_ca_linear_search, -1);
   rb_define_method(rb_cCArray,  "search_index", rb_ca_linear_search_index, -1);
 
@@ -884,6 +893,4 @@ Init_carray_order ()
   rb_define_method(rb_cCArray,  "search_nearest_index",
                                 rb_ca_linear_search_nearest_index, 1);
 
-  rb_define_method(rb_cCArray,  "bsearch", rb_ca_binary_search, 1);
-  rb_define_method(rb_cCArray,  "bsearch_index", rb_ca_binary_search_index, 1);
 }