carray 1.4.0 → 1.5.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (239) hide show
  1. checksums.yaml +4 -4
  2. data/.yardopts +32 -0
  3. data/LICENSE +22 -0
  4. data/NEWS.md +83 -0
  5. data/README.md +38 -18
  6. data/Rakefile +2 -2
  7. data/TODO.md +17 -0
  8. data/carray.gemspec +13 -18
  9. data/{ca_iter_block.c → ext/ca_iter_block.c} +16 -18
  10. data/{ca_iter_dimension.c → ext/ca_iter_dimension.c} +20 -21
  11. data/{ca_iter_window.c → ext/ca_iter_window.c} +12 -14
  12. data/{ca_obj_array.c → ext/ca_obj_array.c} +451 -176
  13. data/{ca_obj_bitarray.c → ext/ca_obj_bitarray.c} +18 -23
  14. data/{ca_obj_bitfield.c → ext/ca_obj_bitfield.c} +12 -16
  15. data/{ca_obj_block.c → ext/ca_obj_block.c} +47 -54
  16. data/{ca_obj_fake.c → ext/ca_obj_fake.c} +10 -12
  17. data/{ca_obj_farray.c → ext/ca_obj_farray.c} +21 -23
  18. data/{ca_obj_field.c → ext/ca_obj_field.c} +30 -32
  19. data/{ca_obj_grid.c → ext/ca_obj_grid.c} +32 -33
  20. data/{ca_obj_mapping.c → ext/ca_obj_mapping.c} +11 -13
  21. data/{ca_obj_object.c → ext/ca_obj_object.c} +40 -42
  22. data/{ca_obj_reduce.c → ext/ca_obj_reduce.c} +3 -5
  23. data/{ca_obj_refer.c → ext/ca_obj_refer.c} +44 -48
  24. data/{ca_obj_repeat.c → ext/ca_obj_repeat.c} +45 -47
  25. data/{ca_obj_select.c → ext/ca_obj_select.c} +4 -6
  26. data/{ca_obj_shift.c → ext/ca_obj_shift.c} +26 -28
  27. data/{ca_obj_transpose.c → ext/ca_obj_transpose.c} +26 -28
  28. data/{ca_obj_unbound_repeat.c → ext/ca_obj_unbound_repeat.c} +106 -160
  29. data/{ca_obj_window.c → ext/ca_obj_window.c} +33 -35
  30. data/{carray.h → ext/carray.h} +86 -59
  31. data/{carray_access.c → ext/carray_access.c} +194 -101
  32. data/{carray_attribute.c → ext/carray_attribute.c} +161 -207
  33. data/{carray_call_cfunc.c → ext/carray_call_cfunc.c} +1 -3
  34. data/{carray_cast.c → ext/carray_cast.c} +351 -150
  35. data/{carray_cast_func.rb → ext/carray_cast_func.rb} +1 -2
  36. data/{carray_class.c → ext/carray_class.c} +28 -36
  37. data/{carray_conversion.c → ext/carray_conversion.c} +63 -68
  38. data/{carray_copy.c → ext/carray_copy.c} +34 -50
  39. data/{carray_core.c → ext/carray_core.c} +75 -62
  40. data/ext/carray_data_type.c +66 -0
  41. data/{carray_element.c → ext/carray_element.c} +34 -53
  42. data/{carray_generate.c → ext/carray_generate.c} +71 -50
  43. data/{carray_iterator.c → ext/carray_iterator.c} +53 -53
  44. data/{carray_loop.c → ext/carray_loop.c} +77 -106
  45. data/{carray_mask.c → ext/carray_mask.c} +105 -114
  46. data/{carray_math.rb → ext/carray_math.rb} +29 -13
  47. data/ext/{mathfunc/carray_mathfunc.c → carray_mathfunc.c} +1 -3
  48. data/{carray_numeric.c → ext/carray_numeric.c} +43 -46
  49. data/{carray_operator.c → ext/carray_operator.c} +49 -36
  50. data/{carray_order.c → ext/carray_order.c} +232 -217
  51. data/{carray_sort_addr.c → ext/carray_sort_addr.c} +14 -21
  52. data/{carray_stat.c → ext/carray_stat.c} +6 -8
  53. data/{carray_stat_proc.rb → ext/carray_stat_proc.rb} +25 -27
  54. data/{carray_test.c → ext/carray_test.c} +63 -51
  55. data/{carray_undef.c → ext/carray_undef.c} +1 -11
  56. data/{carray_utils.c → ext/carray_utils.c} +12 -4
  57. data/{extconf.rb → ext/extconf.rb} +10 -7
  58. data/{mkmath.rb → ext/mkmath.rb} +2 -2
  59. data/{ruby_carray.c → ext/ruby_carray.c} +20 -8
  60. data/{ruby_ccomplex.c → ext/ruby_ccomplex.c} +2 -4
  61. data/{ruby_float_func.c → ext/ruby_float_func.c} +1 -3
  62. data/ext/version.h +16 -0
  63. data/{version.rb → ext/version.rb} +0 -0
  64. data/lib/carray.rb +51 -40
  65. data/lib/carray/{base/autoload.rb → autoload.rb} +1 -3
  66. data/lib/carray/autoload/autoload_base.rb +1 -1
  67. data/lib/carray/autoload/autoload_gem_numo_narray.rb +7 -6
  68. data/lib/carray/autoload/autoload_gem_random.rb +8 -0
  69. data/lib/carray/basic.rb +191 -0
  70. data/lib/carray/broadcast.rb +101 -0
  71. data/lib/carray/compose.rb +315 -0
  72. data/lib/carray/construct.rb +484 -0
  73. data/lib/carray/convert.rb +115 -0
  74. data/lib/carray/info.rb +1 -3
  75. data/lib/carray/{base/inspect.rb → inspect.rb} +9 -11
  76. data/lib/carray/io/imagemagick.rb +2 -4
  77. data/lib/carray/{base/iterator.rb → iterator.rb} +6 -6
  78. data/lib/carray/mask.rb +102 -0
  79. data/lib/carray/{base/math.rb → math.rb} +20 -52
  80. data/lib/carray/math/histogram.rb +8 -10
  81. data/lib/carray/math/recurrence.rb +1 -3
  82. data/lib/carray/mkmf.rb +9 -3
  83. data/lib/carray/object/ca_obj_iterator.rb +1 -3
  84. data/lib/carray/object/ca_obj_link.rb +1 -3
  85. data/lib/carray/object/ca_obj_pack.rb +9 -11
  86. data/lib/carray/obsolete.rb +256 -0
  87. data/lib/carray/ordering.rb +181 -0
  88. data/lib/carray/{base/serialize.rb → serialize.rb} +60 -76
  89. data/lib/carray/{base/string.rb → string.rb} +10 -64
  90. data/lib/carray/{base/struct.rb → struct.rb} +19 -21
  91. data/lib/carray/{io/table.rb → table.rb} +1 -10
  92. data/lib/carray/testing.rb +51 -0
  93. data/lib/carray/time.rb +76 -0
  94. data/lib/carray/transform.rb +109 -0
  95. data/misc/Methods.ja.md +182 -0
  96. data/{NOTE → misc/NOTE} +16 -38
  97. data/spec/Classes/CABitfield_spec.rb +58 -0
  98. data/spec/Classes/CABlockIterator_spec.rb +114 -0
  99. data/spec/Classes/CABlock_spec.rb +205 -0
  100. data/spec/Classes/CAField_spec.rb +39 -0
  101. data/spec/Classes/CAGrid_spec.rb +75 -0
  102. data/spec/Classes/CAMap_spec.rb +0 -0
  103. data/{test/test_CAMapping.rb → spec/Classes/CAMapping_spec.rb} +35 -36
  104. data/spec/Classes/CAObject_attribute_spec.rb +33 -0
  105. data/spec/Classes/CAObject_spec.rb +33 -0
  106. data/spec/Classes/CARefer_spec.rb +93 -0
  107. data/spec/Classes/CARepeat_spec.rb +65 -0
  108. data/spec/Classes/CASelect_spec.rb +22 -0
  109. data/spec/Classes/CAShift_spec.rb +16 -0
  110. data/spec/Classes/CAStruct_spec.rb +71 -0
  111. data/{test/test_CATranspose.rb → spec/Classes/CATranspose_spec.rb} +20 -21
  112. data/spec/Classes/CAUnboudRepeat_spec.rb +102 -0
  113. data/spec/Classes/CAWindow_spec.rb +54 -0
  114. data/spec/Classes/CAWrap_spec.rb +8 -0
  115. data/{test/test_CArray.rb → spec/Classes/CArray_spec.rb} +48 -92
  116. data/spec/Classes/CScalar_spec.rb +55 -0
  117. data/spec/Features/feature_130_spec.rb +19 -0
  118. data/spec/Features/feature_attributes_spec.rb +280 -0
  119. data/spec/Features/feature_boolean_spec.rb +98 -0
  120. data/spec/Features/feature_broadcast.rb +116 -0
  121. data/spec/Features/feature_cast_function.rb +19 -0
  122. data/spec/Features/feature_cast_spec.rb +33 -0
  123. data/spec/Features/feature_class_spec.rb +84 -0
  124. data/spec/Features/feature_complex_spec.rb +42 -0
  125. data/{test/test_composite.rb → spec/Features/feature_composite_spec.rb} +17 -18
  126. data/spec/Features/feature_convert_spec.rb +46 -0
  127. data/spec/Features/feature_copy_spec.rb +123 -0
  128. data/spec/Features/feature_creation_spec.rb +84 -0
  129. data/spec/Features/feature_element_spec.rb +144 -0
  130. data/spec/Features/feature_extream_spec.rb +54 -0
  131. data/spec/Features/feature_generate_spec.rb +74 -0
  132. data/spec/Features/feature_index_spec.rb +69 -0
  133. data/spec/Features/feature_mask_spec.rb +580 -0
  134. data/spec/Features/feature_math_spec.rb +97 -0
  135. data/spec/Features/feature_order_spec.rb +146 -0
  136. data/spec/Features/feature_ref_store_spec.rb +209 -0
  137. data/spec/Features/feature_serialization_spec.rb +125 -0
  138. data/spec/Features/feature_stat_spec.rb +397 -0
  139. data/spec/Features/feature_virtual_spec.rb +48 -0
  140. data/spec/Features/method_eq_spec.rb +81 -0
  141. data/spec/Features/method_is_nan_spec.rb +12 -0
  142. data/spec/Features/method_map_spec.rb +54 -0
  143. data/spec/Features/method_max_with.rb +20 -0
  144. data/spec/Features/method_min_with.rb +19 -0
  145. data/spec/Features/method_ne_spec.rb +18 -0
  146. data/spec/Features/method_project_spec.rb +188 -0
  147. data/spec/Features/method_ref_spec.rb +27 -0
  148. data/spec/Features/method_round_spec.rb +11 -0
  149. data/spec/Features/method_s_linspace_spec.rb +48 -0
  150. data/spec/Features/method_s_span_spec.rb +14 -0
  151. data/spec/Features/method_seq_spec.rb +47 -0
  152. data/spec/Features/method_sort_with.rb +43 -0
  153. data/spec/Features/method_sorted_with.rb +29 -0
  154. data/spec/Features/method_span_spec.rb +42 -0
  155. data/spec/Features/method_wrap_readonly_spec.rb +43 -0
  156. data/{test → spec/UnitTest}/test_CAVirtual.rb +0 -0
  157. data/spec/spec_all.rb +0 -1
  158. data/utils/convert_test.rb +73 -0
  159. data/utils/{extract_rdoc.rb → extract_yard.rb} +7 -12
  160. data/{devel → utils}/guess_shape.rb +0 -0
  161. data/utils/{diff_method.rb → monkey_patch_methods.rb} +17 -7
  162. metadata +159 -206
  163. data/COPYING +0 -56
  164. data/GPL +0 -340
  165. data/LEGAL +0 -50
  166. data/TODO +0 -5
  167. data/carray_random.c +0 -531
  168. data/devel/im2col.rb +0 -17
  169. data/ext/calculus/carray_calculus.c +0 -931
  170. data/ext/calculus/carray_interp.c +0 -358
  171. data/ext/calculus/extconf.rb +0 -12
  172. data/ext/calculus/lib/math/calculus.rb +0 -119
  173. data/ext/calculus/lib/math/interp/adapter_interp1d.rb +0 -31
  174. data/ext/mathfunc/extconf.rb +0 -18
  175. data/ext/mathfunc/test/test_hypot.rb +0 -5
  176. data/ext/mathfunc/test/test_j0.rb +0 -22
  177. data/ext/mathfunc/test/test_jn.rb +0 -8
  178. data/ext/mathfunc/test/test_sph.rb +0 -9
  179. data/lib/carray/autoload/autoload_io_table.rb +0 -1
  180. data/lib/carray/autoload/autoload_math_interp.rb +0 -4
  181. data/lib/carray/base/basic.rb +0 -1146
  182. data/lib/carray/base/obsolete.rb +0 -131
  183. data/lib/carray/math/interp.rb +0 -57
  184. data/lib/carray/math/interp/adapter_gsl_spline.rb +0 -47
  185. data/mt19937ar.c +0 -182
  186. data/mt19937ar.h +0 -86
  187. data/rdoc_main.rb +0 -27
  188. data/rdoc_math.rb +0 -5
  189. data/rdoc_stat.rb +0 -31
  190. data/spec/CABlockIterator/CABlockIterator_spec.rb +0 -113
  191. data/spec/CArray/bug/store_spec.rb +0 -27
  192. data/spec/CArray/index/repeat_spec.rb +0 -10
  193. data/spec/CArray/method/eq_spec.rb +0 -80
  194. data/spec/CArray/method/is_nan_spec.rb +0 -12
  195. data/spec/CArray/method/ne_spec.rb +0 -18
  196. data/spec/CArray/method/round_spec.rb +0 -11
  197. data/spec/CArray/object/_attribute_spec.rb +0 -32
  198. data/spec/CArray/object/s_new_spec.rb +0 -31
  199. data/spec/CArray/serialize/Serialization_spec.rb +0 -89
  200. data/test/test_130.rb +0 -23
  201. data/test/test_ALL.rb +0 -51
  202. data/test/test_CABitfield.rb +0 -59
  203. data/test/test_CABlock.rb +0 -208
  204. data/test/test_CAField.rb +0 -40
  205. data/test/test_CAGrid.rb +0 -76
  206. data/test/test_CAMmap.rb +0 -11
  207. data/test/test_CARefer.rb +0 -94
  208. data/test/test_CARepeat.rb +0 -66
  209. data/test/test_CASelect.rb +0 -23
  210. data/test/test_CAShift.rb +0 -17
  211. data/test/test_CAWindow.rb +0 -55
  212. data/test/test_CAWrap.rb +0 -9
  213. data/test/test_CComplex.rb +0 -83
  214. data/test/test_CScalar.rb +0 -91
  215. data/test/test_attribute.rb +0 -281
  216. data/test/test_block_iterator.rb +0 -17
  217. data/test/test_boolean.rb +0 -99
  218. data/test/test_cast.rb +0 -33
  219. data/test/test_class.rb +0 -85
  220. data/test/test_complex.rb +0 -43
  221. data/test/test_convert.rb +0 -79
  222. data/test/test_copy.rb +0 -141
  223. data/test/test_creation.rb +0 -85
  224. data/test/test_element.rb +0 -146
  225. data/test/test_extream.rb +0 -55
  226. data/test/test_generate.rb +0 -75
  227. data/test/test_index.rb +0 -71
  228. data/test/test_mask.rb +0 -578
  229. data/test/test_math.rb +0 -98
  230. data/test/test_narray.rb +0 -64
  231. data/test/test_order.rb +0 -147
  232. data/test/test_random.rb +0 -15
  233. data/test/test_ref_store.rb +0 -211
  234. data/test/test_stat.rb +0 -414
  235. data/test/test_struct.rb +0 -72
  236. data/test/test_virtual.rb +0 -49
  237. data/utils/create_rdoc.sh +0 -9
  238. data/utils/make_tgz.sh +0 -3
  239. data/version.h +0 -18
