carray 1.3.6 → 1.5.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (315) hide show
  1. checksums.yaml +4 -4
  2. data/.yardopts +32 -0
  3. data/LICENSE +22 -0
  4. data/NEWS.md +65 -0
  5. data/README.md +23 -26
  6. data/Rakefile +31 -0
  7. data/TODO.md +17 -0
  8. data/carray.gemspec +24 -31
  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} +38 -40
  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} +90 -59
  31. data/{carray_access.c → ext/carray_access.c} +244 -109
  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} +350 -149
  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} +58 -70
  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} +137 -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} +95 -114
  46. data/{carray_math.rb → ext/carray_math.rb} +47 -31
  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} +72 -36
  50. data/{carray_order.c → ext/carray_order.c} +73 -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} +59 -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} +1 -6
  58. data/{mkmath.rb → ext/mkmath.rb} +13 -3
  59. data/{ruby_carray.c → ext/ruby_carray.c} +20 -8
  60. data/{ruby_ccomplex.c → ext/ruby_ccomplex.c} +1 -3
  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 +52 -10
  65. data/lib/carray/{base/autoload.rb → autoload.rb} +48 -8
  66. data/lib/carray/autoload/autoload_base.rb +1 -5
  67. data/lib/carray/autoload/autoload_gem_cairo.rb +9 -0
  68. data/lib/carray/autoload/autoload_gem_ffi.rb +9 -0
  69. data/lib/carray/autoload/autoload_gem_gnuplot.rb +2 -0
  70. data/lib/carray/autoload/autoload_gem_io_csv.rb +14 -0
  71. data/lib/carray/autoload/autoload_gem_io_pg.rb +6 -0
  72. data/lib/carray/autoload/autoload_gem_io_sqlite3.rb +12 -0
  73. data/lib/carray/autoload/autoload_gem_narray.rb +10 -0
  74. data/lib/carray/autoload/autoload_gem_numo_narray.rb +15 -0
  75. data/lib/carray/autoload/autoload_gem_opencv.rb +16 -0
  76. data/lib/carray/autoload/autoload_gem_random.rb +8 -0
  77. data/lib/carray/autoload/autoload_gem_rmagick.rb +23 -0
  78. data/lib/carray/autoload/{autoload_graphics_zimg.rb → autoload_gem_zimg.rb} +0 -0
  79. data/lib/carray/basic.rb +191 -0
  80. data/lib/carray/broadcast.rb +82 -0
  81. data/lib/carray/compose.rb +315 -0
  82. data/lib/carray/construct.rb +460 -0
  83. data/lib/carray/convert.rb +115 -0
  84. data/lib/carray/info.rb +1 -3
  85. data/lib/carray/{base/inspect.rb → inspect.rb} +9 -11
  86. data/lib/carray/io/imagemagick.rb +2 -4
  87. data/lib/carray/{base/iterator.rb → iterator.rb} +6 -6
  88. data/lib/carray/mask.rb +102 -0
  89. data/lib/carray/{base/math.rb → math.rb} +21 -53
  90. data/lib/carray/math/histogram.rb +8 -10
  91. data/lib/carray/math/recurrence.rb +1 -3
  92. data/lib/carray/mkmf.rb +9 -3
  93. data/lib/carray/object/ca_obj_iterator.rb +1 -3
  94. data/lib/carray/object/ca_obj_link.rb +1 -3
  95. data/lib/carray/object/ca_obj_pack.rb +9 -11
  96. data/lib/carray/obsolete.rb +270 -0
  97. data/lib/carray/ordering.rb +181 -0
  98. data/lib/carray/{base/serialize.rb → serialize.rb} +50 -66
  99. data/lib/carray/string.rb +188 -0
  100. data/lib/carray/{base/struct.rb → struct.rb} +19 -21
  101. data/lib/carray/{io/table.rb → table.rb} +1 -9
  102. data/lib/carray/testing.rb +51 -0
  103. data/lib/carray/time.rb +76 -0
  104. data/lib/carray/transform.rb +98 -0
  105. data/misc/Methods.ja.md +182 -0
  106. data/{NOTE → misc/NOTE} +0 -0
  107. data/spec/Classes/CABitfield_spec.rb +58 -0
  108. data/spec/Classes/CABlockIterator_spec.rb +114 -0
  109. data/spec/Classes/CABlock_spec.rb +205 -0
  110. data/spec/Classes/CAField_spec.rb +39 -0
  111. data/spec/Classes/CAGrid_spec.rb +75 -0
  112. data/spec/Classes/CAMap_spec.rb +0 -0
  113. data/{test/test_CAMapping.rb → spec/Classes/CAMapping_spec.rb} +35 -36
  114. data/spec/Classes/CAObject_attribute_spec.rb +33 -0
  115. data/spec/Classes/CAObject_spec.rb +33 -0
  116. data/spec/Classes/CARefer_spec.rb +93 -0
  117. data/spec/Classes/CARepeat_spec.rb +65 -0
  118. data/spec/Classes/CASelect_spec.rb +22 -0
  119. data/spec/Classes/CAShift_spec.rb +16 -0
  120. data/spec/Classes/CAStruct_spec.rb +71 -0
  121. data/{test/test_CATranspose.rb → spec/Classes/CATranspose_spec.rb} +20 -21
  122. data/spec/Classes/CAUnboudRepeat_spec.rb +102 -0
  123. data/spec/Classes/CAWindow_spec.rb +54 -0
  124. data/spec/Classes/CAWrap_spec.rb +8 -0
  125. data/{test/test_CArray.rb → spec/Classes/CArray_spec.rb} +48 -92
  126. data/spec/Classes/CScalar_spec.rb +55 -0
  127. data/spec/Features/feature_130_spec.rb +19 -0
  128. data/spec/Features/feature_attributes_spec.rb +280 -0
  129. data/spec/Features/feature_boolean_spec.rb +98 -0
  130. data/spec/Features/feature_broadcast.rb +116 -0
  131. data/spec/Features/feature_cast_function.rb +19 -0
  132. data/spec/Features/feature_cast_spec.rb +33 -0
  133. data/spec/Features/feature_class_spec.rb +84 -0
  134. data/spec/Features/feature_complex_spec.rb +42 -0
  135. data/{test/test_composite.rb → spec/Features/feature_composite_spec.rb} +17 -18
  136. data/spec/Features/feature_convert_spec.rb +46 -0
  137. data/spec/Features/feature_copy_spec.rb +123 -0
  138. data/spec/Features/feature_creation_spec.rb +84 -0
  139. data/spec/Features/feature_element_spec.rb +144 -0
  140. data/spec/Features/feature_extream_spec.rb +54 -0
  141. data/spec/Features/feature_generate_spec.rb +74 -0
  142. data/spec/Features/feature_index_spec.rb +69 -0
  143. data/spec/Features/feature_mask_spec.rb +580 -0
  144. data/spec/Features/feature_math_spec.rb +97 -0
  145. data/spec/Features/feature_order_spec.rb +146 -0
  146. data/spec/Features/feature_ref_store_spec.rb +209 -0
  147. data/spec/Features/feature_serialization_spec.rb +125 -0
  148. data/spec/Features/feature_stat_spec.rb +397 -0
  149. data/spec/Features/feature_virtual_spec.rb +48 -0
  150. data/spec/Features/method_eq_spec.rb +81 -0
  151. data/spec/Features/method_is_nan_spec.rb +12 -0
  152. data/spec/Features/method_map_spec.rb +54 -0
  153. data/spec/Features/method_max_with.rb +20 -0
  154. data/spec/Features/method_min_with.rb +19 -0
  155. data/spec/Features/method_ne_spec.rb +18 -0
  156. data/spec/Features/method_project_spec.rb +188 -0
  157. data/spec/Features/method_ref_spec.rb +27 -0
  158. data/spec/Features/method_round_spec.rb +11 -0
  159. data/spec/Features/method_s_linspace_spec.rb +48 -0
  160. data/spec/Features/method_s_span_spec.rb +14 -0
  161. data/spec/Features/method_seq_spec.rb +47 -0
  162. data/spec/Features/method_sort_with.rb +43 -0
  163. data/spec/Features/method_sorted_with.rb +29 -0
  164. data/spec/Features/method_span_spec.rb +42 -0
  165. data/spec/Features/method_wrap_readonly_spec.rb +43 -0
  166. data/{test → spec/UnitTest}/test_CAVirtual.rb +0 -0
  167. data/spec/spec_all.rb +0 -1
  168. data/utils/convert_test.rb +73 -0
  169. data/utils/{extract_rdoc.rb → extract_yard.rb} +7 -12
  170. data/{devel → utils}/guess_shape.rb +0 -0
  171. data/utils/{diff_method.rb → monkey_patch_methods.rb} +17 -7
  172. metadata +173 -316
  173. data/COPYING +0 -56
  174. data/GPL +0 -340
  175. data/Gemfile +0 -8
  176. data/Gemfile.lock +0 -33
  177. data/LEGAL +0 -50
  178. data/Makefile +0 -451
  179. data/TODO +0 -5
  180. data/carray_cast_func.c +0 -8670
  181. data/carray_config.h +0 -26
  182. data/carray_math.c +0 -24805
  183. data/carray_random.c +0 -531
  184. data/carray_stat_proc.c +0 -12170
  185. data/ext/calculus/carray_calculus.c +0 -931
  186. data/ext/calculus/carray_interp.c +0 -358
  187. data/ext/calculus/extconf.rb +0 -12
  188. data/ext/calculus/lib/autoload/autoload_math_calculus.rb +0 -2
  189. data/ext/calculus/lib/math/calculus.rb +0 -119
  190. data/ext/calculus/lib/math/interp/adapter_interp1d.rb +0 -31
  191. data/ext/fortio/extconf.rb +0 -3
  192. data/ext/fortio/lib/carray/autoload/autoload_fortran_format.rb +0 -5
  193. data/ext/fortio/lib/carray/io/fortran_format.rb +0 -43
  194. data/ext/fortio/lib/fortio.rb +0 -3
  195. data/ext/fortio/lib/fortio/fortran_format.rb +0 -605
  196. data/ext/fortio/lib/fortio/fortran_format.tab.rb +0 -536
  197. data/ext/fortio/lib/fortio/fortran_format.y +0 -215
  198. data/ext/fortio/lib/fortio/fortran_namelist.rb +0 -151
  199. data/ext/fortio/lib/fortio/fortran_namelist.tab.rb +0 -470
  200. data/ext/fortio/lib/fortio/fortran_namelist.y +0 -213
  201. data/ext/fortio/lib/fortio/fortran_sequential.rb +0 -345
  202. data/ext/fortio/ruby_fortio.c +0 -182
  203. data/ext/fortio/test/test_H.rb +0 -5
  204. data/ext/fortio/test/test_T.rb +0 -7
  205. data/ext/fortio/test/test_fortran_format.rb +0 -86
  206. data/ext/fortio/test/test_namelist.rb +0 -25
  207. data/ext/fortio/test/test_namelist_write.rb +0 -10
  208. data/ext/fortio/test/test_sequential.rb +0 -13
  209. data/ext/fortio/test/test_sequential2.rb +0 -13
  210. data/ext/fortio/work/test.rb +0 -10
  211. data/ext/fortio/work/test_e.rb +0 -19
  212. data/ext/fortio/work/test_ep.rb +0 -10
  213. data/ext/fortio/work/test_parse.rb +0 -12
  214. data/ext/imagemap/carray_imagemap.c +0 -495
  215. data/ext/imagemap/doc/call_graph.dot +0 -28
  216. data/ext/imagemap/draw.c +0 -567
  217. data/ext/imagemap/extconf.rb +0 -13
  218. data/ext/imagemap/lib/autoload/autoload_graphics_imagemap.rb +0 -1
  219. data/ext/imagemap/lib/graphics/imagemap.rb +0 -273
  220. data/ext/imagemap/lib/image_map.rb +0 -4
  221. data/ext/imagemap/test/swath_index.rb +0 -83
  222. data/ext/imagemap/test/swath_warp.rb +0 -99
  223. data/ext/imagemap/test/test.rb +0 -23
  224. data/ext/imagemap/test/test_image.rb +0 -42
  225. data/ext/imagemap/test/test_line.rb +0 -14
  226. data/ext/imagemap/test/test_rotate.rb +0 -17
  227. data/ext/imagemap/test/test_triangle.rb +0 -20
  228. data/ext/imagemap/test/test_warp.rb +0 -26
  229. data/ext/mathfunc/extconf.rb +0 -18
  230. data/ext/mathfunc/lib/autoload/autoload_math_mathfunc.rb +0 -1
  231. data/ext/mathfunc/lib/math/mathfunc.rb +0 -15
  232. data/ext/mathfunc/test/test_hypot.rb +0 -5
  233. data/ext/mathfunc/test/test_j0.rb +0 -22
  234. data/ext/mathfunc/test/test_jn.rb +0 -8
  235. data/ext/mathfunc/test/test_sph.rb +0 -9
  236. data/ext/narray/README +0 -22
  237. data/ext/narray/ca_wrap_narray.c +0 -500
  238. data/ext/narray/carray_narray.c +0 -21
  239. data/ext/narray/extconf.rb +0 -57
  240. data/ext/narray/lib/autoload/autoload_math_narray.rb +0 -1
  241. data/ext/narray/lib/autoload/autoload_math_narray_miss.rb +0 -11
  242. data/ext/narray/lib/math/narray.rb +0 -17
  243. data/ext/narray/lib/math/narray_miss.rb +0 -45
  244. data/lib/carray/autoload/autoload_graphics_gnuplot.rb +0 -2
  245. data/lib/carray/autoload/autoload_io_csv.rb +0 -14
  246. data/lib/carray/autoload/autoload_io_pg.rb +0 -6
  247. data/lib/carray/autoload/autoload_io_sqlite3.rb +0 -12
  248. data/lib/carray/autoload/autoload_io_table.rb +0 -1
  249. data/lib/carray/autoload/autoload_math_interp.rb +0 -4
  250. data/lib/carray/base/basic.rb +0 -1090
  251. data/lib/carray/base/obsolete.rb +0 -131
  252. data/lib/carray/graphics/gnuplot.rb +0 -2131
  253. data/lib/carray/graphics/zimg.rb +0 -296
  254. data/lib/carray/io/csv.rb +0 -572
  255. data/lib/carray/io/pg.rb +0 -101
  256. data/lib/carray/io/sqlite3.rb +0 -215
  257. data/lib/carray/math/interp.rb +0 -57
  258. data/lib/carray/math/interp/adapter_gsl_spline.rb +0 -47
  259. data/mkmf.log +0 -375
  260. data/mt19937ar.c +0 -182
  261. data/mt19937ar.h +0 -86
  262. data/rdoc_ext.rb +0 -1115
  263. data/rdoc_main.rb +0 -27
  264. data/rdoc_math.rb +0 -5
  265. data/rdoc_stat.rb +0 -31
  266. data/spec/CABlockIterator/CABlockIterator_spec.rb +0 -113
  267. data/spec/CArray/bug/store_spec.rb +0 -27
  268. data/spec/CArray/index/repeat_spec.rb +0 -10
  269. data/spec/CArray/method/eq_spec.rb +0 -80
  270. data/spec/CArray/method/is_nan_spec.rb +0 -12
  271. data/spec/CArray/method/ne_spec.rb +0 -18
  272. data/spec/CArray/method/round_spec.rb +0 -11
  273. data/spec/CArray/object/_attribute_spec.rb +0 -32
  274. data/spec/CArray/object/s_new_spec.rb +0 -31
  275. data/spec/CArray/serialize/Serialization_spec.rb +0 -89
  276. data/test/test_130.rb +0 -23
  277. data/test/test_ALL.rb +0 -51
  278. data/test/test_CABitfield.rb +0 -59
  279. data/test/test_CABlock.rb +0 -208
  280. data/test/test_CAField.rb +0 -40
  281. data/test/test_CAGrid.rb +0 -76
  282. data/test/test_CAMmap.rb +0 -11
  283. data/test/test_CARefer.rb +0 -94
  284. data/test/test_CARepeat.rb +0 -66
  285. data/test/test_CASelect.rb +0 -23
  286. data/test/test_CAShift.rb +0 -17
  287. data/test/test_CAWindow.rb +0 -55
  288. data/test/test_CAWrap.rb +0 -9
  289. data/test/test_CComplex.rb +0 -83
  290. data/test/test_CScalar.rb +0 -91
  291. data/test/test_attribute.rb +0 -281
  292. data/test/test_block_iterator.rb +0 -17
  293. data/test/test_boolean.rb +0 -99
  294. data/test/test_cast.rb +0 -33
  295. data/test/test_class.rb +0 -85
  296. data/test/test_complex.rb +0 -43
  297. data/test/test_convert.rb +0 -79
  298. data/test/test_copy.rb +0 -141
  299. data/test/test_creation.rb +0 -85
  300. data/test/test_element.rb +0 -146
  301. data/test/test_extream.rb +0 -55
  302. data/test/test_generate.rb +0 -75
  303. data/test/test_index.rb +0 -71
  304. data/test/test_mask.rb +0 -578
  305. data/test/test_math.rb +0 -98
  306. data/test/test_narray.rb +0 -64
  307. data/test/test_order.rb +0 -147
  308. data/test/test_random.rb +0 -15
  309. data/test/test_ref_store.rb +0 -211
  310. data/test/test_stat.rb +0 -414
  311. data/test/test_struct.rb +0 -72
  312. data/test/test_virtual.rb +0 -49
  313. data/utils/create_rdoc.sh +0 -9
  314. data/utils/make_tgz.sh +0 -3
  315. data/version.h +0 -18
