carray 1.3.5 → 1.5.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (195) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSES +22 -0
  3. data/README.md +18 -21
  4. data/Rakefile +31 -0
  5. data/carray.gemspec +13 -26
  6. data/{ca_iter_block.c → ext/ca_iter_block.c} +13 -13
  7. data/{ca_iter_dimension.c → ext/ca_iter_dimension.c} +16 -16
  8. data/{ca_iter_window.c → ext/ca_iter_window.c} +10 -10
  9. data/{ca_obj_array.c → ext/ca_obj_array.c} +60 -55
  10. data/{ca_obj_bitarray.c → ext/ca_obj_bitarray.c} +12 -12
  11. data/{ca_obj_bitfield.c → ext/ca_obj_bitfield.c} +7 -7
  12. data/{ca_obj_block.c → ext/ca_obj_block.c} +42 -42
  13. data/{ca_obj_fake.c → ext/ca_obj_fake.c} +7 -7
  14. data/{ca_obj_farray.c → ext/ca_obj_farray.c} +18 -18
  15. data/{ca_obj_field.c → ext/ca_obj_field.c} +15 -15
  16. data/{ca_obj_grid.c → ext/ca_obj_grid.c} +27 -27
  17. data/{ca_obj_mapping.c → ext/ca_obj_mapping.c} +9 -9
  18. data/{ca_obj_object.c → ext/ca_obj_object.c} +37 -37
  19. data/{ca_obj_reduce.c → ext/ca_obj_reduce.c} +1 -1
  20. data/{ca_obj_refer.c → ext/ca_obj_refer.c} +33 -33
  21. data/{ca_obj_repeat.c → ext/ca_obj_repeat.c} +43 -43
  22. data/{ca_obj_select.c → ext/ca_obj_select.c} +2 -2
  23. data/{ca_obj_shift.c → ext/ca_obj_shift.c} +23 -23
  24. data/{ca_obj_transpose.c → ext/ca_obj_transpose.c} +23 -23
  25. data/{ca_obj_unbound_repeat.c → ext/ca_obj_unbound_repeat.c} +55 -55
  26. data/{ca_obj_window.c → ext/ca_obj_window.c} +26 -26
  27. data/{carray.h → ext/carray.h} +77 -51
  28. data/{carray_access.c → ext/carray_access.c} +133 -91
  29. data/{carray_attribute.c → ext/carray_attribute.c} +12 -12
  30. data/{carray_call_cfunc.c → ext/carray_call_cfunc.c} +0 -0
  31. data/{carray_cast.c → ext/carray_cast.c} +6 -6
  32. data/{carray_cast_func.rb → ext/carray_cast_func.rb} +0 -0
  33. data/{carray_class.c → ext/carray_class.c} +0 -0
  34. data/{carray_conversion.c → ext/carray_conversion.c} +11 -13
  35. data/{carray_copy.c → ext/carray_copy.c} +19 -19
  36. data/{carray_core.c → ext/carray_core.c} +2 -2
  37. data/ext/carray_data_type.c +66 -0
  38. data/{carray_element.c → ext/carray_element.c} +9 -9
  39. data/{carray_generate.c → ext/carray_generate.c} +67 -1
  40. data/{carray_iterator.c → ext/carray_iterator.c} +40 -38
  41. data/{carray_loop.c → ext/carray_loop.c} +24 -24
  42. data/{carray_mask.c → ext/carray_mask.c} +17 -6
  43. data/{carray_math.rb → ext/carray_math.rb} +25 -25
  44. data/ext/{mathfunc/carray_mathfunc.c → carray_mathfunc.c} +0 -0
  45. data/{carray_numeric.c → ext/carray_numeric.c} +1 -1
  46. data/{carray_operator.c → ext/carray_operator.c} +32 -9
  47. data/{carray_order.c → ext/carray_order.c} +2 -153
  48. data/{carray_sort_addr.c → ext/carray_sort_addr.c} +0 -0
  49. data/{carray_stat.c → ext/carray_stat.c} +5 -5
  50. data/{carray_stat_proc.rb → ext/carray_stat_proc.rb} +23 -23
  51. data/{carray_test.c → ext/carray_test.c} +22 -21
  52. data/{carray_undef.c → ext/carray_undef.c} +0 -0
  53. data/{carray_utils.c → ext/carray_utils.c} +0 -0
  54. data/{extconf.rb → ext/extconf.rb} +0 -5
  55. data/{mkmath.rb → ext/mkmath.rb} +12 -2
  56. data/{ruby_carray.c → ext/ruby_carray.c} +9 -2
  57. data/{ruby_ccomplex.c → ext/ruby_ccomplex.c} +0 -0
  58. data/{ruby_float_func.c → ext/ruby_float_func.c} +0 -0
  59. data/{version.h → ext/version.h} +5 -5
  60. data/{version.rb → ext/version.rb} +0 -0
  61. data/lib/carray.rb +49 -7
  62. data/lib/carray/{base/autoload.rb → autoload.rb} +48 -6
  63. data/lib/carray/autoload/autoload_base.rb +1 -5
  64. data/lib/carray/autoload/autoload_gem_cairo.rb +9 -0
  65. data/lib/carray/autoload/autoload_gem_ffi.rb +9 -0
  66. data/lib/carray/autoload/autoload_gem_gnuplot.rb +2 -0
  67. data/lib/carray/autoload/autoload_gem_io_csv.rb +14 -0
  68. data/lib/carray/autoload/autoload_gem_io_pg.rb +6 -0
  69. data/lib/carray/autoload/autoload_gem_io_sqlite3.rb +12 -0
  70. data/lib/carray/autoload/autoload_gem_narray.rb +10 -0
  71. data/lib/carray/autoload/autoload_gem_numo_narray.rb +15 -0
  72. data/lib/carray/autoload/autoload_gem_opencv.rb +16 -0
  73. data/lib/carray/autoload/autoload_gem_random.rb +8 -0
  74. data/lib/carray/autoload/autoload_gem_rmagick.rb +23 -0
  75. data/lib/carray/autoload/{autoload_graphics_zimg.rb → autoload_gem_zimg.rb} +0 -0
  76. data/lib/carray/basic.rb +193 -0
  77. data/lib/carray/compose.rb +291 -0
  78. data/lib/carray/construct.rb +445 -0
  79. data/lib/carray/convert.rb +115 -0
  80. data/lib/carray/{base/inspect.rb → inspect.rb} +6 -6
  81. data/lib/carray/io/imagemagick.rb +1 -1
  82. data/lib/carray/{base/iterator.rb → iterator.rb} +3 -3
  83. data/lib/carray/mask.rb +91 -0
  84. data/lib/carray/{base/math.rb → math.rb} +17 -47
  85. data/lib/carray/math/histogram.rb +7 -7
  86. data/lib/carray/mkmf.rb +8 -0
  87. data/lib/carray/object/ca_obj_pack.rb +8 -8
  88. data/lib/carray/obsolete.rb +272 -0
  89. data/lib/carray/ordering.rb +157 -0
  90. data/lib/carray/{base/serialize.rb → serialize.rb} +28 -53
  91. data/lib/carray/string.rb +190 -0
  92. data/lib/carray/{base/struct.rb → struct.rb} +20 -20
  93. data/lib/carray/{io/table.rb → table.rb} +1 -9
  94. data/lib/carray/testing.rb +56 -0
  95. data/lib/carray/time.rb +78 -0
  96. data/lib/carray/transform.rb +100 -0
  97. data/misc/Methods.ja.md +182 -0
  98. data/{NOTE → misc/NOTE} +0 -0
  99. data/test/test_ALL.rb +0 -2
  100. data/test/test_order.rb +7 -7
  101. data/test/test_ref_store.rb +13 -13
  102. data/test/test_stat.rb +7 -15
  103. data/{devel → utils}/guess_shape.rb +0 -0
  104. data/utils/{diff_method.rb → monkey_patch_methods.rb} +17 -7
  105. metadata +100 -254
  106. data/COPYING +0 -56
  107. data/GPL +0 -340
  108. data/Gemfile +0 -8
  109. data/Gemfile.lock +0 -33
  110. data/LEGAL +0 -50
  111. data/TODO +0 -5
  112. data/carray_random.c +0 -531
  113. data/ext/calculus/carray_calculus.c +0 -931
  114. data/ext/calculus/carray_interp.c +0 -358
  115. data/ext/calculus/extconf.rb +0 -12
  116. data/ext/calculus/lib/autoload/autoload_math_calculus.rb +0 -2
  117. data/ext/calculus/lib/math/calculus.rb +0 -119
  118. data/ext/calculus/lib/math/interp/adapter_interp1d.rb +0 -31
  119. data/ext/fortio/extconf.rb +0 -3
  120. data/ext/fortio/lib/carray/autoload/autoload_fortran_format.rb +0 -5
  121. data/ext/fortio/lib/carray/io/fortran_format.rb +0 -43
  122. data/ext/fortio/lib/fortio.rb +0 -3
  123. data/ext/fortio/lib/fortio/fortran_format.rb +0 -605
  124. data/ext/fortio/lib/fortio/fortran_format.tab.rb +0 -536
  125. data/ext/fortio/lib/fortio/fortran_format.y +0 -215
  126. data/ext/fortio/lib/fortio/fortran_namelist.rb +0 -151
  127. data/ext/fortio/lib/fortio/fortran_namelist.tab.rb +0 -470
  128. data/ext/fortio/lib/fortio/fortran_namelist.y +0 -213
  129. data/ext/fortio/lib/fortio/fortran_sequential.rb +0 -345
  130. data/ext/fortio/ruby_fortio.c +0 -182
  131. data/ext/fortio/test/test_H.rb +0 -5
  132. data/ext/fortio/test/test_T.rb +0 -7
  133. data/ext/fortio/test/test_fortran_format.rb +0 -86
  134. data/ext/fortio/test/test_namelist.rb +0 -25
  135. data/ext/fortio/test/test_namelist_write.rb +0 -10
  136. data/ext/fortio/test/test_sequential.rb +0 -13
  137. data/ext/fortio/test/test_sequential2.rb +0 -13
  138. data/ext/fortio/work/test.rb +0 -10
  139. data/ext/fortio/work/test_e.rb +0 -19
  140. data/ext/fortio/work/test_ep.rb +0 -10
  141. data/ext/fortio/work/test_parse.rb +0 -12
  142. data/ext/imagemap/carray_imagemap.c +0 -495
  143. data/ext/imagemap/doc/call_graph.dot +0 -28
  144. data/ext/imagemap/draw.c +0 -567
  145. data/ext/imagemap/extconf.rb +0 -13
  146. data/ext/imagemap/lib/autoload/autoload_graphics_imagemap.rb +0 -1
  147. data/ext/imagemap/lib/graphics/imagemap.rb +0 -273
  148. data/ext/imagemap/lib/image_map.rb +0 -4
  149. data/ext/imagemap/test/swath_index.rb +0 -83
  150. data/ext/imagemap/test/swath_warp.rb +0 -99
  151. data/ext/imagemap/test/test.rb +0 -23
  152. data/ext/imagemap/test/test_image.rb +0 -42
  153. data/ext/imagemap/test/test_line.rb +0 -14
  154. data/ext/imagemap/test/test_rotate.rb +0 -17
  155. data/ext/imagemap/test/test_triangle.rb +0 -20
  156. data/ext/imagemap/test/test_warp.rb +0 -26
  157. data/ext/mathfunc/extconf.rb +0 -18
  158. data/ext/mathfunc/lib/autoload/autoload_math_mathfunc.rb +0 -1
  159. data/ext/mathfunc/lib/math/mathfunc.rb +0 -15
  160. data/ext/mathfunc/test/test_hypot.rb +0 -5
  161. data/ext/mathfunc/test/test_j0.rb +0 -22
  162. data/ext/mathfunc/test/test_jn.rb +0 -8
  163. data/ext/mathfunc/test/test_sph.rb +0 -9
  164. data/ext/narray/README +0 -22
  165. data/ext/narray/ca_wrap_narray.c +0 -500
  166. data/ext/narray/carray_narray.c +0 -21
  167. data/ext/narray/extconf.rb +0 -57
  168. data/ext/narray/lib/autoload/autoload_math_narray.rb +0 -1
  169. data/ext/narray/lib/autoload/autoload_math_narray_miss.rb +0 -11
  170. data/ext/narray/lib/math/narray.rb +0 -17
  171. data/ext/narray/lib/math/narray_miss.rb +0 -45
  172. data/lib/carray/autoload/autoload_graphics_gnuplot.rb +0 -2
  173. data/lib/carray/autoload/autoload_io_csv.rb +0 -14
  174. data/lib/carray/autoload/autoload_io_pg.rb +0 -6
  175. data/lib/carray/autoload/autoload_io_sqlite3.rb +0 -12
  176. data/lib/carray/autoload/autoload_io_table.rb +0 -1
  177. data/lib/carray/autoload/autoload_math_interp.rb +0 -4
  178. data/lib/carray/base/basic.rb +0 -1090
  179. data/lib/carray/base/obsolete.rb +0 -131
  180. data/lib/carray/graphics/gnuplot.rb +0 -2131
  181. data/lib/carray/graphics/zimg.rb +0 -296
  182. data/lib/carray/io/csv.rb +0 -572
  183. data/lib/carray/io/pg.rb +0 -101
  184. data/lib/carray/io/sqlite3.rb +0 -215
  185. data/lib/carray/math/interp.rb +0 -57
  186. data/lib/carray/math/interp/adapter_gsl_spline.rb +0 -47
  187. data/mt19937ar.c +0 -182
  188. data/mt19937ar.h +0 -86
  189. data/rdoc_main.rb +0 -27
  190. data/rdoc_math.rb +0 -5
  191. data/rdoc_stat.rb +0 -31
  192. data/test/test_narray.rb +0 -64
  193. data/test/test_random.rb +0 -15
  194. data/utils/create_rdoc.sh +0 -9
  195. data/utils/make_tgz.sh +0 -3
