cumo 0.2.4 → 0.2.5

data/ext/cumo/narray/step.c

@@ -24,164 +24,10 @@
 #define DBL_EPSILON 2.2204460492503131e-16
 #endif
 
-static ID cumo_id_beg, cumo_id_end, cumo_id_len, cumo_id_step, cumo_id_excl;
+static ID cumo_id_beg, cumo_id_end, cumo_id_len, cumo_id_step;
 
-//#define EXCL(r) RTEST(rb_ivar_get((r), cumo_id_excl))
-#define EXCL(r) RTEST(rb_funcall((r), rb_intern("exclude_end?"), 0))
-
-#define SET_EXCL(r,v) rb_ivar_set((r), cumo_id_excl, (v) ? Qtrue : Qfalse)
-
-static void
-step_init(
-  VALUE self,
-  VALUE beg,
-  VALUE end,
-  VALUE step,
-  VALUE len,
-  VALUE excl
-)
-{
-    if (RTEST(len)) {
-        if (!(FIXNUM_P(len) || TYPE(len)==T_BIGNUM)) {
-            rb_raise(rb_eArgError, "length must be Integer");
-        }
-        if (RTEST(rb_funcall(len,rb_intern("<"),1,INT2FIX(0)))) {
-            rb_raise(rb_eRangeError,"length must be non negative");
-        }
-    }
-    rb_ivar_set(self, cumo_id_beg, beg);
-    rb_ivar_set(self, cumo_id_end, end);
-    rb_ivar_set(self, cumo_id_len, len);
-    rb_ivar_set(self, cumo_id_step, step);
-    SET_EXCL(self, excl);
-}
-
-static VALUE
-cumo_na_step_new2(
-  VALUE range,
-  VALUE step,
-  VALUE len
-)
-{
-    VALUE beg, end, excl;
-    VALUE self = rb_obj_alloc(cumo_na_cStep);
-
-    //beg = rb_ivar_get(range, cumo_id_beg);
-    beg = rb_funcall(range, cumo_id_beg, 0);
-    //end = rb_ivar_get(range, cumo_id_end);
-    end = rb_funcall(range, cumo_id_end, 0);
-    excl = rb_funcall(range, rb_intern("exclude_end?"), 0);
-
-    step_init(self, beg, end, step, len, excl);
-    return self;
-}
-
-
-/*
- *  call-seq:
- *     Step.new(start, end, step=nil, length=nil)    => step
- *     Step.new(range, step=nil, length=nil)         => step
- *
- *  Constructs a step using three parameters among <i>start</i>,
- *  <i>end</i>, <i>step</i> and <i>length</i>.  <i>start</i>,
- *  <i>end</i> parameters can be replaced with <i>range</i>.  If the
- *  <i>step</i> is omitted (or supplied with nil), then calculated
- *  from <i>length</i> or definded as 1.
- */
-
-static VALUE
-step_initialize( int argc, VALUE *argv, VALUE self )
-{
-    VALUE a, b=Qnil, c=Qnil, d=Qnil, e=Qnil;
-
-    rb_scan_args(argc, argv, "13", &a, &b, &c, &d);
-    /* Selfs are immutable, so that they should be initialized only once. */
-    if (rb_ivar_defined(self, cumo_id_beg)) {
-        rb_name_error(rb_intern("initialize"), "`initialize' called twice");
-    }
-    if (rb_obj_is_kind_of(a,rb_cRange)) {
-        if (argc>3) {
-            rb_raise(rb_eArgError, "extra argument");
-        }
-        d = c;
-        c = b;
-        e = rb_funcall(a, rb_intern("exclude_end?"), 0);
-        //b = rb_ivar_get(a, cumo_id_end);
-        b = rb_funcall(a, cumo_id_end, 0);
-        //a = rb_ivar_get(a, cumo_id_beg);
-        a = rb_funcall(a, cumo_id_beg, 0);
-    }
-    step_init(self, a, b, c, d, e);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     step.begin  => obj
- *     step.first  => obj
- *
- *  Returns the start of <i>step</i>.
- */
-
-static VALUE
-step_first( VALUE self )
-{
-    return rb_ivar_get(self, cumo_id_beg);
-}
-
-/*
- *  call-seq:
- *     step.end    => obj
- *     step.last   => obj
- *
- *  Returns the object that defines the end of <i>step</i>.
- */
-
-static VALUE
-step_last( VALUE self )
-{
-    return rb_ivar_get(self, cumo_id_end);
-}
-
-/*
- *  call-seq:
- *     step.length  => obj
- *     step.size    => obj
- *
- *  Returns the length of <i>step</i>.
- */
-
-static VALUE
-step_length( VALUE self )
-{
-    return rb_ivar_get(self, cumo_id_len);
-}
-
-/*
- *  call-seq:
- *     step.step    => obj
- *
- *  Returns the step of <i>step</i>.
- */
-
-static VALUE
-step_step( VALUE self )
-{
-    return rb_ivar_get(self, cumo_id_step);
-}
-
-/*
- *  call-seq:
- *     step.exclude_end?    => true or false
- *
- *  Returns <code>true</code> if <i>step</i> excludes its end value.
- */
-static VALUE
-step_exclude_end_p(VALUE self)
-{
-    return RTEST(rb_ivar_get(self, cumo_id_excl)) ? Qtrue : Qfalse;
-}
 
+#define EXCL(r) RTEST(rb_funcall((r), rb_intern("exclude_end?"), 0))
 
 /*
  *  call-seq:
@@ -192,7 +38,7 @@ step_exclude_end_p(VALUE self)
  */
 
 void
-cumo_na_step_array_index(VALUE self, size_t ary_size,
+cumo_na_step_array_index(VALUE obj, size_t ary_size,
                       size_t *plen, ssize_t *pbeg, ssize_t *pstep)
 {
     size_t len;
@@ -200,14 +46,28 @@ cumo_na_step_array_index(VALUE self, size_t ary_size,
     VALUE vbeg, vend, vstep, vlen;
     ssize_t end=ary_size;
 
-    //vbeg = rb_ivar_get(self, cumo_id_beg);
-    //vend = rb_ivar_get(self, cumo_id_end);
-    vlen = rb_ivar_get(self, cumo_id_len);
-    vstep = rb_ivar_get(self, cumo_id_step);
-    vbeg = rb_funcall(self, cumo_id_beg, 0);
-    vend = rb_funcall(self, cumo_id_end, 0);
-    //vlen = rb_funcall(self, cumo_id_len, 0);
-    //vstep = rb_funcall(self, cumo_id_step, 0);
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+    rb_arithmetic_sequence_components_t x;
+    rb_arithmetic_sequence_extract(obj, &x);
+
+    vstep = x.step;
+    vbeg = x.begin;
+    vend = x.end;
+#else
+    cumo_enumerator_t *e;
+
+    if (rb_obj_is_kind_of(obj, rb_cRange)) {
+        vstep = rb_ivar_get(obj, cumo_id_step);
+    } else { // Enumerator
+        cumo_na_parse_enumerator_step(obj, &vstep);
+        e = (cumo_enumerator_t *)DATA_PTR(obj);
+        obj =  e->obj; // Range
+    }
+
+    vbeg = rb_funcall(obj, cumo_id_beg, 0);
+    vend = rb_funcall(obj, cumo_id_end, 0);
+#endif
+    vlen = rb_ivar_get(obj, cumo_id_len);
 
     if (RTEST(vbeg)) {
         beg = NUM2SSIZET(vbeg);
@@ -237,7 +97,7 @@ cumo_na_step_array_index(VALUE self, size_t ary_size,
                     }
                 } else {
                     if (RTEST(vend)) {
-                        if (EXCL(self)) {
+                        if (EXCL(obj)) {
                             if (step>0) end--;
                             if (step<0) end++;
                         }
@@ -251,7 +111,7 @@ cumo_na_step_array_index(VALUE self, size_t ary_size,
                 step = 1;
                 if (RTEST(vbeg)) {
                     if (RTEST(vend)) {
-                        if (EXCL(self)) {
+                        if (EXCL(obj)) {
                             if (beg<end) end--;
                             if (beg>end) end++;
                         }
@@ -262,7 +122,7 @@ cumo_na_step_array_index(VALUE self, size_t ary_size,
                     }
                 } else {
                     if (RTEST(vend)) {
-                        if (EXCL(self)) {
+                        if (EXCL(obj)) {
                             end--;
                         }
                         beg = end - (len-1);
@@ -286,7 +146,7 @@ cumo_na_step_array_index(VALUE self, size_t ary_size,
             if (!RTEST(vend)) {
                 end = ary_size-1;
             }
-            else if (EXCL(self)) {
+            else if (EXCL(obj)) {
                 end--;
             }
             if (beg<=end) {
@@ -301,7 +161,7 @@ cumo_na_step_array_index(VALUE self, size_t ary_size,
             if (!RTEST(vend)) {
                 end = 0;
             }
-            else if (EXCL(self)) {
+            else if (EXCL(obj)) {
                 end++;
             }
             if (beg>=end) {
@@ -327,25 +187,35 @@ cumo_na_step_array_index(VALUE self, size_t ary_size,
     if (pstep) *pstep = step;
 }
 
-
 void
-cumo_na_step_sequence( VALUE self, size_t *plen, double *pbeg, double *pstep )
+cumo_na_step_sequence( VALUE obj, size_t *plen, double *pbeg, double *pstep )
 {
-    VALUE vbeg, vend, vstep, vlen;
+    VALUE vend, vstep, vlen;
     double dbeg, dend, dstep=1, dsize, err;
     size_t size, n;
 
-    //vbeg = rb_ivar_get(self, cumo_id_beg);
-    vbeg = rb_funcall(self, cumo_id_beg, 0);
-    dbeg = NUM2DBL(vbeg);
-
-    //vend = rb_ivar_get(self, cumo_id_end);
-    vend = rb_funcall(self, cumo_id_end, 0);
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+    rb_arithmetic_sequence_components_t x;
+    rb_arithmetic_sequence_extract(obj, &x);
+
+    vstep = x.step;
+    dbeg = NUM2DBL(x.begin);
+    vend = x.end;
+#else
+    cumo_enumerator_t *e;
+
+    if (rb_obj_is_kind_of(obj, rb_cRange)) {
+        vstep = rb_ivar_get(obj, cumo_id_step);
+    } else { // Enumerator
+        cumo_na_parse_enumerator_step(obj, &vstep);
+        e = (cumo_enumerator_t *)DATA_PTR(obj);
+        obj =  e->obj; // Range
+    }
 
-    vlen = rb_ivar_get(self, cumo_id_len);
-    vstep = rb_ivar_get(self, cumo_id_step);
-    //vlen  = rb_funcall(self, cumo_id_len ,0);
-    //vstep = rb_funcall(self, cumo_id_step,0);
+    dbeg = NUM2DBL(rb_funcall(obj, cumo_id_beg, 0));
+    vend = rb_funcall(obj, cumo_id_end, 0);
+#endif
+    vlen = rb_ivar_get(obj, cumo_id_len);
 
     if (RTEST(vlen)) {
         size = NUM2SIZET(vlen);
@@ -353,7 +223,7 @@ cumo_na_step_sequence( VALUE self, size_t *plen, double *pbeg, double *pstep )
         if (!RTEST(vstep)) {
             if (RTEST(vend)) {
                 dend = NUM2DBL(vend);
-                if (EXCL(self)) {
+                if (EXCL(obj)) {
                     n = size;
                 } else {
                     n = size-1;
@@ -378,7 +248,7 @@ cumo_na_step_sequence( VALUE self, size_t *plen, double *pbeg, double *pstep )
             err = (fabs(dbeg)+fabs(dend)+fabs(dend-dbeg))/fabs(dstep)*DBL_EPSILON;
             if (err>0.5) err=0.5;
             dsize = (dend-dbeg)/dstep;
-            if (EXCL(self))
+            if (EXCL(obj))
                 dsize -= err;
             else
                 dsize += err;
@@ -398,77 +268,13 @@ cumo_na_step_sequence( VALUE self, size_t *plen, double *pbeg, double *pstep )
     if (pstep) *pstep = dstep;
 }
 
-/*
-static VALUE
-step_each( VALUE self )
-{
-    VALUE  a;
-    double beg, step;
-    size_t i, size;
-
-    a = cumo_na_step_parameters( self, Qnil );
-    beg  = NUM2DBL(RARRAY_PTR(a)[0]);
-    step = NUM2DBL(RARRAY_PTR(a)[1]);
-    size = NUM2SIZET(RARRAY_PTR(a)[2]);
-
-    for (i=0; i<size; i++) {
-        rb_yield(rb_float_new(beg+i*step));
-    }
-    return self;
-}
-*/
-
-static VALUE
-range_with_step( VALUE range, VALUE step )
-{
-    return cumo_na_step_new2( range, step, Qnil );
-}
-
-static VALUE
-range_with_length( VALUE range, VALUE len )
-{
-    return cumo_na_step_new2( range, Qnil, len );
-}
-
-
-static VALUE
-cumo_na_s_step( int argc, VALUE *argv, VALUE mod )
-{
-    VALUE self = rb_obj_alloc(cumo_na_cStep);
-    step_initialize(argc, argv, self);
-    return self;
-}
-
-
 void
 Init_cumo_na_step()
 {
-    cumo_na_cStep = rb_define_class_under(cNArray, "Step", rb_cObject);
-    rb_include_module(cumo_na_cStep, rb_mEnumerable);
-    rb_define_method(cumo_na_cStep, "initialize", step_initialize, -1);
-
-    //rb_define_method(cumo_na_cStep, "each", step_each, 0);
-
-    rb_define_method(cumo_na_cStep, "first", step_first, 0);
-    rb_define_method(cumo_na_cStep, "last", step_last, 0);
-    rb_define_method(cumo_na_cStep, "begin", step_first, 0);
-    rb_define_method(cumo_na_cStep, "end", step_last, 0);
-    rb_define_method(cumo_na_cStep, "step", step_step, 0);
-    rb_define_method(cumo_na_cStep, "length", step_length, 0);
-    rb_define_method(cumo_na_cStep, "size", step_length, 0);
-    rb_define_method(cumo_na_cStep, "exclude_end?", step_exclude_end_p, 0);
-    //rb_define_method(cumo_na_cStep, "to_s", step_to_s, 0);
-    //rb_define_method(cumo_na_cStep, "inspect", step_inspect, 0);
-    //rb_define_method(cumo_na_cStep, "parameters", cumo_na_step_parameters, 1);
-
-    rb_define_method(rb_cRange, "%", range_with_step, 1);
-    rb_define_method(rb_cRange, "*", range_with_length, 1);
-
-    rb_define_singleton_method(cNArray, "step", cumo_na_s_step, -1);
+    rb_define_alias(rb_cRange, "%", "step");
 
     cumo_id_beg  = rb_intern("begin");
     cumo_id_end  = rb_intern("end");
     cumo_id_len  = rb_intern("length");
     cumo_id_step = rb_intern("step");
-    cumo_id_excl = rb_intern("excl");
 }

data/lib/cumo/narray/extra.rb

@@ -208,6 +208,55 @@ module Cumo
       end
     end
 
+
+    # Iterate over an axis
+    # @ example
+    #   > a = Cumo::DFloat.new(2,2,2).seq
+    #   > p a
+    #   Cumo::DFloat#shape=[2,2,2]
+    #   [[[0, 1],
+    #     [2, 3]],
+    #    [[4, 5],
+    #     [6, 7]]]
+    #
+    #   > a.each_over_axis{|i| p i}
+    #   Cumo::DFloat(view)#shape=[2,2]
+    #   [[0, 1],
+    #    [2, 3]]
+    #   Cumo::DFloat(view)#shape=[2,2]
+    #   [[4, 5],
+    #    [6, 7]]
+    #
+    #   > a.each_over_axis(1){|i| p i}
+    #   Cumo::DFloat(view)#shape=[2,2]
+    #   [[0, 1],
+    #    [4, 5]]
+    #   Cumo::DFloat(view)#shape=[2,2]
+    #   [[2, 3],
+    #    [6, 7]]
+
+    def each_over_axis(axis=0)
+      unless block_given?
+        return to_enum(:each_over_axis,axis)
+      end
+      if ndim == 0
+        if axis != 0
+          raise ArgumentError,"axis=#{axis} is invalid"
+        end
+        niter = 1
+      else
+        axis = check_axis(axis)
+        niter = shape[axis]
+      end
+      idx = [true]*ndim
+      niter.times do |i|
+        idx[axis] = i
+        yield(self[*idx])
+      end
+      self
+    end
+
+
     # Append values to the end of an narray.
     # @example
     #   a = Cumo::DFloat[1, 2, 3]
@@ -987,7 +1036,7 @@ module Cumo
         raise NArray::ShapeError, "must be >= 2-dimensional array"
       end
       m,n = shape[-2..-1]
-      NArray.triu_indices(m,n,k=0)
+      NArray.triu_indices(m,n,k)
     end
 
     # Return the indices for the uppler-triangle on and above the k-th diagonal.