@@ -3,10 +3,8 @@
3
3
  carray_stat.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
 
@@ -293,10 +291,10 @@ rb_ca_cumprod (int argc, VALUE *argv, VALUE self)
293
291
  Data_Get_Struct(self, CArray, ca);
294
292
 
295
293
  if ( ca_is_complex_type(ca) ) {
296
- co = carray_new(CA_CMPLX128, ca->rank, ca->dim, 0, NULL);
294
+ co = carray_new(CA_CMPLX128, ca->ndim, ca->dim, 0, NULL);
297
295
  }
298
296
  else {
299
- co = carray_new(CA_FLOAT64, ca->rank, ca->dim, 0, NULL);
297
+ co = carray_new(CA_FLOAT64, ca->ndim, ca->dim, 0, NULL);
300
298
  }
301
299
 
302
300
  min_count = ( NIL_P(rmin_count) || ! ca_has_mask(ca) ) ?
@@ -504,10 +502,10 @@ rb_ca_cumwsum (int argc, VALUE *argv, VALUE self)
504
502
  }
505
503
 
506
504
  if ( ca_is_complex_type(ca) ) {
507
- co = carray_new(CA_CMPLX128, ca->rank, ca->dim, 0, NULL);
505
+ co = carray_new(CA_CMPLX128, ca->ndim, ca->dim, 0, NULL);
508
506
  }
509
507
  else {
510
- co = carray_new(CA_FLOAT64, ca->rank, ca->dim, 0, NULL);
508
+ co = carray_new(CA_FLOAT64, ca->ndim, ca->dim, 0, NULL);
511
509
  }
512
510
 
513
511
  min_count = ( NIL_P(rmin_count) || ( ! ca_has_mask(ca) ) ) ?
@@ -2029,7 +2027,7 @@ rb_ca_grade (int argc, VALUE *argv, VALUE self)
2029
2027
  rb_raise(rb_eArgError, "bin number must be larger than 1");
2030
2028
  }
2031
2029
 
2032
- out = rb_carray_new_safe(CA_SIZE, ca->rank, ca->dim, 0, NULL);
2030
+ out = rb_carray_new_safe(CA_SIZE, ca->ndim, ca->dim, 0, NULL);
2033
2031
  Data_Get_Struct(out, CArray, sa);
2034
2032
 
2035
2033
  ca_attach(ca);
@@ -286,12 +286,10 @@ header = <<HERE_END
286
286
  carray_stat_proc.c
287
287
 
288
288
  This file is part of Ruby/CArray extension library.
289
- You can redistribute it and/or modify it under the terms of
290
- the Ruby Licence.
291
289
 
292
- This file is automatically generated from carray_stat_proc.rb
293
290
 
