carray 1.5.1 → 1.5.2

data/ext/carray_mask.c

@@ -3,10 +3,8 @@
   carray_mask.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
 
 ---------------------------------------------------------------------------- */
 
@@ -565,12 +563,10 @@ ca_allocate_mask_iterator (int n, ...)
 
 /* ------------------------------------------------------------------- */
 
-/* rdoc:
-  class CArray 
-    # Returns true if self has the mask array.
-    def has_mask?() 
-    end 
-  end
+/* @overload has_mask?
+
+(Masking, Inquiry) 
+Returns true if self has the mask array.
 */
 
 VALUE
@@ -581,12 +577,10 @@ rb_ca_has_mask (VALUE self)
   return ( ca_has_mask(ca) ) ? Qtrue : Qfalse;
 }
 
-/* rdoc:
-  class CArray
-    # Returns true if self has at least one masked element.
-    def any_masked?
-    end
-  end
+/* @overload any_masked?
+
+(Masking, Inquiry) 
+Returns true if self has at least one masked element.
 */
 
 VALUE
@@ -597,12 +591,10 @@ rb_ca_is_any_masked (VALUE self)
   return ( ca_is_any_masked(ca) ) ? Qtrue : Qfalse;
 }
 
-/* rdoc:
-  class CArray
-    # Returns true if all elements of self are masked.
-    def all_masked?
-    end
-  end
+/* @overload all_masked?
+
+(Masking, Inquiry) 
+Returns true if all elements of self are masked.
 */
 
 VALUE
@@ -613,12 +605,10 @@ rb_ca_is_all_masked (VALUE self)
   return ( ca_is_all_masked(ca) ) ? Qtrue : Qfalse;
 }
 
-/* rdoc:
-  class CArray
-    private
-    def create_mask
-    end
-  end
+/* @overload create_mask
+
+(Masking) 
+Creates mask array internally (private method)
 */
 
 static VALUE
@@ -631,12 +621,10 @@ rb_ca_create_mask (VALUE self)
   return Qnil;
 }
 
-/* rdoc:
-  class CArray
-    private
-    def update_mask
-    end
-  end
+/* @overload update_mask
+
+(Masking) 
+Update mask array internally (private method)
 */
 
 /*
@@ -650,14 +638,12 @@ rb_ca_update_mask (VALUE self)
 }
 */
 
-/* rdoc:
-  class CArray
-    # Returns new array which refers the data of <code>self</code>.
-    # The data of masked elements of <code>self</code> can be accessed
-    # via the returned array. The value array can't be set mask.
-    def value ()
-    end
-  end
+/* @overload value
+
+(Masking, Inquiry) 
+Returns new array which refers the data of <code>self</code>.
+The data of masked elements of <code>self</code> can be accessed
+via the returned array. The value array can't be set mask.
 */
 
 VALUE
@@ -676,13 +662,11 @@ rb_ca_value_array (VALUE self)
   return obj;
 }
 
-/* rdoc:
-  class CArray
-    # Returns new array which refers the mask state of <code>self</code>.
-    # The mask array can't be set mask.
-    def mask ()
-    end
-  end
+/* @overload mask
+
+(Masking, Inquiry) 
+Returns new array which refers the mask state of <code>self</code>.
+The mask array can't be set mask.
 */
 
 VALUE
@@ -707,14 +691,12 @@ rb_ca_mask_array (VALUE self)
   }
 }
 
-/* rdoc:
-  class CArray
-    # Asigns <code>new_mask</code> to the mask array of <code>self</code>.
-    # If <code>self</code> doesn't have a mask array, it will be created
-    # before asignment.
-    def mask= (new_mask)
-    end
-  end
+/* @overload mask= (new_mask)
+
+(Mask, Modification) 
+Asigns <code>new_mask</code> to the mask array of <code>self</code>.
+If <code>self</code> doesn't have a mask array, it will be created
+before asignment.
 */    
 
 VALUE
@@ -756,14 +738,12 @@ rb_ca_set_mask (VALUE self, VALUE rval)
   }
 }
 
-/* rdoc:
-  class CArray
-    # Returns new boolean type array of same shape with <code>self</code>.
-    # The returned array has 1 for the masked elements and
-    # 0 for not-masked elements.
-    def is_masked ()
-    end
-  end
+/* @overload is_masked
+
+(Masking, Element-Wise Inquiry) 
+Returns new boolean type array of same shape 
+with <code>self</code>. The returned array has 1 for the masked elements and
+0 for not-masked elements.
 */
 
 VALUE
@@ -799,14 +779,12 @@ rb_ca_is_masked (VALUE self)
   return ca_wrap_struct(co);
 }
 