@@ -22,7 +22,7 @@ VALUE rb_cCASelect;
22
22
  typedef struct {
23
23
  int16_t obj_type;
24
24
  int8_t data_type;
25
- int8_t rank;
25
+ int8_t ndim;
26
26
  int32_t flags;
27
27
  ca_size_t bytes;
28
28
  ca_size_t elements;
@@ -58,7 +58,7 @@ ca_select_setup (CASelect *ca, CArray *parent, CArray *select, int share)
58
58
  ca->obj_type = CA_OBJ_SELECT;
59
59
  ca->data_type = data_type;
60
60
  ca->flags = 0;
61
- ca->rank = 1;
61
+ ca->ndim = 1;
62
62
  ca->bytes = bytes;
63
63
 
64
64
  if ( share && ca_is_entity(select) ) {
@@ -22,7 +22,7 @@ static VALUE rb_cCAShift;
22
22
  typedef struct {
23
23
  int16_t obj_type;
24
24
  int8_t data_type;
25
- int8_t rank;
25
+ int8_t ndim;
26
26
  int32_t flags;
27
27
  ca_size_t bytes;
28
28
  ca_size_t elements;
@@ -47,35 +47,35 @@ int
47
47
  ca_shift_setup (CAShift *ca, CArray *parent,
48
48
  ca_size_t *shift, char *fill, int8_t *roll)
49
49
  {
50
- int8_t data_type, rank;
50
+ int8_t data_type, ndim;
51
51
  ca_size_t elements, bytes;
52
52
 
53
53
  data_type = parent->data_type;
54
54
  bytes = parent->bytes;
55
- rank = parent->rank;
55
+ ndim = parent->ndim;
56
56
  elements = parent->elements;
57
57
 
58
58
 
59
59
  ca->obj_type = CA_OBJ_SHIFT;
60
60
  ca->data_type = data_type;
61
61
  ca->flags = 0;
62
- ca->rank = rank;
62
+ ca->ndim = ndim;
63
63
  ca->bytes = bytes;
64
64
  ca->elements = elements;
65
65
  ca->ptr = NULL;
66
66
  ca->mask = NULL;
67
- ca->dim = ALLOC_N(ca_size_t, rank);
67
+ ca->dim = ALLOC_N(ca_size_t, ndim);
68
68
 
69
69
  ca->parent = parent;
70
70
  ca->attach = 0;
71
71
  ca->nosync = 0;
72
- ca->shift = ALLOC_N(ca_size_t, rank);
72
+ ca->shift = ALLOC_N(ca_size_t, ndim);
73
73
  ca->fill = ALLOC_N(char, ca->bytes);
74
- ca->roll = ALLOC_N(int8_t, rank);
74
+ ca->roll = ALLOC_N(int8_t, ndim);
75
75
 
76
- memcpy(ca->dim, parent->dim, rank * sizeof(ca_size_t));
77
- memcpy(ca->shift, shift, rank * sizeof(ca_size_t));
78
- memcpy(ca->roll, roll, rank * sizeof(int8_t));
76
+ memcpy(ca->dim, parent->dim, ndim * sizeof(ca_size_t));
77
+ memcpy(ca->shift, shift, ndim * sizeof(ca_size_t));
78
+ memcpy(ca->roll, roll, ndim * sizeof(int8_t));
79
79
 
80
80
  if ( fill ) {
81
81
  ca->fill_mask = 0;
@@ -194,7 +194,7 @@ ca_shift_func_ptr_at_index (void *ap, ca_size_t *idx)
194
194
  int8_t i;
195
195
  ca_size_t k, n;
196
196
  n = 0;
197
- for (i=0; i<ca->rank; i++) {
197
+ for (i=0; i<ca->ndim; i++) {
198
198
  k = idx[i];
199
199
  if ( roll[i] ) {
200
200
  k = ca_shift_rolled_index(ca, i, k);
@@ -230,7 +230,7 @@ ca_shift_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
230
230
  int8_t i;
231
231
  ca_size_t k, n;
232
232
  n = 0;
233
- for (i=0; i<ca->rank; i++) {
233
+ for (i=0; i<ca->ndim; i++) {
234
234
  k = idx[i];
235
235
  if ( roll[i] ) {
236
236
  k = ca_shift_rolled_index(ca, i, k);
@@ -257,7 +257,7 @@ ca_shift_func_store_index (void *ap, ca_size_t *idx, void *ptr)
257
257
  int8_t i;
258
258
  ca_size_t k, n;
259
259
  n = 0;
260
- for (i=0; i<ca->rank; i++) {
260
+ for (i=0; i<ca->ndim; i++) {
261
261
  k = idx[i];
262
262
  if ( roll[i] ) {
263
263
  k = ca_shift_rolled_index(ca, i, k);
@@ -402,7 +402,7 @@ ca_shift_attach_loop (CAShift *ca, int16_t level, ca_size_t *idx, ca_size_t *idx
402
402
  int8_t roll = ca->roll[level];
403
403
  ca_size_t i;
404
404
 
405
- if ( level == ca->rank - 1 ) {
405
+ if ( level == ca->ndim - 1 ) {
406
406
  if ( fill ) {
407
407
  for (i=0; i<ca->dim[level]; i++) {
408
408
  idx[level] = i;
@@ -561,7 +561,7 @@ ca_shift_sync_loop (CAShift *ca, int16_t level, ca_size_t *idx, ca_size_t *idx0)
561
561
  int8_t roll = ca->roll[level];
562
562
  ca_size_t i;
563
563
 
564
- if ( level == ca->rank - 1 ) {
564
+ if ( level == ca->ndim - 1 ) {
565
565
  if ( ! shift ) {
566
566
  idx[level] = 0;
567
567
  idx0[level] = 0;
@@ -705,7 +705,7 @@ ca_shift_fill_loop (CAShift *ca, char *ptr,
705
705
  int8_t roll = ca->roll[level];
706
706
  ca_size_t i;
707
707
 
708
- if ( level == ca->rank - 1 ) {
708
+ if ( level == ca->ndim - 1 ) {
709
709
  if ( ( ! shift ) || roll ) {
710
710
  for (i=0; i<dim; i++) {
711
711
  idx0[level] = i;
@@ -851,11 +851,11 @@ rb_ca_shift (int argc, VALUE *argv, VALUE self)
851
851
  ropt = rb_pop_options(&argc, &argv);
852
852
  rb_scan_options(ropt, "roll,fill_value", &rroll, &rfval);
853
853
 
854
- if ( argc != ca->rank ) {
855
- rb_raise(rb_eArgError, "# of arguments mismatch with rank");
854
+ if ( argc != ca->ndim ) {
855
+ rb_raise(rb_eArgError, "# of arguments mismatch with ndim");
856
856
  }
857
857
 
858
- for (i=0; i<ca->rank; i++) {
858
+ for (i=0; i<ca->ndim; i++) {
859
859
  shift[i] = NUM2SIZE(argv[i]);
860
860
  }
861
861
 
@@ -889,18 +889,18 @@ rb_ca_shift (int argc, VALUE *argv, VALUE self)
889
889
  }
890
890
 
891
891
  if ( NIL_P(rroll) ) {
892
- for (i=0; i<ca->rank; i++) {
892
+ for (i=0; i<ca->ndim; i++) {
893
893
  roll[i] = 0;
894
894
  }
895
895
  }
896
896
  else {
897
897
  Check_Type(rroll, T_ARRAY);
898
898
 
899
- if ( RARRAY_LEN(rroll) != ca->rank ) {
900
- rb_raise(rb_eArgError, "# of arguments mismatch with rank");
899
+ if ( RARRAY_LEN(rroll) != ca->ndim ) {
900
+ rb_raise(rb_eArgError, "# of arguments mismatch with ndim");
901
901
  }
902
902
 
903
- for (i=0; i<ca->rank; i++) {
903
+ for (i=0; i<ca->ndim; i++) {
904
904
  roll[i] = NUM2INT(rb_ary_entry(rroll, i));
905
905
  }
906
906
  }
@@ -15,7 +15,7 @@
15
15
  typedef struct {
16
16
  int16_t obj_type;
17
17
  int8_t data_type;
18
- int8_t rank;
18
+ int8_t ndim;
19
19
  int32_t flags;
20
20
  ca_size_t bytes;
21
21
  ca_size_t elements;
@@ -44,7 +44,7 @@ static VALUE rb_cCATrans;
44
44
  int
45
45
  ca_trans_setup (CATrans *ca, CArray *parent, ca_size_t *imap)
46
46
  {
47
- int8_t data_type, rank;
47
+ int8_t data_type, ndim;
48
48
  ca_size_t bytes, elements;
49
49
  ca_size_t *dim0;
50
50
  ca_size_t newdim[CA_RANK_MAX];
@@ -54,17 +54,17 @@ ca_trans_setup (CATrans *ca, CArray *parent, ca_size_t *imap)
54
54
 
55
55
  data_type = parent->data_type;
56
56
  bytes = parent->bytes;
57
- rank = parent->rank;
57
+ ndim = parent->ndim;
58
58
  elements = parent->elements;
59
59
  dim0 = parent->dim;
60
60
 
61
- for (i=0; i<rank; i++) {
61
+ for (i=0; i<ndim; i++) {
62
62
  map[i] = -1;
63
63
  }
64
64
 
65
- for (i=0; i<rank; i++) {
65
+ for (i=0; i<ndim; i++) {
66
66
  idim = imap[i];
67
- if ( idim < 0 || idim >= rank ) {
67
+ if ( idim < 0 || idim >= ndim ) {
68
68
  rb_raise(rb_eRuntimeError,
69
69
  "specified %i-th dimension number out of range", i);
70
70
  }
@@ -78,28 +78,28 @@ ca_trans_setup (CATrans *ca, CArray *parent, ca_size_t *imap)
78
78
  }
79
79
 
80
80
  step = 1;
81
- for (i=imap[rank-1]+1; i<rank; i++) {
81
+ for (i=imap[ndim-1]+1; i<ndim; i++) {
82
82
  step *= dim0[i];
83
83
  }
84
84
 
85
85
  ca->obj_type = CA_OBJ_TRANSPOSE;
86
86
  ca->data_type = data_type;
87
87
  ca->flags = 0;
88
- ca->rank = rank;
88
+ ca->ndim = ndim;
89
89
  ca->bytes = bytes;
90
90
  ca->elements = elements;
91
91
  ca->ptr = NULL;
92
92
  ca->mask = NULL;
93
- ca->dim = ALLOC_N(ca_size_t, rank);
93
+ ca->dim = ALLOC_N(ca_size_t, ndim);
94
94
 
95
95
  ca->parent = parent;
96
96
  ca->attach = 0;
97
97
  ca->nosync = 0;
98
- ca->imap = ALLOC_N(ca_size_t, rank);
98
+ ca->imap = ALLOC_N(ca_size_t, ndim);
99
99
  ca->step = step;
100
100
 
101
- memcpy(ca->dim, newdim, rank * sizeof(ca_size_t));
102
- memcpy(ca->imap, imap, rank * sizeof(ca_size_t));
101
+ memcpy(ca->dim, newdim, ndim * sizeof(ca_size_t));
102
+ memcpy(ca->imap, imap, ndim * sizeof(ca_size_t));
103
103
 
104
104
  if ( ca_has_mask(parent) ) {
105
105
  ca_create_mask(ca);
@@ -167,7 +167,7 @@ ca_trans_func_ptr_at_index (void *ap, ca_size_t *idx)
167
167
  ca_size_t *imap = ca->imap;
168
168
  ca_size_t idx0[CA_RANK_MAX];
169
169
  int8_t i;
170
- for (i=0; i<ca->rank; i++) {
170
+ for (i=0; i<ca->ndim; i++) {
171
171
  idx0[imap[i]] = idx[i];
172
172
  }
173
173
  return ca_ptr_at_index(ca->parent, idx0);
@@ -181,7 +181,7 @@ ca_trans_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
181
181
  ca_size_t *imap = ca->imap;
182
182
  ca_size_t idx0[CA_RANK_MAX];
183
183
  int8_t i;
184
- for (i=0; i<ca->rank; i++) {
184
+ for (i=0; i<ca->ndim; i++) {
185
185
  idx0[imap[i]] = idx[i];
186
186
  }
187
187
  ca_fetch_index(ca->parent, idx0, ptr);
@@ -194,7 +194,7 @@ ca_trans_func_store_index (void *ap, ca_size_t *idx, void *ptr)
194
194
  ca_size_t *imap = ca->imap;
195
195
  ca_size_t idx0[CA_RANK_MAX];
196
196
  int8_t i;
197
- for (i=0; i<ca->rank; i++) {
197
+ for (i=0; i<ca->ndim; i++) {
198
198
  idx0[imap[i]] = idx[i];
199
199
  }
200
200
  ca_store_index(ca->parent, idx0, ptr);
@@ -311,7 +311,7 @@ ca_trans_attach_loop (CATrans *ca, int8_t level, ca_size_t *idx, ca_size_t *idx0
311
311
  ca_size_t *imap = ca->imap;
312
312
  ca_size_t i;
313
313
 
314
- if ( level == ca->rank - 1 ) {
314
+ if ( level == ca->ndim - 1 ) {
315
315
  idx[level] = 0;
316
316
  idx0[imap[level]] = 0;
317
317
  switch ( ca->bytes ) {
@@ -392,7 +392,7 @@ ca_trans_sync_loop (CATrans *ca, int8_t level, ca_size_t *idx, ca_size_t *idx0)
392
392
  ca_size_t *imap = ca->imap;
393
393
  ca_size_t i;
394
394
 
395
- if ( level == ca->rank - 1 ) {
395
+ if ( level == ca->ndim - 1 ) {
396
396
  idx[level] = 0;
397
397
  idx0[imap[level]] = 0;
398
398
  switch ( ca->bytes ) {
@@ -473,7 +473,7 @@ ca_trans_fill_loop (CATrans *ca, char *ptr,
473
473
  ca_size_t *imap = ca->imap;
474
474
  ca_size_t i;
475
475
 
476
- if ( level == ca->rank - 1 ) {
476
+ if ( level == ca->ndim - 1 ) {
477
477
  for (i=0; i<ca->dim[level]; i++) {
478
478
  idx0[imap[level]] = i;
479
479
  memcpy(ca_ptr_at_index(ca->parent, idx0), ptr, ca->bytes);
@@ -529,17 +529,17 @@ rb_ca_trans (int argc, VALUE *argv, VALUE self)
529
529
  Data_Get_Struct(self, CArray, ca);
530
530
 
531
531
  if ( argc == 0 ) {
532
- for (i=0; i<ca->rank; i++) {
533
- imap[i] = ca->rank - i - 1;
532
+ for (i=0; i<ca->ndim; i++) {
533
+ imap[i] = ca->ndim - i - 1;
534
534
  }
535
535
  }
536
- else if ( argc == ca->rank ) {
537
- for (i=0; i<ca->rank; i++) {
536
+ else if ( argc == ca->ndim ) {
537
+ for (i=0; i<ca->ndim; i++) {
538
538
  imap[i] = NUM2SIZE(argv[i]);
539
539
  }
540
540
  }
541
541
  else {
542
- rb_raise(rb_eArgError, "# of arguments should be equal to rank");
542
+ rb_raise(rb_eArgError, "# of arguments should be equal to ndim");
543
543
  }
544
544
 
545
545
  obj = rb_ca_trans_new(self, imap);
@@ -21,39 +21,39 @@ VALUE rb_cCAUnboundRepeat;
21
21
 
22
22
  int
23
23
  ca_ubrep_setup (CAUnboundRepeat *ca, CArray *parent,
24
- int32_t rep_rank, ca_size_t *rep_dim)
24
+ int32_t rep_ndim, ca_size_t *rep_dim)
25
25
  {
26
- int8_t data_type, rank;
26
+ int8_t data_type, ndim;
27
27
  ca_size_t bytes, elements;
28
28
 
29
29
  /* check arguments */
30
30
 
31
- CA_CHECK_RANK(rep_rank);
31
+ CA_CHECK_RANK(rep_ndim);
32
32
 
33
33
  data_type = parent->data_type;
34
34
  bytes = parent->bytes;
35
- rank = parent->rank;
35
+ ndim = parent->ndim;
36
36
  elements = parent->elements;
37
37
 
38
38
  ca->obj_type = CA_OBJ_UNBOUND_REPEAT;
39
39
  ca->data_type = data_type;
40
40
  ca->flags = 0;
41
- ca->rank = rank;
41
+ ca->ndim = ndim;
42
42
  ca->bytes = bytes;
43
43
  ca->elements = elements;
44
44
  ca->ptr = NULL;
45
45
  ca->mask = NULL;
46
- ca->dim = ALLOC_N(ca_size_t, rank);
46
+ ca->dim = ALLOC_N(ca_size_t, ndim);
47
47
 
48
48
  ca->parent = parent;
49
49
  ca->attach = 0;
50
50
  ca->nosync = 0;
51
51
 
52
- ca->rep_rank = rep_rank;
53
- ca->rep_dim = ALLOC_N(ca_size_t, rep_rank);
52
+ ca->rep_ndim = rep_ndim;
53
+ ca->rep_dim = ALLOC_N(ca_size_t, rep_ndim);
54
54
 
55
- memcpy(ca->dim, parent->dim, rank * sizeof(ca_size_t));
56
- memcpy(ca->rep_dim, rep_dim, rep_rank * sizeof(ca_size_t));
55
+ memcpy(ca->dim, parent->dim, ndim * sizeof(ca_size_t));
56
+ memcpy(ca->rep_dim, rep_dim, rep_ndim * sizeof(ca_size_t));
57
57
 
58
58
  if ( ca_has_mask(parent) ) {
59
59
  ca_create_mask(ca);
@@ -63,10 +63,10 @@ ca_ubrep_setup (CAUnboundRepeat *ca, CArray *parent,
63
63
  }
64
64
 
65
65
  CAUnboundRepeat *
66
- ca_ubrep_new (CArray *parent, int32_t rep_rank, ca_size_t *rep_dim)
66
+ ca_ubrep_new (CArray *parent, int32_t rep_ndim, ca_size_t *rep_dim)
67
67
  {
68
68
  CAUnboundRepeat *ca = ALLOC(CAUnboundRepeat);
69
- ca_ubrep_setup(ca, parent, rep_rank, rep_dim);
69
+ ca_ubrep_setup(ca, parent, rep_ndim, rep_dim);
70
70
  return ca;
71
71
  }
72
72
 
@@ -88,7 +88,7 @@ static void *
88
88
  ca_ubrep_func_clone (void *ap)
89
89
  {
90
90
  CAUnboundRepeat *ca = (CAUnboundRepeat *) ap;
91
- return ca_ubrep_new(ca->parent, ca->rep_rank, ca->rep_dim);
91
+ return ca_ubrep_new(ca->parent, ca->rep_ndim, ca->rep_dim);
92
92
  }
93
93
 
94
94
  static char *
@@ -212,7 +212,7 @@ ca_ubrep_func_create_mask (void *ap)
212
212
  ca_create_mask(ca->parent);
213
213
  }
214
214
  ca->mask =
215
- (CArray *) ca_ubrep_new(ca->parent->mask, ca->rep_rank, ca->rep_dim);
215
+ (CArray *) ca_ubrep_new(ca->parent->mask, ca->rep_ndim, ca->rep_dim);
216
216
  }
217
217
 
218
218
  ca_operation_function_t ca_ubrep_func = {
@@ -239,14 +239,14 @@ ca_operation_function_t ca_ubrep_func = {
239
239
  /* ------------------------------------------------------------------- */
240
240
 
241
241
  VALUE
242
- rb_ca_ubrep_new (VALUE cary, int32_t rep_rank, ca_size_t *rep_dim)
242
+ rb_ca_ubrep_new (VALUE cary, int32_t rep_ndim, ca_size_t *rep_dim)
243
243
  {
244
244
  volatile VALUE obj;
245
245
  CArray *parent;
246
246
  CAUnboundRepeat *ca;
247
247
  rb_check_carray_object(cary);
248
248
  Data_Get_Struct(cary, CArray, parent);
249
- ca = ca_ubrep_new(parent, rep_rank, rep_dim);
249
+ ca = ca_ubrep_new(parent, rep_ndim, rep_dim);
250
250
  obj = ca_wrap_struct(ca);
251
251
  rb_ca_set_parent(obj, cary);
252
252
  rb_ca_data_type_inherit(obj, cary);
@@ -257,8 +257,8 @@ VALUE
257
257
  rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
258
258
  {
259
259
  CArray *ca;
260
- ca_size_t rank, dim[CA_RANK_MAX];
261
- int32_t rep_rank;
260
+ ca_size_t ndim, dim[CA_RANK_MAX];
261
+ int32_t rep_ndim;
262
262
  ca_size_t rep_dim[CA_RANK_MAX];
263
263
  ca_size_t count, i;
264
264
 
@@ -271,7 +271,7 @@ rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
271
271
  args = rb_ary_new();
272
272
  if ( rb_obj_is_kind_of(self, rb_cCAUnboundRepeat) ) {
273
273
  repeatable = 1;
274
- for (i=0; i<cr->rep_rank; i++) {
274
+ for (i=0; i<cr->rep_ndim; i++) {
275
275
  if ( cr->rep_dim[i] == 1 ) {
276
276
  rb_ary_push(args, ID2SYM(rb_intern("*")));
277
277
  repeatable = 1;
@@ -285,7 +285,7 @@ rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
285
285
  }
286
286
  }
287
287
  else {
288
- for (i=0; i<ca->rank; i++) {
288
+ for (i=0; i<ca->ndim; i++) {
289
289
  if ( ca->dim[i] == 1 ) {
290
290
  rb_ary_push(args, ID2SYM(rb_intern("*")));
291
291
  repeatable = 1;
@@ -319,12 +319,12 @@ rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
319
319
  return ca_ubrep_bind_with(obj, argv[0]);
320
320
  }
321
321
 
322
- rep_rank = argc;
322
+ rep_ndim = argc;
323
323
 
324
324
  count = 0;
325
- rank = 0;
325
+ ndim = 0;
326
326
 
327
- for (i=0; i<rep_rank; i++) {
327
+ for (i=0; i<rep_ndim; i++) {
328
328
  if ( rb_obj_is_kind_of(argv[i], rb_cSymbol) ) {
329
329
  if ( argv[i] == ID2SYM(rb_intern("*")) ) {
330
330
  rep_dim[i] = 0;
@@ -341,25 +341,25 @@ rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
341
341
  rb_raise(rb_eArgError, "invalid argument");
342
342
  }
343
343
  rep_dim[i] = ca->dim[count];
344
- dim[rank] = ca->dim[count];
345
- count++; rank++;
344
+ dim[ndim] = ca->dim[count];
345
+ count++; ndim++;
346
346
  }
347
347
  }
348
348
 
349
- if ( count != ca->rank ) {
349
+ if ( count != ca->ndim ) {
350
350
  rb_raise(rb_eRuntimeError, "too small # of nil");
351
351
  }
352
352
 
353
- if ( rank != ca->rank ) {
353
+ if ( ndim != ca->ndim ) {
354
354
  volatile VALUE par, obj;
355
- par = rb_ca_refer_new(self, ca->data_type, rank, dim, ca->bytes, 0);
356
- obj = rb_ca_ubrep_new(par, rep_rank, rep_dim);
355
+ par = rb_ca_refer_new(self, ca->data_type, ndim, dim, ca->bytes, 0);
356
+ obj = rb_ca_ubrep_new(par, rep_ndim, rep_dim);
357
357
  rb_ivar_set(obj, rb_intern("__real_parent__"), par);
358
358
  rb_ca_set_parent(obj, self);
359
359
  return obj;
360
360
  }
361
361
  else {
362
- return rb_ca_ubrep_new(self, rep_rank, rep_dim);
362
+ return rb_ca_ubrep_new(self, rep_ndim, rep_dim);
363
363
  }
364
364
  }
365
365
 
@@ -378,21 +378,21 @@ rb_ca_ubrep_initialize_copy (VALUE self, VALUE other)
378
378
  Data_Get_Struct(self, CAUnboundRepeat, ca);
379
379
  Data_Get_Struct(other, CAUnboundRepeat, cs);
380
380
 
381
- ca_ubrep_setup(ca, cs->parent, cs->rep_rank, cs->rep_dim);
381
+ ca_ubrep_setup(ca, cs->parent, cs->rep_ndim, cs->rep_dim);
382
382
 
383
383
  return self;
384
384
  }
385
385
 
386
386
  /*
387
387
  static CARepeat *
388
- ca_ubrep_bind (CAUnboundRepeat *ca, int32_t new_rank, ca_size_t *new_dim)
388
+ ca_ubrep_bind (CAUnboundRepeat *ca, int32_t new_ndim, ca_size_t *new_dim)
389
389
  {
390
390
  ca_size_t rep_spec[CA_RANK_MAX];
391
391
  int i;
392
- if ( ca->rep_rank != new_rank ) {
393
- rb_raise(rb_eArgError, "invalid new_rank");
392
+ if ( ca->rep_ndim != new_ndim ) {
393
+ rb_raise(rb_eArgError, "invalid new_ndim");
394
394
  }
395
- for (i=0; i<new_rank; i++) {
395
+ for (i=0; i<new_ndim; i++) {
396
396
  if ( ca->rep_dim[i] == 0 ) {
397
397
  rep_spec[i] = new_dim[i];
398
398
  }
@@ -400,57 +400,57 @@ ca_ubrep_bind (CAUnboundRepeat *ca, int32_t new_rank, ca_size_t *new_dim)
400
400
  rep_spec[i] = 0;
401
401
  }
402
402
  }
403
- return ca_repeat_new((CArray*)ca, new_rank, rep_spec);
403
+ return ca_repeat_new((CArray*)ca, new_ndim, rep_spec);
404
404
  }
405
405
  */
406
406
 
407
407
  VALUE
408
- ca_ubrep_bind2 (VALUE self, int32_t new_rank, ca_size_t *new_dim)
408
+ ca_ubrep_bind2 (VALUE self, int32_t new_ndim, ca_size_t *new_dim)
409
409
  {
410
410
  CAUnboundRepeat *ca;
411
411
  ca_size_t rep_spec[CA_RANK_MAX];
412
412
  ca_size_t upr_spec[CA_RANK_MAX];
413
413
  ca_size_t srp_spec[CA_RANK_MAX];
414
- int uprep = 0, srp_rank;
414
+ int uprep = 0, srp_ndim;
415
415
  int i;
416
416
 
417
417
  Data_Get_Struct(self, CAUnboundRepeat, ca);
418
418
 
419
- if ( ca->rep_rank != new_rank ) {
420
- rb_raise(rb_eArgError, "invalid new_rank (%i <-> %i)",
421
- ca->rep_rank, new_rank);
419
+ if ( ca->rep_ndim != new_ndim ) {
420
+ rb_raise(rb_eArgError, "invalid new_ndim (%i <-> %i)",
421
+ ca->rep_ndim, new_ndim);
422
422
  }
423
423
 
424
- srp_rank = 0;
425
- for (i=0; i<new_rank; i++) {
424
+ srp_ndim = 0;
425
+ for (i=0; i<new_ndim; i++) {
426
426
  if ( ca->rep_dim[i] == 0 ) {
427
427
  if ( new_dim[i] == 0 ) {
428
428
  uprep = 1;
429
429
  }
430
430
  else {
431
- srp_spec[srp_rank++] = new_dim[i];
431
+ srp_spec[srp_ndim++] = new_dim[i];
432
432
  }
433
433
  rep_spec[i] = new_dim[i];
434
434
  upr_spec[i] = new_dim[i];
435
435
  }
436
436
  else {
437
437
  rep_spec[i] = 0;
438
- srp_spec[srp_rank++] = 0;
438
+ srp_spec[srp_ndim++] = 0;
439
439
  upr_spec[i] = ca->rep_dim[i];
440
440
  }
441
441
  }
442
442
  if ( uprep ) {
443
443
  volatile VALUE rep;
444
- if ( srp_rank >= ca->rank ) {
445
- rep = rb_ca_repeat_new(rb_ca_parent(self), srp_rank, srp_spec);
444
+ if ( srp_ndim >= ca->ndim ) {
445
+ rep = rb_ca_repeat_new(rb_ca_parent(self), srp_ndim, srp_spec);
446
446
  }
447
447
  else {
448
448
  rep = rb_ca_parent(self);
449
449
  }
450
- return rb_ca_ubrep_new(rep, new_rank, upr_spec);
450
+ return rb_ca_ubrep_new(rep, new_ndim, upr_spec);
451
451
  }
452
452
  else {
453
- return rb_ca_repeat_new(self, new_rank, rep_spec);
453
+ return rb_ca_repeat_new(self, new_ndim, rep_spec);
454
454
  }
455
455
  }
456
456
 
@@ -474,13 +474,13 @@ ca_ubrep_bind_with (VALUE self, VALUE other)
474
474
 
475
475
  if ( co->obj_type == CA_OBJ_UNBOUND_REPEAT ) {
476
476
  Data_Get_Struct(other, CAUnboundRepeat, cup);
477
- return ca_ubrep_bind2(self, cup->rep_rank, cup->rep_dim);
477
+ return ca_ubrep_bind2(self, cup->rep_ndim, cup->rep_dim);
478
478
  }
479
479
  else if ( ca_is_scalar(co) ) {
480
480
  return self;
481
481
  }
482
482
  else {
483
- return ca_ubrep_bind2(self, co->rank, co->dim);
483
+ return ca_ubrep_bind2(self, co->ndim, co->dim);
484
484
  }
485
485
  }
486
486
 
@@ -500,8 +500,8 @@ rb_ca_ubrep_bind (int argc, VALUE *argv, VALUE self)
500
500
 
501
501
  Data_Get_Struct(self, CAUnboundRepeat, ca);
502
502
 
503
- if ( ca->rep_rank != argc ) {
504
- rb_raise(rb_eArgError, "invalid new_rank");
503
+ if ( ca->rep_ndim != argc ) {
504
+ rb_raise(rb_eArgError, "invalid new_ndim");
505
505
  }
506
506
  for (i=0; i<argc; i++) {
507
507
  if ( ca->rep_dim[i] == 0 ) {
@@ -524,8 +524,8 @@ rb_ca_ubrep_spec (VALUE self)
524
524
 
525
525
  Data_Get_Struct(self, CAUnboundRepeat, ca);
526
526
 
527
- spec = rb_ary_new2(ca->rep_rank);
528
- for (i=0; i<ca->rep_rank; i++) {
527
+ spec = rb_ary_new2(ca->rep_ndim);
528
+ for (i=0; i<ca->rep_ndim; i++) {
529
529
  if ( ca->rep_dim[i] ) {
530
530
  rb_ary_store(spec, i, SIZE2NUM(ca->rep_dim[i]));
531
531
  }