vdsp 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a9bf55ee5ee1699cdd8b6c0ccba7b2a56de452e49a1baf748b446c80c3c2eae
-  data.tar.gz: a3c3fc40011f79420eec38be24a689db3648915a2fadba7c7e05c5013ec37e85
+  metadata.gz: 5c68d2c6fcfd278007d16c59196ef9bc72c6f43119db2a3018230c3f18e16653
+  data.tar.gz: cab3b5e5630378581854a1a5e86b1d1bacb2ba9fb17fb5514cced0027d518085
 SHA512:
-  metadata.gz: fad7199ff86511a3c3155ed0719fb9240a8fbce9b858694a15186c54b1aabe65a8537a4aa61715a883d7099a8e1321728d0e29f74bd3aa517022d98093dccc35
-  data.tar.gz: 22ef33d7cdb7fbb4dfb59333d58144b01dd0d9efc230eec3736dfa5d5967ed8baaeb14f8ff6f82c964bad5101ad8e8da1c9234bc1cf6b0c247a6ac0339c1ea58
+  metadata.gz: ee4fc1111d826dbc9a8e7cae82700f69fb692c6e06a3ca6cd0e5fa46eca99f9fbc119742f9ebdeacc725b755980c0d55d40789555f7e4c8e78b30af226f4f8e0
+  data.tar.gz: '08c66b9d34da6f64c4e7138ca883dc8fc76ec286cd4d84f0bd323fe4867d179d9434b7f94cff1dfbe50601395be7e3186757a79cf456ebd33f427e7df413b0f0'

data/ext/vdsp/vdsp.c

@@ -391,76 +391,215 @@ VALUE rb_double_array_div(VALUE self, VALUE other)
   }
 }
 