294
- Copyright (C) 2005 Hiroki Motoyoshi
291
+ This file is automatically generated from carray_stat_proc.rb
292
+ Copyright (C) 2005-2020 Hiroki Motoyoshi
295
293
 
296
294
  ---------------------------------------------------------------------------- */
297
295
 
@@ -1383,7 +1381,7 @@ ca_stat_nd_contig_loop (CArray *ca, CArray *co, ca_size_t mc,
1383
1381
  void *p;
1384
1382
  boolean8_t *m;
1385
1383
  ca_size_t i, n;
1386
- if ( level == co->rank ) {
1384
+ if ( level == co->ndim ) {
1387
1385
  CAStatIterator it;
1388
1386
  n = ca->elements/co->elements;
1389
1387
  idx[level] = 0;
@@ -1421,8 +1419,8 @@ rb_ca_stat_nd_contig (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
1421
1419
  ca_type_name[ca->data_type]);
1422
1420
  }
1423
1421
 
1424
- ndim = ca->rank - RARRAY_LEN(vaxis);
1425
- if ( ndim <= 0 || ndim > ca->rank ) {
1422
+ ndim = ca->ndim - RARRAY_LEN(vaxis);
1423
+ if ( ndim <= 0 || ndim > ca->ndim ) {
1426
1424
  rb_raise(rb_eRuntimeError, "invalid dimension specified");
1427
1425
  }
1428
1426
 
@@ -1449,7 +1447,7 @@ rb_ca_stat_nd_contig (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
1449
1447
  char *op;
1450
1448
  boolean8_t *om;
1451
1449
  int8_t i;
1452
- for (i=0; i<ca->rank; i++) {
1450
+ for (i=0; i<ca->ndim; i++) {
1453
1451
  idx[i] = 0;
1454
1452
  }
1455
1453
  ca_attach_n(2, ca, co);
@@ -1474,7 +1472,7 @@ ca_stat_get_offset_loop (CArray *ca, ca_size_t *dm,
1474
1472
  CArray *offset)
1475
1473
  {
1476
1474
  ca_size_t i;
1477
- if ( level == ca->rank - 1 ) {
1475
+ if ( level == ca->ndim - 1 ) {
1478
1476
  if ( dm[level] == 0 ) {
1479
1477
  idx[level] = 0;
1480
1478
  *(ca_size_t *)ca_ptr_at_index(offset, idx1) = ca_index2addr(ca, idx);
@@ -1513,13 +1511,13 @@ rb_ca_stat_nd_discrete (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
1513
1511
  ca_size_t loop_dim[CA_RANK_MAX];
1514
1512
  ca_size_t dm[CA_RANK_MAX], dn[CA_RANK_MAX];
1515
1513
  CArray *ca, *co, *first, *offset;
1516
- ca_size_t out_rank, loop_rank;
1514
+ ca_size_t out_ndim, loop_ndim;
1517
1515
  ca_size_t mc;
1518
1516
  ca_size_t i, k;
1519
1517
 
1520
1518
  Data_Get_Struct(self, CArray, ca);
1521
1519
 
1522
- for (i=0; i<ca->rank; i++) {
1520
+ for (i=0; i<ca->ndim; i++) {
1523
1521
  dm[i] = 0;
1524
1522
  dn[i] = 1;
1525
1523
  }
@@ -1530,26 +1528,26 @@ rb_ca_stat_nd_discrete (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
1530
1528
  dn[k] = 0;
1531
1529
  }
1532
1530
 
1533
- out_rank = 0;
1534
- loop_rank = 0;
1535
- for (i=0; i<ca->rank; i++) {
1531
+ out_ndim = 0;
1532
+ loop_ndim = 0;
1533
+ for (i=0; i<ca->ndim; i++) {
1536
1534
  if ( dm[i] ) {
1537
- loop_dim[loop_rank] = ca->dim[i];
1538
- loop_rank += 1;
1535
+ loop_dim[loop_ndim] = ca->dim[i];
1536
+ loop_ndim += 1;
1539
1537
  }
1540
1538
  else {
1541
- out_dim[out_rank] = ca->dim[i];
1542
- out_rank += 1;
1539
+ out_dim[out_ndim] = ca->dim[i];
1540
+ out_ndim += 1;
1543
1541
  }
1544
1542
  }
1545
1543
 
1546
- out = rb_carray_new(data_type, out_rank, out_dim, 0, NULL);
1544
+ out = rb_carray_new(data_type, out_ndim, out_dim, 0, NULL);
1547
1545
  Data_Get_Struct(out, CArray, co);
1548
1546
 
1549
- first = carray_new(CA_SIZE, out_rank, out_dim, 0, NULL);
1547
+ first = carray_new(CA_SIZE, out_ndim, out_dim, 0, NULL);
1550
1548
  first->ptr = realloc(first->ptr, first->bytes*(first->elements+1));
1551
1549
 
1552
- offset = carray_new(CA_SIZE, loop_rank, loop_dim, 0, NULL);
1550
+ offset = carray_new(CA_SIZE, loop_ndim, loop_dim, 0, NULL);
1553
1551
  offset->ptr = realloc(offset->ptr, offset->bytes*(offset->elements+1));
1554
1552
 
1555
1553
  ca_stat_get_offset_loop(ca, dn, 0, idx, 0, idx1, first);
@@ -1673,14 +1671,14 @@ rb_ca_stat_general (int argc, VALUE *argv, VALUE self,
1673
1671
 
1674
1672
  for (i=0; i<RARRAY_LEN(vaxis); i++) {
1675
1673
  k = NUM2SIZE(rb_ary_entry(vaxis, RARRAY_LEN(vaxis)-1-i));
1676
- CA_CHECK_INDEX(k, ca->rank);
1677
- if ( k != ca->rank-1-i ) {
1674
+ CA_CHECK_INDEX(k, ca->ndim);
1675
+ if ( k != ca->ndim-1-i ) {
1678
1676
  is_contig = 0;
1679
1677
  }
1680
1678
  }
1681
1679
 
1682
1680
  if ( is_contig ) {
1683
- if ( RARRAY_LEN(vaxis) == ca->rank ) {
1681
+ if ( RARRAY_LEN(vaxis) == ca->ndim ) {
1684
1682
  return rb_ca_stat_1d(self, rmc, vfval, ca_proc);
1685
1683
  }
1686
1684
  else {
@@ -1841,7 +1839,7 @@ ca_dimstat_type2_loop (CArray *ca, CArray *co, ca_size_t mc,
1841
1839
  void *p;
1842
1840
  boolean8_t *m;
1843
1841
  ca_size_t i, n;
1844
- if ( level == co->rank ) {
1842
+ if ( level == co->ndim ) {
1845
1843
  CAStatIterator it;
1846
1844
  n = ca->elements/co->elements;
1847
1845
  idx[level] = 0;
@@ -1871,7 +1869,7 @@ ca_dimstat_type2 (CArray *ca, CArray *co, ca_size_t mc, ca_stat_proc_t *ca_proc)
1871
1869
  char *op;
1872
1870
  boolean8_t *om;
1873
1871
  int8_t i;
1874
- for (i=0; i<ca->rank; i++) {
1872
+ for (i=0; i<ca->ndim; i++) {
1875
1873
  idx[i] = 0;
1876
1874
  }
1877
1875
  ca_attach_n(2, ca, co);
@@ -1904,7 +1902,7 @@ rb_ca_dimstat_type2 (int argc, VALUE *argv, VALUE self,
1904
1902
  }
1905
1903
 
1906
1904
  ndim = NUM2SIZE(rndim);
1907
- if ( ndim <= 0 || ndim > ca->rank ) {
1905
+ if ( ndim <= 0 || ndim > ca->ndim ) {
1908
1906
  rb_raise(rb_eRuntimeError, "invalid dimension specified");
1909
1907
  }
1910
1908
 
@@ -3,10 +3,8 @@
3
3
  carray_test.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
  This file includes the modified routine (ca_mem_hash) from
12
10
 
@@ -34,26 +32,26 @@ ca_check_type (void *ap, int8_t data_type)
34
32
  }
35
33
 
36
34
  void
37
- ca_check_rank (void *ap, int rank)
35
+ ca_check_ndim (void *ap, int ndim)
38
36
  {
39
37
  CArray *ca = (CArray *) ap;
40
38
  if ( ! ca_is_scalar(ca) ) {
41
- if ( ca->rank != rank ) {
42
- rb_raise(rb_eRuntimeError, "rank mismatch");
39
+ if ( ca->ndim != ndim ) {
40
+ rb_raise(rb_eRuntimeError, "ndim mismatch");
43
41
  }
44
42
  }
45
43
  }
46
44
 
47
45
  void
48
- ca_check_shape (void *ap, int rank, ca_size_t *dim)
46
+ ca_check_shape (void *ap, int ndim, ca_size_t *dim)
49
47
  {
50
48
  CArray *ca = (CArray *) ap;
51
49
  int i;
52
50
  if ( ! ca_is_scalar(ca) ) {
53
- if ( ca->rank != rank ) {
51
+ if ( ca->ndim != ndim ) {
54
52
  rb_raise(rb_eRuntimeError, "shape mismatch");
55
53
  }
56
- for (i=0; i<rank; i++) {
54
+ for (i=0; i<ndim; i++) {
57
55
  if ( ca->dim[i] != dim[i] ) {
58
56
  rb_raise(rb_eRuntimeError, "shape mismatch");
59
57
  }
@@ -72,12 +70,12 @@ ca_check_same_data_type (void *ap1, void *ap2)
72
70
  }
73
71
 
74
72
  void
75
- ca_check_same_rank (void *ap1, void *ap2)
73
+ ca_check_same_ndim (void *ap1, void *ap2)
76
74
  {
77
75
  CArray *ca1 = (CArray *) ap1;
78
76
  CArray *ca2 = (CArray *) ap2;
79
- if ( ca1->rank != ca2->rank ) {
80
- rb_raise(rb_eRuntimeError, "rank mismatch");
77
+ if ( ca1->ndim != ca2->ndim ) {
78
+ rb_raise(rb_eRuntimeError, "ndim mismatch");
81
79
  }
82
80
  }
83
81
 
@@ -98,10 +96,10 @@ ca_check_same_shape (void *ap1, void *ap2)
98
96
  CArray *ca2 = (CArray *) ap2;
99
97
  int i;
100
98
  if ( ( ! ca_is_scalar(ca1) ) && ( ! ca_is_scalar(ca2) ) ) {
101
- if ( ca1->rank != ca2->rank ) {
99
+ if ( ca1->ndim != ca2->ndim ) {
102
100
  rb_raise(rb_eRuntimeError, "shape mismatch");
103
101
  }
104
- for (i=0; i<ca1->rank; i++) {
102
+ for (i=0; i<ca1->ndim; i++) {
105
103
  if ( ca1->dim[i] != ca2->dim[i] ) {
106
104
  rb_raise(rb_eRuntimeError, "shape mismatch");
107
105
  }
@@ -114,7 +112,7 @@ ca_check_index (void *ap, ca_size_t *idx)
114
112
  {
115
113
  CArray *ca = (CArray *) ap;
116
114
  int i;
117
- for (i=0; i<ca->rank; i++) {
115
+ for (i=0; i<ca->ndim; i++) {
118
116
  if ( idx[i] < 0 || idx[i] >= ca->dim[i] ) {
119
117
  rb_raise(rb_eRuntimeError, "invalid index");
120
118
  }
@@ -140,11 +138,11 @@ ca_has_same_shape (void *ap1, void *ap2)
140
138
  if ( ca_is_scalar(ca1) || ca_is_scalar(ca2) ) {
141
139
  return 1;
142
140
  }
143
- else if ( ca1->rank != ca2->rank ) {
141
+ else if ( ca1->ndim != ca2->ndim ) {
144
142
  return 0;
145
143
  }
146
144
  else {
147
- for (i=0; i<ca1->rank; i++) {
145
+ for (i=0; i<ca1->ndim; i++) {
148
146
  if ( ca1->dim[i] != ca2->dim[i] ) {
149
147
  return 0;
150
148
  }
@@ -158,7 +156,7 @@ ca_is_valid_index (void *ap, ca_size_t *idx)
158
156
  {
159
157
  CArray *ca = (CArray *) ap;
160
158
  int8_t i;
161
- for (i=0; i<ca->rank; i++) {
159
+ for (i=0; i<ca->ndim; i++) {
162
160
  if ( idx[i] < 0 || idx[i] >= ca->dim[i] ) {
163
161
  return 0;
164
162
  }
@@ -218,13 +216,18 @@ rb_obj_is_data_class (VALUE rtype)
218
216
  return Qfalse;
219
217
  }
220
218
 
219
+ static VALUE
220
+ rb_ca_s_is_data_class (VALUE self, VALUE rklass)
221
+ {
222
+ return rb_obj_is_data_class(rklass);
223
+ }
224
+
221
225
  /* ------------------------------------------------------------- */
222
226
 
223
- /* rdoc:
224
- class CArray
225
- def valid_index? (*index)
226
- end
227
- end
227
+ /* @overload valid_index? (*idx)
228
+
229
+ (Inquiry)
230
+ Returns true if the given number list is valid as array index for the object
228
231
  */
229
232
 
230
233
  static VALUE
@@ -236,11 +239,11 @@ rb_ca_is_valid_index (int argc, VALUE *argv, VALUE self)
236
239
 
237
240
  Data_Get_Struct(self, CArray, ca);
238
241
 
239
- if ( argc != ca->rank ) {
242
+ if ( argc != ca->ndim ) {
240
243
  rb_raise(rb_eArgError,
241
- "invalid # of arguments (%i for %i)", argc, ca->rank);
244
+ "invalid # of arguments (%i for %i)", argc, ca->ndim);
242
245
  }
243
- for (i=0; i<ca->rank; i++) {
246
+ for (i=0; i<ca->ndim; i++) {
244
247
  idx = NUM2SIZE(argv[i]);
245
248
  if ( idx < 0 ) {
246
249
  idx += ca->dim[i];
@@ -253,11 +256,10 @@ rb_ca_is_valid_index (int argc, VALUE *argv, VALUE self)
253
256
  return Qtrue;
254
257
  }
255
258
 
256
- /* rdoc:
257
- class CArray
258
- def valid_addr? (addr)
259
- end
260
- end
259
+ /* @overload valid_addr? (*addr)
260
+
261
+ (Inquiry)
262
+ Returns true if the given number is valid as array address for the object
261
263
  */
262
264
 
263
265
  static VALUE
@@ -279,11 +281,10 @@ rb_ca_is_valid_addr (VALUE self, VALUE raddr)
279
281
  }
280
282
  }
281
283
 
282
- /* rdoc:
283
- class CArray
284
- def has_same_shape? (other)
285
- end
286
- end
284
+ /* @overload has_same_shape?
285
+
286
+ (Inquiry)
287
+ Returns true if the object has the same shape with the given array.
287
288
  */
288
289
 
289
290
  static VALUE
@@ -381,7 +382,7 @@ ca_equal (void *ap, void *bp)
381
382
  return 0;
382
383
  }
383
384
 
384
- if ( ca->rank != cb->rank ) { /* rank comparison */
385
+ if ( ca->ndim != cb->ndim ) { /* ndim comparison */
385
386
  return 0;
386
387
  }
387
388
 
@@ -389,7 +390,7 @@ ca_equal (void *ap, void *bp)
389
390
  return 0;
390
391
  }
391
392
 
392
- for (i=0; i<ca->rank; i++) {
393
+ for (i=0; i<ca->ndim; i++) {
393
394
  if ( ca->dim[i] != cb->dim[i] ) { /* dimensional shape comparison */
394
395
  return 0;
395
396
  }
@@ -453,12 +454,10 @@ ca_equal (void *ap, void *bp)
453
454
  return flag;
454
455
  }
455
456
 
456
- /* rdoc:
457
- class CArray
458
- def == (other)
459
- end
460
- alias eql? ==
461
- end
457
+ /* @overload == (other)
458
+
459
+ (Inquiry)
460
+ Returns true if the object equals the given array.
462
461
  */
463
462
 
464
463
  static VALUE
@@ -545,11 +544,10 @@ ca_hash (CArray *ca)
545
544
  return hash;
546
545
  }
547
546
 
548
- /* rdoc:
549
- class CArray
550
- def hash
551
- end
552
- end
547
+ /* @overload hash
548
+
549
+ (Inquiry)
550
+ Returns the hash value of the object.
553
551
  */
554
552
 
555
553
  VALUE
@@ -571,11 +569,19 @@ rb_ca_modify (VALUE self)
571
569
  if ( OBJ_FROZEN(self) ) {
572
570
  rb_error_frozen("CArray object");
573
571
  }
572
+ /*
574
573
  if ( ( ! OBJ_TAINTED(self) ) && rb_safe_level() >= 4 ) {
575
574
  rb_raise(rb_eSecurityError, "Insecure: can't modify carray");
576
575
  }
576
+ */
577
577
  }
578
578
 
579
+ /* @overload freeze
580
+
581
+ Freeze the object.
582
+
583
+ */
584
+
579
585
  VALUE
580
586
  rb_ca_freeze (VALUE self)
581
587
  {
@@ -585,7 +591,6 @@ rb_ca_freeze (VALUE self)
585
591
  return rb_obj_freeze(self);
586
592
  }
587
593
 
588
-
589
594
  void
590
595
  Init_carray_test ()
591
596
  {
@@ -597,6 +602,9 @@ Init_carray_test ()
597
602
  rb_define_method(rb_cCArray, "freeze", rb_ca_freeze, 0);
598
603
 
599
604
  rb_define_method(rb_cCArray, "==", rb_ca_equal, 1);
600
- rb_define_method(rb_cCArray, "eql?", rb_ca_equal, 1);
605
+ rb_define_alias(rb_cCArray, "eql?", "==");
601
606
  rb_define_method(rb_cCArray, "hash", rb_ca_hash, 0);
607
+
608
+ rb_define_singleton_method(rb_cCArray, "data_class?", rb_ca_s_is_data_class, 1);
609
+
602
610
  }