@@ -3,10 +3,8 @@
3
3
  carray_order.c
4
4
 
5
5
  This file is part of Ruby/CArray extension library.
6
- You can redistribute it and/or modify it under the terms of
7
- the Ruby Licence.
8
6
 
9
- Copyright (C) 2005 Hiroki Motoyoshi
7
+ Copyright (C) 2005-2020 Hiroki Motoyoshi
10
8
 
11
9
  ---------------------------------------------------------------------------- */
12
10
 
@@ -132,7 +130,7 @@ ca_project (CArray *ca, CArray *ci, char *lfill, char *ufill)
132
130
 
133
131
  ca_attach_n(2, ca, ci); /* ATTACH */
134
132
 
135
- co = carray_new(ca->data_type, ci->rank, ci->dim, ca->bytes, NULL);
133
+ co = carray_new(ca->data_type, ci->ndim, ci->dim, ca->bytes, NULL);
136
134
  ca_project_loop(co, ca, ci, lfill, ufill);
137
135
 
138
136
  ca_detach_n(2, ca, ci); /* DETACH */
@@ -140,26 +138,24 @@ ca_project (CArray *ca, CArray *ci, char *lfill, char *ufill)
140
138
  return co;
141
139
  }
142
140
 
143
- /* rdoc:
144
- class CArray
145
- def project (idx,lval=nil,uval=nil)
146
- end
147
- end
141
+ /* @overload project (idx, lval=nil, uval=nil)
142
+
143
+ [TBD]. Creates new array the element of the object as address.
148
144
  */