-VALUE rb_double_array_aref(VALUE self, VALUE i)
+VALUE rb_double_array_entry(VALUE self, long offset)
 {
-  long _i = NUM2LONG(i);
+  VdspArrayNativeResource *_a = get_vdsp_array_native_resource(self);
+  long len = _a->length;
 
-  VdspArrayNativeResource *p = get_vdsp_array_native_resource(self);
-  if (0<=_i && (unsigned long)_i<p->length) {
-    return DBL2NUM(p->v.d[_i]);
-  } else {
-    rb_raise(rb_eIndexError, "Index out of range: %ld", _i);
+  if (offset < 0) {
+    offset += len;
+    if (offset < 0) return Qnil;
+  }
+  else if (len <= offset) {
+    return Qnil;
   }
+  return DBL2NUM(_a->v.d[offset]);
 }
 
-VALUE rb_double_array_aset(VALUE self, VALUE i, VALUE val)
+VALUE rb_double_array_subseq(VALUE self, long beg, long len)
 {
-  long _i = NUM2LONG(i);
+  VdspArrayNativeResource *_a = get_vdsp_array_native_resource(self);
+  long alen = _a->length;
 
-  VdspArrayNativeResource *p = get_vdsp_array_native_resource(self);
-  if (0<=_i && (unsigned long)_i<p->length) {
-    val = rb_funcall(val, rb_intern("to_f"), 0);
-    p->v.d[_i] = NUM2DBL(val);
-    return val;
-  } else {
-    rb_raise(rb_eIndexError, "Index out of range: %ld", _i);
+  if (beg > alen) return Qnil;
+  if (beg < 0 || len < 0) return Qnil;
+
+  if (alen < len || alen < beg + len) {
+    len = alen - beg;
   }
+
+  VALUE lenv = LONG2NUM(len);
+  VALUE c = rb_class_new_instance(1, &lenv, rb_cDoubleArray);
+  VdspArrayNativeResource *_c = get_vdsp_array_native_resource(c);
+  memcpy(_c->v.d, _a->v.d+beg, sizeof(double) * len);
+
+  return c;
 }
 
-VALUE rb_double_array_coerce(VALUE self, VALUE other)
+VALUE rb_double_array_aref2(VALUE self, VALUE b, VALUE e)
 {
-  other = rb_class_new_instance(1, &other, rb_cDoubleScalar);
-  return rb_assoc_new(other, self);
+  VdspArrayNativeResource *_a = get_vdsp_array_native_resource(self);
+
+  long beg = NUM2LONG(b);
+  long len = NUM2LONG(e);
+
+  if (beg < 0) {
+    beg += _a->length;
+  }
+
+  return rb_double_array_subseq(self, beg, len);
 }
 
-VALUE rb_double_array_slice(int argc, const VALUE *argv, VALUE self)
+VALUE rb_double_array_aref1(VALUE self, VALUE arg)
 {
-  rb_check_arity(argc, 1, 2);
+  long beg, len;
 
   VdspArrayNativeResource *_a = get_vdsp_array_native_resource(self);
   long alen = _a->length;
 
-  long beg = 0;
-  long len = 0;
+  if (FIXNUM_P(arg)) {
+    return rb_double_array_entry(self, FIX2LONG(arg));
+  }
+  switch (rb_range_beg_len(arg, &beg, &len, alen, 0)) {
+    case Qfalse:
+      break;
+    case Qnil:
+      return Qnil;
+    default:
+      return rb_double_array_subseq(self, beg, len);
+  }
+  return rb_double_array_entry(self, FIX2LONG(arg));
+}
 
-  if (argc==2) {
-    beg = NUM2LONG(argv[0]);
-    len = NUM2LONG(argv[1]);
-  } else if (FIXNUM_P(argv[0])){
-    len = FIX2LONG(argv[0]);
-  } else {
-    switch (rb_range_beg_len(argv[0], &beg, &len, alen, 0)) {
-      case Qfalse:
-      case Qnil:
-        return Qnil;
-      default:
-        break;
+VALUE rb_double_array_aref(int argc, const VALUE *argv, VALUE self)
+{
+  rb_check_arity(argc, 1, 2);
+
+  if (argc == 2) {
+    return rb_double_array_aref2(self, argv[0], argv[1]);
+  }
+  return rb_double_array_aref1(self, argv[0]);
+}
+
+VALUE double_array_aset1(VALUE self, long idx, VALUE val)
+{
+  VdspArrayNativeResource *_a = get_vdsp_array_native_resource(self);
+  double _val = NUM2DBL(val);
+
+  long len = _a->length;
+
+  if (idx < 0) {
+    idx += len;
+    if (idx < 0) {
+      rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld", idx - len, -len);
     }
   }
 
-  if (beg > alen) return Qnil;
-  if (beg < 0 || len < 0) return Qnil;
+  if (idx >= len) {
+    //rb_raise(rb_eIndexError, "Index out of range: %ld", idx);
+    double_array_resize(_a, idx+1);
+    _a->length = idx+1;
+  }
 
+  _a->v.d[idx] = _val;
+
+  return self;
+}
+
+VALUE double_array_aset2(VALUE self, long beg, long len, VALUE val)
+{
+  VdspArrayNativeResource *_a = get_vdsp_array_native_resource(self);
+  long alen = _a->length;
+
+  if (len<0) {
+    len += alen;
+  }
+  if (len<beg) {
+    len = beg;
+  }
   if (alen < len || alen < beg + len) {
     len = alen - beg;
   }
 
-  VALUE lenv = LONG2NUM(len);
-  VALUE c = rb_class_new_instance(1, &lenv, rb_cDoubleArray);
-  VdspArrayNativeResource *_c = get_vdsp_array_native_resource(c);
-  memcpy(_c->v.d, _a->v.d+beg, sizeof(double) * len);
+  if (RB_TYPE_P(val, T_ARRAY)) {
+    val = rb_funcall(rb_cDoubleArray, rb_intern("create"), 1, val);
+  }
+  if (rb_obj_is_kind_of(val, rb_mVdspArray)) {
+    val = rb_funcall(val, rb_intern("to_da"), 0);
+    if (self==val) {
+      val = rb_funcall(val, rb_intern("clone"), 0);
+    }
 
-  return c;
+    VdspArrayNativeResource *_b = get_vdsp_array_native_resource(val);
+    long new_len = alen - len + _b->length;
+
+    bool after_resize = false;
+    if (alen==new_len) {
+    } else if (alen<new_len) {
+      double_array_resize(_a, new_len);
+      _a->length = new_len;
+    } else {
+      after_resize = true;
+    }
+
+    memmove(_a->v.d+beg+_b->length, _a->v.d+beg+len, sizeof(double) * (alen-beg-len));
+    memcpy(_a->v.d+beg, _b->v.d, sizeof(double) * _b->length);
+
+    if (after_resize) {
+      double_array_resize(_a, new_len);
+      _a->length = new_len;
+    }
+
+    return self;
+  } else {
+    long new_len = alen - len + 1;
+
+    bool after_resize = false;
+    if (alen==new_len) {
+    } else if (alen<new_len) {
+      double_array_resize(_a, new_len);
+      _a->length = new_len;
+    } else {
+      after_resize = true;
+    }
+    
+    memmove(_a->v.d+beg+1, _a->v.d+len, sizeof(double) * (alen-beg-len));
+    _a->v.d[beg] = NUM2DBL(val);
+
+    if (after_resize) {
+      double_array_resize(_a, new_len);
+      _a->length = new_len;
+    }
+
+    return self;
+  }
+}
+
+VALUE rb_double_array_aset(int argc, const VALUE *argv, VALUE self)
+{
+  long offset, beg, len;
+  VALUE val;
+
+  if (argc == 3) {
+    beg = NUM2LONG(argv[0]);
+    len = NUM2LONG(argv[1]);
+    val = argv[2];
+    return double_array_aset2(self, beg, len, val);
+  }
+
+  rb_check_arity(argc, 2, 2);
+
+  if (FIXNUM_P(argv[0])) {
+    offset = FIX2LONG(argv[0]);
+    val = argv[1];
+    return double_array_aset1(self, offset, val);
+  }
+
+  VdspArrayNativeResource *_a = get_vdsp_array_native_resource(self);
+  if (rb_range_beg_len(argv[0], &beg, &len, _a->length, 1)) {
+    val = argv[1];
+    return double_array_aset2(self, beg, len, val);
+  }
+
+  offset = NUM2LONG(argv[0]);
+  val = argv[1];
+  return double_array_aset1(self, offset, val);
+}
+
+VALUE rb_double_array_coerce(VALUE self, VALUE other)
+{
+  other = rb_class_new_instance(1, &other, rb_cDoubleScalar);
+  return rb_assoc_new(other, self);
 }
 
 void double_array_resize(VdspArrayNativeResource *_a, unsigned long len)
@@ -2597,12 +2736,12 @@ void Init_vdsp()
   rb_define_method(rb_cDoubleArray, "-", rb_double_array_minus, 1);
   rb_define_method(rb_cDoubleArray, "*", rb_double_array_mul, 1);
   rb_define_method(rb_cDoubleArray, "/", rb_double_array_div, 1);
-  rb_define_method(rb_cDoubleArray, "[]", rb_double_array_aref, 1);
-  rb_define_method(rb_cDoubleArray, "[]=", rb_double_array_aset, 2);
+  rb_define_method(rb_cDoubleArray, "[]", rb_double_array_aref, -1);
+  rb_define_method(rb_cDoubleArray, "[]=", rb_double_array_aset, -1);
   rb_define_method(rb_cDoubleArray, "each", rb_double_array_each, 0);
   rb_define_method(rb_cDoubleArray, "to_a", rb_double_array_get_values, 0);
   rb_define_method(rb_cDoubleArray, "coerce", rb_double_array_coerce, 1);
-  rb_define_method(rb_cDoubleArray, "slice", rb_double_array_slice, -1);
+  rb_define_method(rb_cDoubleArray, "slice", rb_double_array_aref, -1);
   rb_define_method(rb_cDoubleArray, "resize", rb_double_array_resize, 1);
   rb_define_method(rb_cDoubleArray, "concat", rb_double_array_concat, -1);
   rb_define_method(rb_cDoubleArray, "abs", rb_double_array_abs, 0);

data/ext/vdsp/vdsp.h

@@ -47,5 +47,6 @@ typedef struct {
 
 extern VALUE rb_double_array_plus(VALUE self, VALUE other);
 extern VALUE rb_double_array_mul(VALUE self, VALUE other);
+extern void double_array_resize(VdspArrayNativeResource *_a, unsigned long len);
 
 extern void Init_vdsp();

data/lib/vdsp/version.rb

@@ -1,3 +1,3 @@
 module Vdsp
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vdsp
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler