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_generate.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
 
@@ -15,17 +13,11 @@
15
13
 
16
14
  /* ----------------------------------------------------------------- */
17
15
 
18
- /* rdoc:
19
- class CArray
20
- # Sets true at the given index for the boolean array and returns self.
21
- # It accept the arguments same as for CArray#[].
22
- def set (*argv)
23
- end
24
- # Sets false at the given index for the boolean array and returns self.
25
- # It accept the arguments same as for CArray#[].
26
- def unset (*argv)
27
- end
28
- end
16
+ /* @overload set (*idx)
17
+
18
+ (Boolean, Modification)
19
+ Sets true at the given index for the boolean array and returns self.
20
+ It accept the arguments same as for CArray#[].
29
21
  */
30
22
 
31
23
  static VALUE
@@ -40,6 +32,13 @@ rb_ca_boolean_set (int argc, VALUE *argv, VALUE self)
40
32
  return self;
41
33
  }
42
34
 
35
+ /* @overload unset (*idx)
36
+
37
+ (Boolean, Modification)
38
+ Sets false at the given index for the boolean array and returns self.
39
+ It accept the arguments same as for CArray#[].
40
+ */
41
+
43
42
  static VALUE
44
43
  rb_ca_boolean_unset (int argc, VALUE *argv, VALUE self)
45
44
  {
@@ -54,12 +53,10 @@ rb_ca_boolean_unset (int argc, VALUE *argv, VALUE self)
54
53
 
55
54
  /* ----------------------------------------------------------------- */
56
55
 
57
- /* rdoc:
58
- class CArray
59
- # Returns the 1d index array for non-zero elements of self
60
- def where
61
- end
62
- end
56
+ /* @overload where
57
+
58
+ (Conversion)
59
+ Returns the 1d index array for non-zero elements of self
63
60
  */
64
61
 
65
62
  VALUE
@@ -245,8 +242,13 @@ rb_ca_seq_bang_object (int argc, VALUE *argv, VALUE self)
245
242
  return self;
246
243
  }
247
244
 
248
- /* rdoc:
249
- class CArray
245
+ /* @overload seq! (init_val=0, step=1) {|elem| ... }
246
+
247
+ (Conversion, Destructive)
248
+ Generates sequential data with initial value `init_val`
249
+ and step value `step`. For object array, if the second argument
250
+ is Symbol object, it will be interpreted as stepping method and
251
+ it is called for the last element in each step.
250
252
  # call-seq:
251
253
  # seq (init_val=0, step=1)
252
254
  # seq (init_val=0, step=1) {|x| ... }
@@ -258,12 +260,6 @@ rb_ca_seq_bang_object (int argc, VALUE *argv, VALUE self)
258
260
  # is Symbol object, it will be interpreted as stepping method and
259
261
  # it is called for the last element in each step.
260
262
  #
261
- def seq (init_val=0, step=1)
262
- end
263
- #
264
- def seq! (init_val=0, step=1)
265
- end
266
- end
267
263
  */
268
264
 
269
265
  static VALUE
@@ -339,6 +335,26 @@ rb_ca_seq_bang_method (int argc, VALUE *argv, VALUE self)
339
335
  return self;
340
336
  }
341
337
 
338
+ /* @overload seq (init_val=0, step=1) {|elem| ... }
339
+
340
+ (Conversion)
341
+ Generates sequential data with initial value `init_val`
342
+ and step value `step`. For object array, if the second argument
343
+ is Symbol object, it will be interpreted as stepping method and
344
+ it is called for the last element in each step.
345
+ # call-seq:
346
+ # seq (init_val=0, step=1)
347
+ # seq (init_val=0, step=1) {|x| ... }
348
+ # seq (init_val=0, step=A_symbol) ### for object array
349
+ # seq (init_val=0, step=A_symbol) {|x| ...} ### for object array
350
+ #
351
+ # Generates sequential data with initial value `init_val`
352
+ # and step value `step`. For object array, if the second argument
353
+ # is Symbol object, it will be interpreted as stepping method and
354
+ # it is called for the last element in each step.
355
+ #
356
+ */
357
+
342
358
  static VALUE