149
145
 
150
146
  VALUE
151
147
  rb_ca_project (int argc, VALUE *argv, VALUE self)
152
148
  {
153
- volatile VALUE obj, rindex, vlfval, vufval;
149
+ volatile VALUE obj, ridx, vlfval, vufval;
154
150
  CArray *ca, *ci, *co;
155
151
  char *lfval, *ufval;
156
152
 
157
- rb_scan_args(argc, argv, "12", (VALUE *) &rindex, (VALUE *) &vlfval, (VALUE *) &vufval);
153
+ rb_scan_args(argc, argv, "12", (VALUE *)&ridx, (VALUE *) &vlfval, (VALUE *) &vufval);
158
154
 
159
155
  Data_Get_Struct(self, CArray, ca);
160
156
 
161
- rb_check_carray_object(rindex);
162
- ci = ca_wrap_readonly(rindex, CA_SIZE);
157
+ rb_check_carray_object(ridx);
158
+ ci = ca_wrap_readonly(ridx, CA_SIZE);
163
159
 
164
160
  lfval = malloc_with_check(ca->bytes);
165
161
  ufval = malloc_with_check(ca->bytes);
@@ -227,12 +223,9 @@ rb_ca_project (int argc, VALUE *argv, VALUE self)
227
223
  free(v); \
228
224
  }