-/* rdoc:
-  class CArray
-    # Returns new boolean type array of same shape with <code>self</code>.
-    # The returned array has 0 for the masked elements and
-    # 1 for not-masked elements.
-    def is_not_masked ()
-    end
-  end
+/* @overload is_not_masked
+
+(Masking, Element-Wise Inquiry) 
+Returns new boolean type array of same shape with <code>self</code>.
+The returned array has 0 for the masked elements and
+1 for not-masked elements.
 */
 
 VALUE
@@ -842,12 +820,10 @@ rb_ca_is_not_masked (VALUE self)
   return ca_wrap_struct(co);
 }
 
-/* rdoc:
-  class CArray
-    # Returns the number of masked elements.
-    def count_masked ()
-    end
-  end
+/* @overload count_masked
+
+(Masking, Statistics)
+Returns the number of masked elements.
 */
 
 VALUE
@@ -858,12 +834,10 @@ rb_ca_count_masked (VALUE self)
   return SIZE2NUM(ca_count_masked(ca));
 }
 
-/* rdoc:
-  class CArray
-    # Returns the number of not-masked elements.
-    def count_not_masked ()
-    end
-  end
+/* @overload count_not_masked
+
+(Masking, Statistics)
+Returns the number of not-masked elements.
 */
 
 VALUE
@@ -874,15 +848,13 @@ rb_ca_count_not_masked (VALUE self)
   return SIZE2NUM(ca_count_not_masked(ca));
 }
 
-/* rdoc:
-  class CArray  
-    # Unmask all elements of the object.
-    # If the optional argument <code>fill_value</code> is given,
-    # the masked elements are filled by <code>fill_value</code>.
-    # The returned array doesn't have the mask array.
-    def unmask (fill_value=nil)
-    end
-  end
+/* @overload unmask (fill_value = nil)
+
+(Masking, Destructive)
+Unmask all elements of the object.
+If the optional argument <code>fill_value</code> is given,
+the masked elements are filled by <code>fill_value</code>.
+The returned array doesn't have the mask array.
 */
 
 static VALUE
@@ -928,15 +900,13 @@ rb_ca_mask_fill (VALUE self, VALUE fval)
   return rb_ca_unmask_method(1, &fval, self);
 }
 
-/* rdoc:
-  class CArray  
-    # Returns new unmasked array.
-    # If the optional argument <code>fill_value</code> is given,
-    # the masked elements are filled by <code>fill_value</code>.
-    # The returned array doesn't have the mask array.
-    def unmask_copy (fill_value=nil)
-    end
-  end
+/* @overload unmask_copy (fill_value = nil)
+
+(Masking, Conversion)
+Returns new unmasked array.
+If the optional argument <code>fill_value</code> is given,
+the masked elements are filled by <code>fill_value</code>.
+The returned array doesn't have the mask array.
 */
 
 static VALUE
@@ -981,7 +951,11 @@ rb_ca_mask_fill_copy (VALUE self, VALUE fval)
   return rb_ca_unmask_copy_method(1, &fval, self);
 }
 
-/* CArray#invert_mask */
+/* @overload invert_mask
+
+(Masking, Destructive)
+Inverts mask state.
+*/
 
 VALUE
 rb_ca_invert_mask (VALUE self)
@@ -992,13 +966,11 @@ rb_ca_invert_mask (VALUE self)
   return self;
 }
 
-/* rdoc:
-  class CArray
-    # Sets the mask array of <code>self</code> by the logical sum of
-    # the mask states of <code>self</code> and arrays given in arguments.
-    def inherit_mask (*argv)
-    end
-  end
+/* @overload inherit_mask (*others):
+
+(Masking, Destructive)
+Sets the mask array of <code>self</code> by the logical sum of
+the mask states of <code>self</code> and arrays given in arguments.
 */
 
 static VALUE
@@ -1073,13 +1045,11 @@ rb_ca_inherit_mask (VALUE self, int n, ...)
   return self;
 }
 
-/* rdoc: 
-  class CArray
-    # Sets the mask array of <code>self</code> by the logical sum of
-    # the mask states of arrays given in arguments.
-    def inherit_mask_replace (*argv)
-    end
-  end
+/* @overload inherit_mask_replace (*others)
+Sets the mask array of <code>self</code> by the logical sum of
+the mask states of arrays given in arguments.
+This method does not inherit the mask states of itself (different point 
+from `CArray#inherit_mask`)
 */
 
 static VALUE

data/ext/carray_math.rb

@@ -18,12 +18,10 @@ HEADERS << <
   carray_math.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.
 
-  This file is automatically generated from carray_math.rb.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  This file is automatically generated from carray_math.rb.
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -249,7 +247,7 @@ binop("/", "div",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = (#1) / (#2);" : nil,
       OBJ_TYPES => '(#3) = rb_funcall((#1), id_slash, 1, (#2));')
 
-binop("quo_i", nil,
+binop("quo_i", "quo_i",
       OBJ_TYPES => '(#3) = rb_funcall((#1), rb_intern("quo"), 1, (#2));')
 
 binop("rcp_mul", "rcp_mul",
@@ -697,7 +695,7 @@ rb_ca_ipower (VALUE self, VALUE other)
   /* unresolved unbound repeat array generates unbound repeat array again */
   if ( ca->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
     CAUnboundRepeat *cx = (CAUnboundRepeat *) ca;
-    obj = rb_ca_ubrep_new(obj, cx->rep_ndim, cx->rep_dim);
+    obj = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, obj), cx->rep_ndim, cx->rep_dim);
   }
 
   return obj;
@@ -752,7 +750,7 @@ rb_ca_ipower_bang (VALUE self, VALUE other)
 
 }
 
-binop("**", "power",
+binop("power", "power",
       INT_TYPES   => "(#3) = op_powi_<type>((#1), (#2));",
       FLOAT_TYPES => "(#3) = pow((#1), (#2));",
       CMPLX_TYPES => HAVE_COMPLEX ? "(#3) = cpow((#1), (#2));" : nil,
@@ -775,8 +773,8 @@ static VALUE rb_ca_pow (VALUE self, VALUE other)
 
     /* unresolved unbound repeat array generates unbound repeat array again */
     if ( ca->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
-      CAUnboundRepeat *cx = (CAUnboundRepeat *) ca;
-      obj = rb_ca_ubrep_new(obj, cx->rep_ndim, cx->rep_dim);
+      CAUnboundRepeat *cx = (CAUnboundRepeat *) ca;      
+      obj = rb_ca_ubrep_new(rb_ca_ubrep_shave(self, obj), cx->rep_ndim, cx->rep_dim);
     }
 
     return obj;
@@ -803,7 +801,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/ext/carray_mathfunc.c

@@ -3,10 +3,8 @@
   carray/mathfunc/carray_mathfunc.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
 
 ---------------------------------------------------------------------------- */
 

data/ext/carray_numeric.c

@@ -3,10 +3,8 @@
   carray_numeric.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
 
 ---------------------------------------------------------------------------- */
 
@@ -220,6 +218,15 @@ Init_carray_numeric ()
   rb_define_alias(rb_cFalseClass, "__and__", "&");
   rb_define_alias(rb_cFalseClass, "__xor__", "^");
 
+#if RUBY_VERSION_CODE >= 240
+
+  rb_define_alias(rb_cInteger, "__or__", "|");
+  rb_define_alias(rb_cInteger, "__and__", "&");
+  rb_define_alias(rb_cInteger, "__xor__", "^");
+  rb_define_alias(rb_cInteger, "__lshift__", "<<");
+  rb_define_alias(rb_cInteger, "__rshift__", ">>");
+
+#else
   rb_define_alias(rb_cFixnum, "__or__", "|");
   rb_define_alias(rb_cFixnum, "__and__", "&");
   rb_define_alias(rb_cFixnum, "__xor__", "^");
@@ -231,6 +238,7 @@ Init_carray_numeric ()
   rb_define_alias(rb_cBignum, "__xor__", "^");
   rb_define_alias(rb_cBignum, "__lshift__", "<<");
   rb_define_alias(rb_cBignum, "__rshift__", ">>");
+#endif
 
   rb_define_method(rb_cTrueClass, "|", rb_hack_or, 1);
   rb_define_method(rb_cTrueClass, "&", rb_hack_and, 1);
@@ -242,6 +250,13 @@ Init_carray_numeric ()
   rb_define_method(rb_cFalseClass, "^", rb_hack_xor, 1);
   rb_define_method(rb_cFalseClass, "*", rb_hack_star, 1);
 
+#if RUBY_VERSION_CODE >= 240
+  rb_define_method(rb_cInteger, "|", rb_hack_or, 1);
+  rb_define_method(rb_cInteger, "&", rb_hack_and, 1);
+  rb_define_method(rb_cInteger, "^", rb_hack_xor, 1);
+  rb_define_method(rb_cInteger, "<<", rb_hack_lshift, 1);
+  rb_define_method(rb_cInteger, ">>", rb_hack_rshift, 1);
+#else
   rb_define_method(rb_cFixnum, "|", rb_hack_or, 1);
   rb_define_method(rb_cFixnum, "&", rb_hack_and, 1);
   rb_define_method(rb_cFixnum, "^", rb_hack_xor, 1);
@@ -253,6 +268,7 @@ Init_carray_numeric ()
   rb_define_method(rb_cBignum, "^", rb_hack_xor, 1);
   rb_define_method(rb_cBignum, "<<", rb_hack_lshift, 1);
   rb_define_method(rb_cBignum, ">>", rb_hack_rshift, 1);
+#endif
 
 #ifdef HAVE_COMPLEX_H
   rb_define_method(rb_cCArray, "arg", rb_ca_arg, 0);