343
359
  rb_ca_seq_method (int argc, VALUE *argv, VALUE self)
344
360
  {
@@ -456,15 +472,10 @@ ca_swap_bytes (char *ptr, ca_size_t bytes, ca_size_t elements)
456
472
 
457
473
  }
458
474
 
459
- /* rdoc:
460
- class CArray
461
- # Swaps the byte order of each element.
462
- def swap_bytes
463
- end
464
- #
465
- def swap_bytes!
466
- end
467
- end
475
+ /* @overload swap_bytes!
476
+
477
+ (Conversion, Destructive)
478
+ Swaps the byte order of each element.
468
479
  */
469
480
 
470
481
  VALUE
@@ -553,6 +564,12 @@ rb_ca_swap_bytes_bang (VALUE self)
553
564
  return self;
554
565
  }
555
566
 
567
+ /* @overload swap_bytes
568
+
569
+ (Conversion)
570
+ Swaps the byte order of each element.
571
+ */
572
+
556
573
  VALUE
557
574
  rb_ca_swap_bytes (VALUE self)
558
575
  {
@@ -664,20 +681,17 @@ rb_ca_swap_bytes (VALUE self)
664
681
  } \
665
682
  } \
666
683
  } \
667
- } \
684
+ } \
668
685
  }
669
686
 
670
- /* rdoc:
671
- class CArray
672
- # trims the data into the range between min and max. If `fill_value`
673
- # is given, the element out of the range between min and max is filled
674
- # by `fill_value`
675
- def trim (min, max, fill_value=nil)
676
- end
677
- #
678
- def trim! (min, max, fill_value=nil)
679
- end
680
- end
687
+
688
+
689
+ /* @overload trim! (min, max, fill_value=nil)
690
+
691
+ (Conversion)
692
+ Trims the data into the range between min and max. If `fill_value`
693
+ is given, the element out of the range between min and max is filled
694
+ by `fill_value`
681
695
  */
682
696
 
683
697
  static VALUE
@@ -720,6 +734,14 @@ rb_ca_trim_bang (int argc, VALUE *argv, VALUE self)
720
734
  return self;
721
735
  }
722
736
 
737
+ /* @overload trim (min, max, fill_value=nil)
738
+
739
+ (Conversion)
740
+ Trims the data into the range between min and max. If `fill_value`
741
+ is given, the element out of the range between min and max is filled
742
+ by `fill_value`
743
+ */
744
+
723
745
  static VALUE
724
746
  rb_ca_trim (int argc, VALUE *argv, VALUE self)
725
747
  {
@@ -727,7 +749,6 @@ rb_ca_trim (int argc, VALUE *argv, VALUE self)
727
749
  return rb_ca_trim_bang(argc, argv, out);
728
750
  }
729
751
 
730
-
731
752
  void
732
753
  Init_carray_generate ()
733
754
  {
@@ -3,10 +3,8 @@
3
3
  carray_iterator.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
 
@@ -15,19 +13,19 @@
15
13
  VALUE rb_cCAIterator;
16
14
 
17
15
  int8_t
18
- ca_iter_rank (VALUE self)
16
+ ca_iter_ndim (VALUE self)
19
17
  {
20
- int8_t rank;
18
+ int8_t ndim;
21
19
  if ( TYPE(self) == T_DATA ) {
22
20
  CAIterator *it;
23
21
  Data_Get_Struct(self, CAIterator, it);
24
- rank = it->rank;
22
+ ndim = it->ndim;
25
23
  }
26
24
  else {
27
- VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
28
- rank = (int8_t) NUM2LONG(rrank);
25
+ VALUE rndim = rb_ivar_get(self, rb_intern("@ndim"));
26
+ ndim = (int8_t) NUM2LONG(rndim);
29
27
  }
30
- return rank;
28
+ return ndim;
31
29
  }
32
30
 
33
31
  void
@@ -37,16 +35,16 @@ ca_iter_dim (VALUE self, ca_size_t *dim)
37
35
  if ( TYPE(self) == T_DATA ) {
38
36
  CAIterator *it;
39
37
  Data_Get_Struct(self, CAIterator, it);
40
- for (i=0; i<it->rank; i++) {
38
+ for (i=0; i<it->ndim; i++) {
41
39
  dim[i] = it->dim[i];
42
40
  }
43
41
  }
44
42
  else {
45
- VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
43
+ VALUE rndim = rb_ivar_get(self, rb_intern("@ndim"));
46
44
  VALUE rdim = rb_ivar_get(self, rb_intern("@dim"));
47
- int8_t rank;
48
- rank = (int8_t) NUM2INT(rrank);
49
- for (i=0; i<rank; i++) {
45
+ int8_t ndim;
46
+ ndim = (int8_t) NUM2INT(rndim);
47
+ for (i=0; i<ndim; i++) {
50
48
  dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
51
49
  }
52
50
  }
@@ -60,16 +58,16 @@ ca_iter_elements (VALUE self)
60
58
  CAIterator *it;
61
59
  Data_Get_Struct(self, CAIterator, it);
62
60
  elements = 1;
63
- for (i=0; i<it->rank; i++) {
61
+ for (i=0; i<it->ndim; i++) {
64
62
  elements *= it->dim[i];
65
63
  }
66
64
  }
67
65
  else {
68
- VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
66
+ VALUE rndim = rb_ivar_get(self, rb_intern("@ndim"));
69
67
  VALUE rdim = rb_ivar_get(self, rb_intern("@dim"));
70
- int8_t rank = (int8_t) NUM2INT(rrank);
68
+ int8_t ndim = (int8_t) NUM2INT(rndim);
71
69
  elements = 1;
72
- for (i=0; i<rank; i++) {
70
+ for (i=0; i<ndim; i++) {
73
71
  elements *= NUM2SIZE(rb_ary_entry(rdim, i));
74
72
  }
75
73
  }
@@ -119,10 +117,10 @@ ca_iter_kernel_at_index (VALUE self, ca_size_t *idx, VALUE rref)
119
117
  }
120
118
  else {
121
119
  VALUE vidx;
122
- int8_t rank = ca_iter_rank(self);
120
+ int8_t ndim = ca_iter_ndim(self);
123
121
  int i;
124
- vidx = rb_ary_new2(rank);
125
- for (i=0; i<rank; i++) {
122
+ vidx = rb_ary_new2(ndim);
123
+ for (i=0; i<ndim; i++) {
126
124
  rb_ary_store(vidx, i, SIZE2NUM(idx[i]));
127
125
  }
128
126
  rker = rb_funcall(self, rb_intern("kernel_at_index"), 2,
@@ -161,10 +159,10 @@ ca_iter_kernel_move_to_index (VALUE self, ca_size_t *idx, VALUE rref)
161
159
  }
162
160
  else {
163
161
  VALUE vidx;
164
- int8_t rank = ca_iter_rank(self);
162
+ int8_t ndim = ca_iter_ndim(self);
165
163
  int i;
166
- vidx = rb_ary_new2(rank);
167
- for (i=0; i<rank; i++) {
164
+ vidx = rb_ary_new2(ndim);
165
+ for (i=0; i<ndim; i++) {
168
166
  rb_ary_store(vidx, i, SIZE2NUM(idx[i]));
169
167
  }
170
168
  rker = rb_funcall(self, rb_intern("kernel_move_to_index"), 2,
@@ -188,17 +186,17 @@ ca_iter_prepare_output (VALUE self, VALUE rtype, VALUE rbytes)
188
186
  if ( TYPE(self) == T_DATA ) {
189
187
  CAIterator *it;
190
188
  Data_Get_Struct(self, CAIterator, it);
191
- co = carray_new_safe(data_type, it->rank, it->dim, bytes, NULL);
189
+ co = carray_new_safe(data_type, it->ndim, it->dim, bytes, NULL);
192
190
  }
193
191
  else {
194
- VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
192
+ VALUE rndim = rb_ivar_get(self, rb_intern("@ndim"));
195
193
  VALUE rdim = rb_ivar_get(self, rb_intern("@dim"));
196
- int8_t rank = NUM2LONG(rrank);
194
+ int8_t ndim = NUM2LONG(rndim);
197
195
  ca_size_t dim[CA_RANK_MAX];
198
- for (i=0; i<rank; i++) {
196
+ for (i=0; i<ndim; i++) {
199
197
  dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
200
198
  }
201
- co = carray_new_safe(data_type, rank, dim, bytes, NULL);
199
+ co = carray_new_safe(data_type, ndim, dim, bytes, NULL);
202
200
  }
203
201
 
204
202
  obj = ca_wrap_struct(co);
@@ -209,21 +207,21 @@ ca_iter_prepare_output (VALUE self, VALUE rtype, VALUE rbytes)
209
207
 
210
208
  /* -------------------------------------------------------------------- */
211
209
 
212
- /* rdoc:
210
+ /* yard:
213
211
  class CAIterator
214
- def rank
212
+ def ndim
215
213
  end
216
214
  end
217
215
  */
218
216
 
219
217
 
220
218
  VALUE
221
- rb_ca_iter_rank (VALUE self)
219
+ rb_ca_iter_ndim (VALUE self)
222
220
  {
223
- return LONG2NUM(ca_iter_rank(self));
221
+ return LONG2NUM(ca_iter_ndim(self));
224
222
  }
225
223
 
226
- /* rdoc:
224
+ /* yard:
227
225
  class CAIterator
228
226
  def dim
229
227
  end
@@ -235,17 +233,17 @@ rb_ca_iter_dim (VALUE self)
235
233
  {
236
234
  VALUE rdim;
237
235
  ca_size_t dim[CA_RANK_MAX];
238
- int8_t rank = ca_iter_rank(self);
236
+ int8_t ndim = ca_iter_ndim(self);
239
237
  int i;
240
238
  ca_iter_dim(self, dim);
241
- rdim = rb_ary_new2(rank);
242
- for (i=0; i<rank; i++) {
239
+ rdim = rb_ary_new2(ndim);
240
+ for (i=0; i<ndim; i++) {
243
241
  rb_ary_store(rdim, i, SIZE2NUM(dim[i]));
244
242
  }
245
243
  return rdim;
246
244
  }
247
245
 
248
- /* rdoc:
246
+ /* yard:
249
247
  class CAIterator
250
248
  def elements
251
249
  end
@@ -258,7 +256,7 @@ rb_ca_iter_elements (VALUE self)
258
256
  return SIZE2NUM(ca_iter_elements(self));
259
257
  }
260
258
 
261
- /* rdoc:
259
+ /* yard:
262
260
  class CAIterator
263
261
  def reference
264
262
  end
@@ -271,7 +269,7 @@ rb_ca_iter_reference (VALUE self)
271
269
  return ca_iter_reference(self);
272
270
  }
273
271
 
274
- /* rdoc:
272
+ /* yard:
275
273
  class CAIterator
276
274
  def kernel_at_addr
277
275
  end
@@ -289,7 +287,7 @@ rb_ca_iter_kernel_at_addr (int argc, VALUE *argv, VALUE self)
289
287
  return ca_iter_kernel_at_addr(self, NUM2SIZE(raddr), rcarray);
290
288
  }
291
289
 
292
- /* rdoc:
290
+ /* yard:
293
291
  class CAIterator
294
292
  def kernel_at_index
295
293
  end
@@ -301,7 +299,7 @@ rb_ca_iter_kernel_at_index (int argc, VALUE *argv, VALUE self)
301
299
  {
302
300
  volatile VALUE rindex, rcarray;
303
301
  ca_size_t idx[CA_RANK_MAX];
304
- int8_t rank = ca_iter_rank(self);
302
+ int8_t ndim = ca_iter_ndim(self);
305
303
  int i;
306
304
 
307
305
  rb_scan_args(argc, argv, "11", (VALUE *) &rindex, (VALUE *) &rcarray);
@@ -310,14 +308,14 @@ rb_ca_iter_kernel_at_index (int argc, VALUE *argv, VALUE self)
310
308
  rcarray = rb_ca_iter_reference(self);
311
309
  }
312
310
 
313
- for (i=0; i<rank; i++) {
311
+ for (i=0; i<ndim; i++) {
314
312
  idx[i] = NUM2SIZE(rb_ary_entry(rindex, i));
315
313
  }
316
314
 
317
315
  return ca_iter_kernel_at_index(self, idx, rcarray);
318
316
  }
319
317
 
320
- /* rdoc:
318
+ /* yard:
321
319
  class CAIterator
322
320
  def kernel_move_to_addr
323
321
  end
@@ -330,7 +328,7 @@ rb_ca_iter_kernel_move_to_addr (VALUE self, VALUE raddr, VALUE rker)
330
328
  return ca_iter_kernel_move_to_addr(self, NUM2SIZE(raddr), rker);
331
329
  }
332
330
 
333
- /* rdoc:
331
+ /* yard:
334
332
  class CAIterator
335
333
  def kernel_move_to_index
336
334
  end
@@ -341,17 +339,17 @@ VALUE
341
339
  rb_ca_iter_kernel_move_to_index (VALUE self, VALUE rindex, VALUE rker)
342
340
  {
343
341
  ca_size_t idx[CA_RANK_MAX];
344
- int8_t rank = ca_iter_rank(self);
342
+ int8_t ndim = ca_iter_ndim(self);
345
343
  int i;
346
344
 
347
- for (i=0; i<rank; i++) {
345
+ for (i=0; i<ndim; i++) {
348
346
  idx[i] = NUM2SIZE(rb_ary_entry(rindex, i));
349
347
  }
350
348
 
351
349
  return ca_iter_kernel_move_to_index(self, idx, rker);
352
350
  }
353
351
 
354
- /* rdoc:
352
+ /* yard:
355
353
  class CAIterator
356
354
  def prepare_output
357
355
  end
@@ -371,7 +369,7 @@ rb_ca_iter_prepare_output (int argc, VALUE *argv, VALUE self)
371
369
 
372
370
  /* -------------------------------------------------------------------- */
373
371
 
374
- /* rdoc:
372
+ /* yard:
375
373
  class CAIterator
376
374
  def calculate
377
375
  end
@@ -470,7 +468,7 @@ rb_ca_iter_calculate (int argc, VALUE *argv, VALUE self)
470
468
  return routput;
471
469
  }
472
470
 
473
- /* rdoc:
471
+ /* yard:
474
472
  class CAIterator
475
473
  def filter
476
474
  end
@@ -501,7 +499,7 @@ rb_ca_iter_filter (int argc, VALUE *argv, VALUE self)
501
499
  argc--;
502
500
  argv++;
503
501
 
504
- co = carray_new(data_type, cr->rank, cr->dim, 0, NULL);
502
+ co = carray_new(data_type, cr->ndim, cr->dim, 0, NULL);
505
503
  routput = ca_wrap_struct(co);
506
504
 
507
505
  if ( NIL_P(argv[0]) ) {
@@ -547,7 +545,7 @@ rb_ca_iter_filter (int argc, VALUE *argv, VALUE self)
547
545
  return routput;
548
546
  }
549
547
 
550
- /* rdoc:
548
+ /* yard:
551
549
  class CAIterator
552
550
  def evaluate
553
551
  end
@@ -606,8 +604,10 @@ Init_carray_iterator ()
606
604
  {
607
605
  rb_cCAIterator = rb_define_class("CAIterator", rb_cObject);
608
606
 
609
- rb_define_method(rb_cCAIterator, "rank", rb_ca_iter_rank, 0);
607
+ rb_define_method(rb_cCAIterator, "ndim", rb_ca_iter_ndim, 0);
608
+ rb_define_method(rb_cCAIterator, "rank", rb_ca_iter_ndim, 0); /* alias */
610
609
  rb_define_method(rb_cCAIterator, "dim", rb_ca_iter_dim, 0);
610
+ rb_define_method(rb_cCAIterator, "shape", rb_ca_iter_dim, 0); /* alias */
611
611
  rb_define_method(rb_cCAIterator, "elements", rb_ca_iter_elements, 0);
612
612
  rb_define_method(rb_cCAIterator, "reference", rb_ca_iter_reference, 0);
613
613