229
225
 
230
- /* rdoc:
231
- class CArray
232
- # Reverses the elements of +ca+ in place.
233
- def reverse!
234
- end
235
- end
226
+ /* @overload reverse!
227
+
228
+ Reverses the elements of +ca+ in place.
236
229
  */
237
230
 
238
231
  static VALUE
@@ -279,13 +272,10 @@ rb_ca_reverse_bang (VALUE self)
279
272
  return self;
280
273
  }
281
274
 
282
- /* rdoc:
283
- class CArray
284
- # Returns a new CArray object containing <i>ca</i>'s elements in
285
- # reverse order.
286
- def reverse
287
- end
288
- end
275
+ /* @overload reverse
276
+
277
+ Returns a new CArray object containing <i>ca</i>'s elements in
278
+ reverse order.
289
279
  */
290
280
 
291
281
  static VALUE
@@ -384,12 +374,9 @@ ca_qsort_cmp[CA_NTYPE] = {
384
374
  qcmp_VALUE,
385
375
  };
386
376
 
387
- /* rdoc:
388
- class CArray
389
- # Sorts <i>ca</i>'s elements in place.
390
- def sort!
391
- end
392
- end
377
+ /* @overload sort!
378
+
379
+ Sorts <i>ca</i>'s elements in place.
393
380
  */
394
381
 
395
382
  static VALUE
@@ -433,12 +420,9 @@ rb_ca_sort_bang (VALUE self)
433
420
  return self;
434
421
  }
435
422
 
436
- /* rdoc:
437
- class CArray
438
- # Returns a new CArray object containing <i>ca</i>'s elements sorted.
439
- def sort
440
- end
441
- end
423
+ /* @overload sort
424
+
425
+ Returns a new CArray object containing <i>ca</i>'s elements sorted.
442
426
  */
443
427
 
444
428
  static VALUE
@@ -449,162 +433,12 @@ rb_ca_sorted_copy (VALUE self)
449
433
  return rb_ca_sort_bang(out);
450
434
  }
451
435
 
452
- /* --------------------------------------------------------------- */
453
-
454
- /*
455
- Fisher-Yates method
456
-
457
- # [ruby-list:41356]
458
- # From: Shin-ichiro HARA <sinara blade.nagaokaut.ac.jp>
459
- def shuffle!
460
- array = self
461
- array.each_index do |idx|
462
- jdx = rand(idx + 1)
463
- array[idx], array[jdx] = array[jdx], array[idx]
464
- end
465
- self
466
- end
467
- */
468
-
469
- #define proc_shuffle(type) \
470
- { \
471
- ca_size_t idx, jdx; \
472
- type *ptr, *p, *q; \
473
- type t1; \
474
- ptr = (type *) ca->ptr; \
475
- if ( ca->mask ) { \
476
- boolean8_t *mptr, *mp, *mq; \
477
- boolean8_t mt1; \
478
- mptr = (boolean8_t *)ca->mask->ptr; \
479
- for (idx=0; idx<ca->elements; idx++) { \
480
- jdx = ca_rand((double)(idx+1)); \
481
- p = ptr + idx; \
482
- q = ptr + jdx; \
483
- mp = mptr + idx; \
484
- mq = mptr + jdx; \
485
- t1 = *p; *p = *q; *q = t1; \
486
- mt1 = *mp; *mp = *mq; *mq = mt1; \
487
- } \
488
- } \
489
- else { \
490
- for (idx=0; idx<ca->elements; idx++) { \
491
- jdx = ca_rand((double)(idx+1)); \
492
- p = ptr + idx; \
493
- q = ptr + jdx; \
494
- t1 = *p; *p = *q; *q = t1; \
495
- } \
496
- } \
497
- }
498
-
499
- #define proc_shuffle_fixlen() \
500
- { \
501
- ca_size_t idx, jdx; \
502
- char *ptr, *p, *q; \
503
- char *t = (char*) malloc_with_check(ca->bytes); \
504
- ca_size_t bytes = ca->bytes; \
505
- ptr = ca->ptr; \
506
- if ( ca->mask ) { \
507
- boolean8_t *mptr, *mp, *mq; \
508
- boolean8_t mt1; \
509
- mptr = (boolean8_t *)ca->mask->ptr; \
510
- for (idx=0; idx<ca->elements; idx++) { \
511
- jdx = ca_rand((double)(idx+1)); \
512
- p = ca->ptr + idx*bytes; \
513
- q = ca->ptr + jdx*bytes; \
514
- mp = mptr + idx; \
515
- mq = mptr + jdx; \
516
- memcpy(t, p, bytes); memcpy(p, q, bytes); memcpy(q, t, bytes); \
517
- mt1 = *mp; *mp = *mq; *mq = mt1; \
518
- } \
519
- free(t); \
520
- } \
521
- else { \
522
- for (idx=0; idx<ca->elements; idx++) { \
523
- jdx = ca_rand((double)(idx+1)); \
524
- p = ca->ptr + idx*bytes; \
525
- q = ca->ptr + jdx*bytes; \
526
- memcpy(t, p, bytes); memcpy(p, q, bytes); memcpy(q, t, bytes); \
527
- } \
528
- free(t); \
529
- } \
530
- }
531
-
532
- void ca_check_rand_init ();
533
-
534
- /* rdoc:
535
- class CArray
536
- # shuffles the elements.
537
- # If `self` has mask, the masked elements are also moved by shuffling.
538
- def shuffle!
539
- end
540
- end
541
- */
542
-
543
- static VALUE
544
- rb_ca_shuffle_bang (VALUE self)
545
- {
546
- CArray *ca;
547
-
548
- rb_ca_modify(self);
549
-
550
- Data_Get_Struct(self, CArray, ca);
551
-
552
- ca_check_rand_init();
553
-
554
- ca_attach(ca);
555
-
556
- switch ( ca->data_type ) {
557
- case CA_BOOLEAN:
558
- case CA_INT8: proc_shuffle(int8_t); break;
559
- case CA_UINT8: proc_shuffle(uint8_t); break;
560
- case CA_INT16: proc_shuffle(int16_t); break;
561
- case CA_UINT16: proc_shuffle(uint16_t); break;
562
- case CA_INT32: proc_shuffle(int32_t); break;
563
- case CA_UINT32: proc_shuffle(uint32_t); break;
564
- case CA_INT64: proc_shuffle(int64_t); break;
565
- case CA_UINT64: proc_shuffle(uint64_t); break;
566
- case CA_FLOAT32: proc_shuffle(float32_t); break;
567
- case CA_FLOAT64: proc_shuffle(float64_t); break;
568
- case CA_FLOAT128: proc_shuffle(float128_t); break;
569
- #ifdef HAVE_COMPLEX_H
570
- case CA_CMPLX64: proc_shuffle(cmplx64_t); break;
571
- case CA_CMPLX128: proc_shuffle(cmplx128_t); break;
572
- case CA_CMPLX256: proc_shuffle(cmplx256_t); break;
573
- #endif
574
- case CA_FIXLEN: proc_shuffle_fixlen(); break;
575
- case CA_OBJECT: proc_shuffle(VALUE); break;
576
- default:
577
- rb_raise(rb_eCADataTypeError, "[BUG] array has an unknown data type");
578
- }
579
-
580
- ca_sync(ca);
581
- ca_detach(ca);
582
-
583
- return self;
584
- }
585
-
586
- /* rdoc:
587
- class CArray
588
- def shuffle
589
- end
590
- end
591
- */
592
-
593
- static VALUE
594
- rb_ca_shuffled_copy (VALUE self)
595
- {
596
- volatile VALUE out = rb_ca_copy(self);
597
- rb_ca_data_type_inherit(out, self);
598
- return rb_ca_shuffle_bang(out);
599
- }
600
436
 
601
437
  /* --------------------------------------------------------------- */
602
438
 
603
- /* rdoc:
604
- class CArray
605
- def bsearch
606
- end
607
- end
439
+ /* @overload bsearch
440
+
441
+ Returns a new CArray object containing <i>ca</i>'s elements sorted.
608
442
  */
609
443
 
610
444
  static VALUE
@@ -641,7 +475,7 @@ rb_ca_binary_search (VALUE self, volatile VALUE rval)
641
475
  if ( ca->data_type != cv->data_type ) {
642
476
  cv = ca_wrap_readonly(rval, ca->data_type);
643
477
  }
644
- co = carray_new(CA_SIZE, cv->rank, cv->dim, 0, NULL);
478
+ co = carray_new(CA_SIZE, cv->ndim, cv->dim, 0, NULL);
645
479
  out = ca_wrap_struct(co);
646
480
  ca_attach(cv);
647
481
  if ( ca_is_fixlen_type(ca) ) {
@@ -709,11 +543,9 @@ rb_ca_binary_search (VALUE self, volatile VALUE rval)
709
543
  return out;
710
544
  }
711
545
 
712
- /* rdoc:
713
- class CArray
714
- def bsearch_index
715
- end
716
- end
546
+ /* @overload bsearch_index
547
+
548
+ [TBD].
717
549
  */
718
550
 
719
551
  static VALUE
@@ -778,6 +610,33 @@ rb_ca_binary_search_index (VALUE self, volatile VALUE rval)
778
610
  } \
779
611
  }
780
612
 
613
+ #define proc_find_value_float128(type, defeps) \
614
+ { \
615
+ type *ptr = (type *) ca->ptr; \
616
+ boolean8_t *m = (ca->mask) ? (boolean8_t*) ca->mask->ptr : NULL; \
617
+ type val = (type) NUM2DBL(value); \
618
+ float128_t eps = (NIL_P(veps)) ? defeps*fabsl(val) : NUM2DBL(veps); \
619
+ ca_size_t i; \
620
+ if ( m ) { \
621
+ for (i=0; i<ca->elements; i++, ptr++) { \
622
+ if ( ! *m++ ) { \
623
+ if ( fabsl(*ptr - val) <= eps ) { \
624
+ addr = i; \
625
+ break; \
626
+ } \
627
+ } \
628
+ } \
629
+ } \
630
+ else { \
631
+ for (i=0; i<ca->elements; i++, ptr++) { \
632
+ if ( fabsl(*ptr - val) <= eps ) { \
633
+ addr = i; \
634
+ break; \
635
+ } \
636
+ } \
637
+ } \
638
+ }
639
+
781
640
  #define proc_find_value_cmplx(type, defeps) \
782
641
  { \
783
642
  type *ptr = (type *) ca->ptr; \
@@ -831,11 +690,9 @@ rb_ca_binary_search_index (VALUE self, volatile VALUE rval)
831
690
  }
832
691
 
833
692
 
834
- /* rdoc:
835
- class CArray
836
- def search
837
- end
838
- end
693
+ /* @overload search
694
+
695
+ [TBD].
839
696
  */
840
697
 
841
698
  static VALUE
@@ -865,7 +722,7 @@ rb_ca_linear_search (int argc, VALUE *argv, VALUE self)
865
722
  case CA_UINT64: proc_find_value(uint64_t); break;
866
723
  case CA_FLOAT32: proc_find_value_float(float32_t, FLT_EPSILON); break;
867
724
  case CA_FLOAT64: proc_find_value_float(float64_t, DBL_EPSILON); break;
868
- case CA_FLOAT128: proc_find_value_float(float128_t, DBL_EPSILON); break;
725
+ case CA_FLOAT128: proc_find_value_float128(float128_t, DBL_EPSILON); break;
869
726
  #ifdef HAVE_COMPLEX_H
870
727
  case CA_CMPLX64: proc_find_value_cmplx(cmplx64_t, FLT_EPSILON); break;
871
728
  case CA_CMPLX128: proc_find_value_cmplx(cmplx128_t, DBL_EPSILON); break;
@@ -881,11 +738,9 @@ rb_ca_linear_search (int argc, VALUE *argv, VALUE self)
881
738
  return ( addr == -1 ) ? Qnil : SIZE2NUM(addr);
882
739
  }
883
740
 
884
- /* rdoc:
885
- class CArray
886
- def search_index
887
- end
888
- end
741
+ /* @overload search_index
742
+
743
+ [TBD].
889
744
  */
890
745
 
891
746
  static VALUE
@@ -959,11 +814,9 @@ rb_ca_linear_search_index (int argc, VALUE *argv, VALUE self)
959
814
  } \
960
815
  }
961
816
 
962
- /* rdoc:
963
- class CArray
964
- def search_nearest
965
- end
966
- end
817
+ /* @overload search_nearest
818
+
819
+ [TBD].
967
820
  */
968
821
 
969
822
  static VALUE
@@ -1004,6 +857,11 @@ rb_ca_linear_search_nearest (VALUE self, VALUE value)
1004
857
  return ( addr == -1 ) ? Qnil : SIZE2NUM(addr);
1005
858
  }
1006
859
 
860
+ /* @overload search_nearest_index
861
+
862
+ [TBD].
863
+ */
864
+
1007
865
  static VALUE
1008
866
  rb_ca_linear_search_nearest_index (VALUE self, VALUE value)
1009
867
  {
@@ -1011,6 +869,162 @@ rb_ca_linear_search_nearest_index (VALUE self, VALUE value)
1011
869
  return ( NIL_P(raddr) ) ? Qnil : rb_ca_addr2index(self, raddr);
1012
870
  }
1013
871
 
872
+ /* ----------------------------------------------------------------- */
873
+
874
+ static ca_size_t
875
+ linear_index (ca_size_t n, double *y, double yy, double *idx)
876
+ {
877
+ ca_size_t a, b, c, x1;
878
+ double ya, yb, yc;
879
+ double y1, y2;
880
+ double rest;
881
+
882
+ if ( yy <= y[0] ) {
883
+ x1 = 0;
884
+ goto found;
885
+ }
886
+
887
+ if ( yy >= y[n-1] ) {
888
+ x1 = n-2;
889
+ goto found;
890
+ }
891
+
892
+ /* check for equally spaced scale */
893
+
894
+ a = (ca_size_t)((yy-y[0])/(y[n-1]-y[0])*(n-1));
895
+
896
+ if ( a >= 0 && a < n-1 ) {
897
+ if ( (y[a] - yy) * (y[a+1] - yy) <= 0 ) { /* lucky case */
898
+ x1 = a;
899
+ goto found;
900
+ }
901
+ }
902
+
903
+ /* binary section method */
904
+
905
+ a = 0;
906
+ b = n-1;
907
+
908
+ ya = y[a];
909
+ yb = y[b];
910
+
911
+ if ( ya > yb ) {
912
+ return -1; /* input scale array should have accending order */
913
+ }
914
+
915
+ while ( (b - a) >= 1 ) {
916
+
917
+ c = (a + b)/2;
918
+ yc = y[c];
919
+ if ( a == c ) {
920
+ break;
921
+ }
922
+
923
+ if ( yc == yy ) {
924
+ a = c;
925
+ break;
926
+ }
927
+ else if ( (ya - yy) * (yc - yy) <= 0 ) {
928
+ b = c;
929
+ yb = yc;
930
+ }
931
+ else {
932
+ a = c;
933
+ ya = yc;
934
+ }
935
+
936
+ if ( ya > yb ) {
937
+ return -1; /* input scale array should have accending order */
938
+ }
939
+ }
940
+
941
+ x1 = a;
942
+
943
+ found:
944
+
945
+ y1 = y[x1];
946
+ y2 = y[x1+1];
947
+ rest = (yy-y1)/(y2-y1);
948
+
949
+ if ( fabs(y2-yy)/fabs(y2) < DBL_EPSILON*100 ) {
950
+ *idx = (double) (x1 + 1);
951
+ }
952
+ else if ( fabs(y1-yy)/fabs(y1) < DBL_EPSILON*100 ) {
953
+ *idx = (double) x1;
954
+ }
955
+ else {
956
+ *idx = rest + (double) x1;
957
+ }
958
+
959
+ return 0;
960
+ }
961
+
962
+ static VALUE
963
+ rb_ca_binary_search_linear_index (volatile VALUE self, volatile VALUE vx)
964
+ {
965
+ volatile VALUE out, out0;
966
+ CArray *ca, *sc, *cx, *co0, *co;
967
+ ca_size_t n;
968
+ double *x;
969
+ double *px;
970
+ double *po;
971
+ ca_size_t i;
972
+
973
+ Data_Get_Struct(self, CArray, ca);
974
+
975
+ if ( rb_ca_is_any_masked(self) ) {
976
+ rb_raise(rb_eRuntimeError, "self should not have any masked elements");
977
+ }
978
+
979
+ sc = ca_wrap_readonly(self, CA_FLOAT64);
980
+ cx = ca_wrap_readonly(vx, CA_FLOAT64);
981
+
982
+ co0 = carray_new(ca->data_type, cx->ndim, cx->dim, 0, NULL);
983
+ out = out0 = ca_wrap_struct(co0);
984
+ co = ca_wrap_writable(out, CA_FLOAT64);
985
+
986
+ ca_attach_n(3, sc, cx, co);
987
+
988
+ n = sc->elements;
989
+ x = (double*) sc->ptr;
990
+ px = (double*) cx->ptr;
991
+ po = (double*) co->ptr;
992
+
993
+ ca_update_mask(cx);
994
+ if ( cx->mask ) {
995
+ boolean8_t *mx, *mo;
996
+ ca_create_mask(co);
997
+ mx = (boolean8_t *) cx->mask->ptr;
998
+ mo = (boolean8_t *) co->mask->ptr;
999
+ for (i=0; i<cx->elements; i++) {
1000
+ if ( ! *mx ) {
1001
+ linear_index(n, x, *px, po);
1002
+ }
1003
+ else {
1004
+ *mo = 1;
1005
+ }
1006
+ mx++; mo++; px++, po++;
1007
+ }
1008
+ }
1009
+ else {
1010
+ for (i=0; i<cx->elements; i++) {
1011
+ linear_index(n, x, *px, po);
1012
+ px++, po++;
1013
+ }
1014
+ }
1015
+
1016
+ ca_sync(co);
1017
+ ca_detach_n(3, sc, cx, co);
1018
+
1019
+ if ( rb_ca_is_scalar(vx) ) {
1020
+ return rb_funcall(out0, rb_intern("[]"), 1, INT2NUM(0));
1021
+ }
1022
+ else {
1023
+ return out0;
1024
+ }
1025
+ }
1026
+
1027
+
1014
1028
  void
1015
1029
  Init_carray_order ()
1016
1030
  {
@@ -1024,8 +1038,8 @@ Init_carray_order ()
1024
1038
  rb_define_method(rb_cCArray, "sort!", rb_ca_sort_bang, 0);
1025
1039
  rb_define_method(rb_cCArray, "sort", rb_ca_sorted_copy, 0);
1026
1040
 
1027
- rb_define_method(rb_cCArray, "shuffle!", rb_ca_shuffle_bang, 0);
1028
- rb_define_method(rb_cCArray, "shuffle", rb_ca_shuffled_copy, 0);
1041
+ rb_define_method(rb_cCArray, "bsearch", rb_ca_binary_search, 1);
1042
+ rb_define_method(rb_cCArray, "bsearch_index", rb_ca_binary_search_index, 1);
1029
1043
 
1030
1044
  rb_define_method(rb_cCArray, "search", rb_ca_linear_search, -1);
1031
1045
  rb_define_method(rb_cCArray, "search_index", rb_ca_linear_search_index, -1);
@@ -1035,6 +1049,7 @@ Init_carray_order ()
1035
1049
  rb_define_method(rb_cCArray, "search_nearest_index",
1036
1050
  rb_ca_linear_search_nearest_index, 1);
1037
1051
 
1038
- rb_define_method(rb_cCArray, "bsearch", rb_ca_binary_search, 1);
1039
- rb_define_method(rb_cCArray, "bsearch_index", rb_ca_binary_search_index, 1);
1052
+ rb_define_method(rb_cCArray, "section",
1053
+ rb_ca_binary_search_linear_index, 1);
1054
+
1040
1055
  }