carray 1.3.7 → 1.5.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.yardopts +32 -0
- data/LICENSE +22 -0
- data/NEWS.md +78 -0
- data/README.md +43 -30
- data/Rakefile +31 -0
- data/TODO.md +17 -0
- data/carray.gemspec +21 -31
- data/{ca_iter_block.c → ext/ca_iter_block.c} +16 -18
- data/{ca_iter_dimension.c → ext/ca_iter_dimension.c} +20 -21
- data/{ca_iter_window.c → ext/ca_iter_window.c} +12 -14
- data/{ca_obj_array.c → ext/ca_obj_array.c} +451 -176
- data/{ca_obj_bitarray.c → ext/ca_obj_bitarray.c} +18 -23
- data/{ca_obj_bitfield.c → ext/ca_obj_bitfield.c} +12 -16
- data/{ca_obj_block.c → ext/ca_obj_block.c} +47 -54
- data/{ca_obj_fake.c → ext/ca_obj_fake.c} +10 -12
- data/{ca_obj_farray.c → ext/ca_obj_farray.c} +21 -23
- data/{ca_obj_field.c → ext/ca_obj_field.c} +30 -32
- data/{ca_obj_grid.c → ext/ca_obj_grid.c} +32 -33
- data/{ca_obj_mapping.c → ext/ca_obj_mapping.c} +11 -13
- data/{ca_obj_object.c → ext/ca_obj_object.c} +40 -42
- data/{ca_obj_reduce.c → ext/ca_obj_reduce.c} +3 -5
- data/{ca_obj_refer.c → ext/ca_obj_refer.c} +44 -48
- data/{ca_obj_repeat.c → ext/ca_obj_repeat.c} +45 -47
- data/{ca_obj_select.c → ext/ca_obj_select.c} +4 -6
- data/{ca_obj_shift.c → ext/ca_obj_shift.c} +26 -28
- data/{ca_obj_transpose.c → ext/ca_obj_transpose.c} +26 -28
- data/{ca_obj_unbound_repeat.c → ext/ca_obj_unbound_repeat.c} +106 -160
- data/{ca_obj_window.c → ext/ca_obj_window.c} +33 -35
- data/{carray.h → ext/carray.h} +90 -59
- data/{carray_access.c → ext/carray_access.c} +244 -109
- data/{carray_attribute.c → ext/carray_attribute.c} +161 -207
- data/{carray_call_cfunc.c → ext/carray_call_cfunc.c} +1 -3
- data/{carray_cast.c → ext/carray_cast.c} +350 -149
- data/{carray_cast_func.rb → ext/carray_cast_func.rb} +1 -2
- data/{carray_class.c → ext/carray_class.c} +28 -36
- data/{carray_conversion.c → ext/carray_conversion.c} +65 -70
- data/{carray_copy.c → ext/carray_copy.c} +34 -50
- data/{carray_core.c → ext/carray_core.c} +75 -62
- data/ext/carray_data_type.c +66 -0
- data/{carray_element.c → ext/carray_element.c} +34 -53
- data/{carray_generate.c → ext/carray_generate.c} +137 -50
- data/{carray_iterator.c → ext/carray_iterator.c} +53 -53
- data/{carray_loop.c → ext/carray_loop.c} +77 -106
- data/{carray_mask.c → ext/carray_mask.c} +105 -114
- data/{carray_math.rb → ext/carray_math.rb} +47 -31
- data/ext/{mathfunc/carray_mathfunc.c → carray_mathfunc.c} +1 -3
- data/{carray_numeric.c → ext/carray_numeric.c} +43 -46
- data/{carray_operator.c → ext/carray_operator.c} +72 -36
- data/{carray_order.c → ext/carray_order.c} +232 -217
- data/{carray_sort_addr.c → ext/carray_sort_addr.c} +14 -21
- data/{carray_stat.c → ext/carray_stat.c} +6 -8
- data/{carray_stat_proc.rb → ext/carray_stat_proc.rb} +25 -27
- data/{carray_test.c → ext/carray_test.c} +59 -51
- data/{carray_undef.c → ext/carray_undef.c} +1 -11
- data/{carray_utils.c → ext/carray_utils.c} +12 -4
- data/{extconf.rb → ext/extconf.rb} +6 -7
- data/{mkmath.rb → ext/mkmath.rb} +14 -4
- data/{ruby_carray.c → ext/ruby_carray.c} +20 -8
- data/{ruby_ccomplex.c → ext/ruby_ccomplex.c} +2 -4
- data/{ruby_float_func.c → ext/ruby_float_func.c} +1 -3
- data/ext/version.h +16 -0
- data/{version.rb → ext/version.rb} +0 -0
- data/lib/carray.rb +52 -10
- data/lib/carray/{base/autoload.rb → autoload.rb} +48 -8
- data/lib/carray/autoload/autoload_base.rb +1 -5
- data/lib/carray/autoload/autoload_gem_cairo.rb +9 -0
- data/lib/carray/autoload/autoload_gem_ffi.rb +9 -0
- data/lib/carray/autoload/autoload_gem_gnuplot.rb +2 -0
- data/lib/carray/autoload/autoload_gem_io_csv.rb +14 -0
- data/lib/carray/autoload/autoload_gem_io_pg.rb +6 -0
- data/lib/carray/autoload/autoload_gem_io_sqlite3.rb +12 -0
- data/lib/carray/autoload/autoload_gem_narray.rb +10 -0
- data/lib/carray/autoload/autoload_gem_numo_narray.rb +15 -0
- data/lib/carray/autoload/autoload_gem_opencv.rb +16 -0
- data/lib/carray/autoload/autoload_gem_random.rb +8 -0
- data/lib/carray/autoload/autoload_gem_rmagick.rb +23 -0
- data/lib/carray/autoload/{autoload_graphics_zimg.rb → autoload_gem_zimg.rb} +0 -0
- data/lib/carray/basic.rb +191 -0
- data/lib/carray/broadcast.rb +101 -0
- data/lib/carray/compose.rb +315 -0
- data/lib/carray/construct.rb +484 -0
- data/lib/carray/convert.rb +115 -0
- data/lib/carray/info.rb +1 -3
- data/lib/carray/{base/inspect.rb → inspect.rb} +9 -11
- data/lib/carray/io/imagemagick.rb +2 -4
- data/lib/carray/{base/iterator.rb → iterator.rb} +6 -6
- data/lib/carray/mask.rb +102 -0
- data/lib/carray/{base/math.rb → math.rb} +21 -53
- data/lib/carray/math/histogram.rb +8 -10
- data/lib/carray/math/recurrence.rb +1 -3
- data/lib/carray/mkmf.rb +9 -3
- data/lib/carray/object/ca_obj_iterator.rb +1 -3
- data/lib/carray/object/ca_obj_link.rb +1 -3
- data/lib/carray/object/ca_obj_pack.rb +9 -11
- data/lib/carray/obsolete.rb +256 -0
- data/lib/carray/ordering.rb +181 -0
- data/lib/carray/{base/serialize.rb → serialize.rb} +50 -66
- data/lib/carray/string.rb +188 -0
- data/lib/carray/{base/struct.rb → struct.rb} +19 -21
- data/lib/carray/{io/table.rb → table.rb} +1 -10
- data/lib/carray/testing.rb +51 -0
- data/lib/carray/time.rb +76 -0
- data/lib/carray/transform.rb +109 -0
- data/misc/Methods.ja.md +182 -0
- data/{NOTE → misc/NOTE} +16 -38
- data/spec/Classes/CABitfield_spec.rb +58 -0
- data/spec/Classes/CABlockIterator_spec.rb +114 -0
- data/spec/Classes/CABlock_spec.rb +205 -0
- data/spec/Classes/CAField_spec.rb +39 -0
- data/spec/Classes/CAGrid_spec.rb +75 -0
- data/spec/Classes/CAMap_spec.rb +0 -0
- data/{test/test_CAMapping.rb → spec/Classes/CAMapping_spec.rb} +35 -36
- data/spec/Classes/CAObject_attribute_spec.rb +33 -0
- data/spec/Classes/CAObject_spec.rb +33 -0
- data/spec/Classes/CARefer_spec.rb +93 -0
- data/spec/Classes/CARepeat_spec.rb +65 -0
- data/spec/Classes/CASelect_spec.rb +22 -0
- data/spec/Classes/CAShift_spec.rb +16 -0
- data/spec/Classes/CAStruct_spec.rb +71 -0
- data/{test/test_CATranspose.rb → spec/Classes/CATranspose_spec.rb} +20 -21
- data/spec/Classes/CAUnboudRepeat_spec.rb +102 -0
- data/spec/Classes/CAWindow_spec.rb +54 -0
- data/spec/Classes/CAWrap_spec.rb +8 -0
- data/{test/test_CArray.rb → spec/Classes/CArray_spec.rb} +48 -92
- data/spec/Classes/CScalar_spec.rb +55 -0
- data/spec/Features/feature_130_spec.rb +19 -0
- data/spec/Features/feature_attributes_spec.rb +280 -0
- data/spec/Features/feature_boolean_spec.rb +98 -0
- data/spec/Features/feature_broadcast.rb +116 -0
- data/spec/Features/feature_cast_function.rb +19 -0
- data/spec/Features/feature_cast_spec.rb +33 -0
- data/spec/Features/feature_class_spec.rb +84 -0
- data/spec/Features/feature_complex_spec.rb +42 -0
- data/{test/test_composite.rb → spec/Features/feature_composite_spec.rb} +17 -18
- data/spec/Features/feature_convert_spec.rb +46 -0
- data/spec/Features/feature_copy_spec.rb +123 -0
- data/spec/Features/feature_creation_spec.rb +84 -0
- data/spec/Features/feature_element_spec.rb +144 -0
- data/spec/Features/feature_extream_spec.rb +54 -0
- data/spec/Features/feature_generate_spec.rb +74 -0
- data/spec/Features/feature_index_spec.rb +69 -0
- data/spec/Features/feature_mask_spec.rb +580 -0
- data/spec/Features/feature_math_spec.rb +97 -0
- data/spec/Features/feature_order_spec.rb +146 -0
- data/spec/Features/feature_ref_store_spec.rb +209 -0
- data/spec/Features/feature_serialization_spec.rb +125 -0
- data/spec/Features/feature_stat_spec.rb +397 -0
- data/spec/Features/feature_virtual_spec.rb +48 -0
- data/spec/Features/method_eq_spec.rb +81 -0
- data/spec/Features/method_is_nan_spec.rb +12 -0
- data/spec/Features/method_map_spec.rb +54 -0
- data/spec/Features/method_max_with.rb +20 -0
- data/spec/Features/method_min_with.rb +19 -0
- data/spec/Features/method_ne_spec.rb +18 -0
- data/spec/Features/method_project_spec.rb +188 -0
- data/spec/Features/method_ref_spec.rb +27 -0
- data/spec/Features/method_round_spec.rb +11 -0
- data/spec/Features/method_s_linspace_spec.rb +48 -0
- data/spec/Features/method_s_span_spec.rb +14 -0
- data/spec/Features/method_seq_spec.rb +47 -0
- data/spec/Features/method_sort_with.rb +43 -0
- data/spec/Features/method_sorted_with.rb +29 -0
- data/spec/Features/method_span_spec.rb +42 -0
- data/spec/Features/method_wrap_readonly_spec.rb +43 -0
- data/{test → spec/UnitTest}/test_CAVirtual.rb +0 -0
- data/spec/spec_all.rb +0 -1
- data/utils/convert_test.rb +73 -0
- data/utils/{extract_rdoc.rb → extract_yard.rb} +7 -12
- data/{devel → utils}/guess_shape.rb +0 -0
- data/utils/{diff_method.rb → monkey_patch_methods.rb} +17 -7
- metadata +171 -298
- data/COPYING +0 -56
- data/GPL +0 -340
- data/Gemfile +0 -8
- data/Gemfile.lock +0 -33
- data/LEGAL +0 -50
- data/TODO +0 -5
- data/carray_random.c +0 -531
- data/ext/calculus/carray_calculus.c +0 -931
- data/ext/calculus/carray_interp.c +0 -358
- data/ext/calculus/extconf.rb +0 -12
- data/ext/calculus/lib/autoload/autoload_math_calculus.rb +0 -2
- data/ext/calculus/lib/math/calculus.rb +0 -119
- data/ext/calculus/lib/math/interp/adapter_interp1d.rb +0 -31
- data/ext/fortio/extconf.rb +0 -3
- data/ext/fortio/lib/carray/autoload/autoload_fortran_format.rb +0 -5
- data/ext/fortio/lib/carray/io/fortran_format.rb +0 -43
- data/ext/fortio/lib/fortio.rb +0 -3
- data/ext/fortio/lib/fortio/fortran_format.rb +0 -605
- data/ext/fortio/lib/fortio/fortran_format.tab.rb +0 -536
- data/ext/fortio/lib/fortio/fortran_format.y +0 -215
- data/ext/fortio/lib/fortio/fortran_namelist.rb +0 -151
- data/ext/fortio/lib/fortio/fortran_namelist.tab.rb +0 -470
- data/ext/fortio/lib/fortio/fortran_namelist.y +0 -213
- data/ext/fortio/lib/fortio/fortran_sequential.rb +0 -345
- data/ext/fortio/ruby_fortio.c +0 -182
- data/ext/fortio/test/test_H.rb +0 -5
- data/ext/fortio/test/test_T.rb +0 -7
- data/ext/fortio/test/test_fortran_format.rb +0 -86
- data/ext/fortio/test/test_namelist.rb +0 -25
- data/ext/fortio/test/test_namelist_write.rb +0 -10
- data/ext/fortio/test/test_sequential.rb +0 -13
- data/ext/fortio/test/test_sequential2.rb +0 -13
- data/ext/fortio/work/test.rb +0 -10
- data/ext/fortio/work/test_e.rb +0 -19
- data/ext/fortio/work/test_ep.rb +0 -10
- data/ext/fortio/work/test_parse.rb +0 -12
- data/ext/mathfunc/extconf.rb +0 -18
- data/ext/mathfunc/lib/autoload/autoload_math_mathfunc.rb +0 -1
- data/ext/mathfunc/lib/math/mathfunc.rb +0 -15
- data/ext/mathfunc/test/test_hypot.rb +0 -5
- data/ext/mathfunc/test/test_j0.rb +0 -22
- data/ext/mathfunc/test/test_jn.rb +0 -8
- data/ext/mathfunc/test/test_sph.rb +0 -9
- data/ext/narray/README +0 -22
- data/ext/narray/ca_wrap_narray.c +0 -500
- data/ext/narray/carray_narray.c +0 -21
- data/ext/narray/extconf.rb +0 -57
- data/ext/narray/lib/autoload/autoload_math_narray.rb +0 -1
- data/ext/narray/lib/autoload/autoload_math_narray_miss.rb +0 -11
- data/ext/narray/lib/math/narray.rb +0 -17
- data/ext/narray/lib/math/narray_miss.rb +0 -45
- data/lib/carray/autoload/autoload_graphics_gnuplot.rb +0 -2
- data/lib/carray/autoload/autoload_io_csv.rb +0 -14
- data/lib/carray/autoload/autoload_io_numo.rb +0 -9
- data/lib/carray/autoload/autoload_io_pg.rb +0 -6
- data/lib/carray/autoload/autoload_io_sqlite3.rb +0 -12
- data/lib/carray/autoload/autoload_io_table.rb +0 -1
- data/lib/carray/autoload/autoload_math_interp.rb +0 -4
- data/lib/carray/base/basic.rb +0 -1090
- data/lib/carray/base/obsolete.rb +0 -131
- data/lib/carray/graphics/gnuplot.rb +0 -2141
- data/lib/carray/graphics/zimg.rb +0 -296
- data/lib/carray/io/csv.rb +0 -572
- data/lib/carray/io/numo.rb +0 -52
- data/lib/carray/io/pg.rb +0 -101
- data/lib/carray/io/sqlite3.rb +0 -215
- data/lib/carray/math/interp.rb +0 -57
- data/lib/carray/math/interp/adapter_gsl_spline.rb +0 -47
- data/mt19937ar.c +0 -182
- data/mt19937ar.h +0 -86
- data/rdoc_main.rb +0 -27
- data/rdoc_math.rb +0 -5
- data/rdoc_stat.rb +0 -31
- data/spec/CABlockIterator/CABlockIterator_spec.rb +0 -113
- data/spec/CArray/bug/store_spec.rb +0 -27
- data/spec/CArray/index/repeat_spec.rb +0 -10
- data/spec/CArray/method/eq_spec.rb +0 -80
- data/spec/CArray/method/is_nan_spec.rb +0 -12
- data/spec/CArray/method/ne_spec.rb +0 -18
- data/spec/CArray/method/round_spec.rb +0 -11
- data/spec/CArray/object/_attribute_spec.rb +0 -32
- data/spec/CArray/object/s_new_spec.rb +0 -31
- data/spec/CArray/serialize/Serialization_spec.rb +0 -89
- data/test/test_130.rb +0 -23
- data/test/test_ALL.rb +0 -51
- data/test/test_CABitfield.rb +0 -59
- data/test/test_CABlock.rb +0 -208
- data/test/test_CAField.rb +0 -40
- data/test/test_CAGrid.rb +0 -76
- data/test/test_CAMmap.rb +0 -11
- data/test/test_CARefer.rb +0 -94
- data/test/test_CARepeat.rb +0 -66
- data/test/test_CASelect.rb +0 -23
- data/test/test_CAShift.rb +0 -17
- data/test/test_CAWindow.rb +0 -55
- data/test/test_CAWrap.rb +0 -9
- data/test/test_CComplex.rb +0 -83
- data/test/test_CScalar.rb +0 -91
- data/test/test_attribute.rb +0 -281
- data/test/test_block_iterator.rb +0 -17
- data/test/test_boolean.rb +0 -99
- data/test/test_cast.rb +0 -33
- data/test/test_class.rb +0 -85
- data/test/test_complex.rb +0 -43
- data/test/test_convert.rb +0 -79
- data/test/test_copy.rb +0 -141
- data/test/test_creation.rb +0 -85
- data/test/test_element.rb +0 -146
- data/test/test_extream.rb +0 -55
- data/test/test_generate.rb +0 -75
- data/test/test_index.rb +0 -71
- data/test/test_mask.rb +0 -578
- data/test/test_math.rb +0 -98
- data/test/test_narray.rb +0 -64
- data/test/test_order.rb +0 -147
- data/test/test_random.rb +0 -15
- data/test/test_ref_store.rb +0 -211
- data/test/test_stat.rb +0 -414
- data/test/test_struct.rb +0 -72
- data/test/test_virtual.rb +0 -49
- data/utils/create_rdoc.sh +0 -9
- data/utils/make_tgz.sh +0 -3
- data/version.h +0 -18
@@ -1,12 +1,10 @@
|
|
1
1
|
# ----------------------------------------------------------------------------
|
2
2
|
#
|
3
|
-
# carray/
|
3
|
+
# carray/serialize.rb
|
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
|
#
|
@@ -33,7 +31,7 @@
|
|
33
31
|
# offset 20 bytes
|
34
32
|
# data_type : int32 : data type specifier
|
35
33
|
# bytes : int32 : byte size of each data
|
36
|
-
#
|
34
|
+
# ndim : int32 : ndim of array
|
37
35
|
# elements : int32 : number of all elements
|
38
36
|
# has_mask : int32 : 0 (not masked) or 1 (masked)
|
39
37
|
# offset 40 bytes
|
@@ -41,8 +39,10 @@
|
|
41
39
|
# has_attribute : int32
|
42
40
|
#
|
43
41
|
# offset 256 bytes
|
44
|
-
# data
|
45
|
-
# mask
|
42
|
+
# data : bytes*elements : value data
|
43
|
+
# mask : int8*elements : mask data if has_mask == 1
|
44
|
+
# attribute : object marshal : attribute
|
45
|
+
# data_class_name : string marshal : data_class_name
|
46
46
|
|
47
47
|
require "stringio"
|
48
48
|
|
@@ -54,11 +54,25 @@ class CArray::Serializer # :nodoc:
|
|
54
54
|
char_p :endian, :bytes=>4
|
55
55
|
int32 :data_type
|
56
56
|
int64 :bytes
|
57
|
-
int32 :
|
57
|
+
int32 :ndim
|
58
58
|
int64 :elements
|
59
59
|
int32 :has_mask
|
60
60
|
array :dim, :type => CArray.int64(CA_RANK_MAX)
|
61
61
|
int32 :has_attr
|
62
|
+
int32 :has_data_class
|
63
|
+
}
|
64
|
+
|
65
|
+
Header_Legacy = CA.struct(:pack=>1, :size=>256) {
|
66
|
+
char_p :magic_string, :bytes=>8
|
67
|
+
char_p :data_type_name, :bytes=>8
|
68
|
+
char_p :endian, :bytes=>4
|
69
|
+
int32 :data_type
|
70
|
+
int32 :bytes
|
71
|
+
int32 :ndim
|
72
|
+
int32 :elements
|
73
|
+
int32 :has_mask
|
74
|
+
array :dim, :type => CArray.int32(CA_RANK_MAX)
|
75
|
+
int32 :has_attr
|
62
76
|
}
|
63
77
|
|
64
78
|
def initialize (io)
|
@@ -79,18 +93,19 @@ class CArray::Serializer # :nodoc:
|
|
79
93
|
header[:endian] = ( endian == CA_LITTLE_ENDIAN ) ? "_LE_" : "_BE_"
|
80
94
|
header[:data_type] = ca.data_type
|
81
95
|
header[:bytes] = ca.bytes
|
82
|
-
header[:
|
96
|
+
header[:ndim] = ca.ndim
|
83
97
|
header[:elements] = ca.elements
|
84
98
|
header[:has_mask] = ca.has_mask? ? 1 : 0
|
85
|
-
header[:
|
86
|
-
|
99
|
+
header[:has_data_class] = ca.has_data_class? ? 1 : 0
|
100
|
+
header[:dim][[0,ca.ndim]] = ca.dim
|
101
|
+
attributes = nil
|
87
102
|
if ca.attribute
|
88
|
-
|
103
|
+
attributes = ca.attribute.clone
|
89
104
|
end
|
90
105
|
if opt[:attribute]
|
91
|
-
(
|
106
|
+
(attributes ||= {}).update(opt[:attribute])
|
92
107
|
end
|
93
|
-
header[:has_attr] =
|
108
|
+
header[:has_attr] = attributes.empty? ? 0 : 1
|
94
109
|
unless CArray.endian == endian
|
95
110
|
header.swap_bytes!
|
96
111
|
end
|
@@ -108,14 +123,21 @@ class CArray::Serializer # :nodoc:
|
|
108
123
|
if ca.has_mask?
|
109
124
|
ca.mask.dump_binary(@io)
|
110
125
|
end
|
111
|
-
if
|
112
|
-
Marshal.dump(
|
126
|
+
if attributes
|
127
|
+
Marshal.dump(attributes, @io)
|
128
|
+
end
|
129
|
+
if ca.has_data_class?
|
130
|
+
Marshal.dump(ca.data_class.to_s, @io)
|
113
131
|
end
|
114
132
|
return ca
|
115
133
|
end
|
116
134
|
|
117
|
-
def load (opt = {})
|
118
|
-
|
135
|
+
def load (opt = {}, legacy: false)
|
136
|
+
if legacy
|
137
|
+
header = Header_Legacy.decode(@io.read(256))
|
138
|
+
else
|
139
|
+
header = Header.decode(@io.read(256))
|
140
|
+
end
|
119
141
|
if header[:magic_string] != "_CARRAY_"
|
120
142
|
raise "not a CArray binary data"
|
121
143
|
end
|
@@ -130,11 +152,12 @@ class CArray::Serializer # :nodoc:
|
|
130
152
|
end
|
131
153
|
data_type = header[:data_type]
|
132
154
|
bytes = header[:bytes]
|
133
|
-
|
155
|
+
ndim = header[:ndim]
|
134
156
|
elements = header[:elements]
|
135
157
|
has_mask = header[:has_mask] != 0 ? true : false
|
136
|
-
dim = header[:dim][[0,
|
137
|
-
has_attr = header[:has_attr]
|
158
|
+
dim = header[:dim][[0, ndim]].to_a
|
159
|
+
has_attr = header[:has_attr] != 0 ? true : false
|
160
|
+
has_data_class = header[:has_data_class] != 0 ? true : false
|
138
161
|
if data_type == 255
|
139
162
|
data_type = header[:data_type_name].strip.to_sym
|
140
163
|
end
|
@@ -155,9 +178,12 @@ class CArray::Serializer # :nodoc:
|
|
155
178
|
ca.mask = 0
|
156
179
|
ca.mask.load_binary(@io)
|
157
180
|
end
|
158
|
-
if has_attr
|
181
|
+
if has_attr
|
159
182
|
ca.attribute = Marshal.load(@io)
|
160
183
|
end
|
184
|
+
if has_data_class
|
185
|
+
ca.data_class = Kernel.const_get(Marshal.load(@io))
|
186
|
+
end
|
161
187
|
return ca
|
162
188
|
end
|
163
189
|
|
@@ -202,7 +228,8 @@ class CArray
|
|
202
228
|
|
203
229
|
def marshal_dump ()
|
204
230
|
if self.class != CArray and self.class != CScalar
|
205
|
-
|
231
|
+
return CArray.dump(self.to_ca)
|
232
|
+
# raise TypeError, "can't dump a virtual or wrapped array."
|
206
233
|
end
|
207
234
|
return CArray.dump(self)
|
208
235
|
end
|
@@ -213,48 +240,5 @@ class CArray
|
|
213
240
|
initialize_copy(ca)
|
214
241
|
end
|
215
242
|
|
216
|
-
### obsolete methods
|
217
|
-
|
218
|
-
def save_binary (filename, opt={}) # :nodoc:
|
219
|
-
warn "CArray#save_binary will be obsolete, use CArray.save"
|
220
|
-
open(filename, "w") { |io|
|
221
|
-
return Serializer.new(io).save(self, opt)
|
222
|
-
}
|
223
|
-
end
|
224
|
-
|
225
|
-
def self.load_binary (filename, opt={}) # :nodoc:
|
226
|
-
warn "CArray.load_binary will be obsolete, use CArray.load"
|
227
|
-
open(filename) { |io|
|
228
|
-
return Serializer.new(io).load(opt)
|
229
|
-
}
|
230
|
-
end
|
231
|
-
|
232
|
-
def save_binary_io (io, opt={}) # :nodoc:
|
233
|
-
warn "CArray#save_binary_io will be obsolete, use CArray.save"
|
234
|
-
return Serializer.new(io).save(self, opt)
|
235
|
-
end
|
236
|
-
|
237
|
-
def self.load_binary_io (io, opt={}) # :nodoc:
|
238
|
-
warn "CArray#load_binary_io will be obsolete, use CArray.load"
|
239
|
-
return Serializer.new(io).load(opt)
|
240
|
-
end
|
241
|
-
|
242
|
-
def to_binary (io="", opt={}) # :nodoc:
|
243
|
-
warn "CArray#to_binary will be obsolete, use CArray.dump"
|
244
|
-
Serializer.new(io).save(self, opt)
|
245
|
-
return io
|
246
|
-
end
|
247
|
-
|
248
|
-
def self.from_binary (io, opt={}) # :nodoc:
|
249
|
-
warn "CArray.from_binary will be obsolete, use CArray.load"
|
250
|
-
return Serializer.new(io).load(opt)
|
251
|
-
end
|
252
|
-
|
253
|
-
# depleted methods
|
254
|
-
|
255
|
-
def self.load_from_file (filename, data_type, dim, opt={}) # :nodoc:
|
256
|
-
raise "Sorry, CArray.load_from_file is depleted"
|
257
|
-
end
|
258
|
-
|
259
243
|
end
|
260
244
|
|
@@ -0,0 +1,188 @@
|
|
1
|
+
# ----------------------------------------------------------------------------
|
2
|
+
#
|
3
|
+
# carray/string.rb
|
4
|
+
#
|
5
|
+
# This file is part of Ruby/CArray extension library.
|
6
|
+
#
|
7
|
+
# Copyright (C) 2005-2020 Hiroki Motoyoshi
|
8
|
+
#
|
9
|
+
# ----------------------------------------------------------------------------
|
10
|
+
|
11
|
+
require "date"
|
12
|
+
|
13
|
+
class CArray
|
14
|
+
|
15
|
+
def str_len ()
|
16
|
+
return convert(:int, &:length)
|
17
|
+
end
|
18
|
+
|
19
|
+
def str_size ()
|
20
|
+
return convert(:int, &:size)
|
21
|
+
end
|
22
|
+
|
23
|
+
def str_bytesize ()
|
24
|
+
return convert(:int, &:bytesize)
|
25
|
+
end
|
26
|
+
|
27
|
+
def str_gsub (*args, &block)
|
28
|
+
return convert() {|s| s.gsub(*args, &block) }
|
29
|
+
end
|
30
|
+
|
31
|
+
def str_sub (*args, &block)
|
32
|
+
return convert() {|s| s.sub(*args, &block) }
|
33
|
+
end
|
34
|
+
|
35
|
+
def str_encode (*args)
|
36
|
+
return convert() {|s| s.encode(*args) }
|
37
|
+
end
|
38
|
+
|
39
|
+
def str_force_encoding (encoding)
|
40
|
+
return convert() {|s| s.force_encoding(encoding) }
|
41
|
+
end
|
42
|
+
|
43
|
+
def str_encoding ()
|
44
|
+
return convert(&:encoding)
|
45
|
+
end
|
46
|
+
|
47
|
+
def str_is_end_with (*args)
|
48
|
+
return test {|s| s.end_with?(*args) }
|
49
|
+
end
|
50
|
+
|
51
|
+
def str_is_start_with (*args)
|
52
|
+
return test {|s| s.start_with?(*args) }
|
53
|
+
end
|
54
|
+
|
55
|
+
def str_includes (substr)
|
56
|
+
return test {|s| s.include?(substr) }
|
57
|
+
end
|
58
|
+
|
59
|
+
alias str_contains str_includes
|
60
|
+
|
61
|
+
def str_index (*args)
|
62
|
+
return convert(:int) {|s| s.index(*args) }
|
63
|
+
end
|
64
|
+
|
65
|
+
def str_rindex (*args)
|
66
|
+
return convert(:int) {|s| s.rindex(*args) }
|
67
|
+
end
|
68
|
+
|
69
|
+
def str_intern ()
|
70
|
+
return convert(&:intern)
|
71
|
+
end
|
72
|
+
|
73
|
+
def str_scrub ()
|
74
|
+
return convert(&:scrub)
|
75
|
+
end
|
76
|
+
|
77
|
+
def str_downcase ()
|
78
|
+
return convert(&:downcase)
|
79
|
+
end
|
80
|
+
|
81
|
+
def str_upcase ()
|
82
|
+
return convert(&:upcase)
|
83
|
+
end
|
84
|
+
|
85
|
+
def str_capitalize ()
|
86
|
+
return convert(&:capitalize)
|
87
|
+
end
|
88
|
+
|
89
|
+
def str_swapcase ()
|
90
|
+
return convert(&:swapcase)
|
91
|
+
end
|
92
|
+
|
93
|
+
def str_chomp (*args)
|
94
|
+
return convert() {|s| s.chomp(*args) }
|
95
|
+
end
|
96
|
+
|
97
|
+
def str_chop ()
|
98
|
+
return convert(&:chop)
|
99
|
+
end
|
100
|
+
|
101
|
+
def str_chr ()
|
102
|
+
return convert(&:chr)
|
103
|
+
end
|
104
|
+
|
105
|
+
def str_clear ()
|
106
|
+
return convert(&:clear)
|
107
|
+
end
|
108
|
+
|
109
|
+
def str_count (*args)
|
110
|
+
return convert(:int) {|s| s.count(*args) }
|
111
|
+
end
|
112
|
+
|
113
|
+
def str_delete (*args)
|
114
|
+
return convert() {|s| s.delete(*args) }
|
115
|
+
end
|
116
|
+
|
117
|
+
def str_delete_prefix (prefix)
|
118
|
+
return convert() {|s| s.delete_prefix(prefix) }
|
119
|
+
end
|
120
|
+
|
121
|
+
def str_delete_suffix (suffix)
|
122
|
+
return convert() {|s| s.delete_suffix(suffix) }
|
123
|
+
end
|
124
|
+
|
125
|
+
def str_dump ()
|
126
|
+
return convert(&:dump)
|
127
|
+
end
|
128
|
+
|
129
|
+
def str_center (*args)
|
130
|
+
return convert() {|s| s.center(*args) }
|
131
|
+
end
|
132
|
+
|
133
|
+
def str_ljust (*args)
|
134
|
+
return convert() {|s| s.ljust(*args) }
|
135
|
+
end
|
136
|
+
|
137
|
+
def str_rjust (*args)
|
138
|
+
return convert() {|s| s.rjust(*args) }
|
139
|
+
end
|
140
|
+
|
141
|
+
def str_to_i ()
|
142
|
+
return convert(&:to_i)
|
143
|
+
end
|
144
|
+
|
145
|
+
def str_to_f ()
|
146
|
+
return convert(&:to_f)
|
147
|
+
end
|
148
|
+
|
149
|
+
def str_to_r ()
|
150
|
+
return convert(&:to_r)
|
151
|
+
end
|
152
|
+
|
153
|
+
def str_strip ()
|
154
|
+
return convert(&:strip)
|
155
|
+
end
|
156
|
+
|
157
|
+
def str_rstrip ()
|
158
|
+
return convert(&:rstrip)
|
159
|
+
end
|
160
|
+
|
161
|
+
def str_lstrip ()
|
162
|
+
return convert(&:lstrip)
|
163
|
+
end
|
164
|
+
|
165
|
+
def str_is_empty ()
|
166
|
+
return test(&:empty?)
|
167
|
+
end
|
168
|
+
|
169
|
+
def str_matches (*args)
|
170
|
+
if args.size == 1 && args.first.is_a?(Regexp)
|
171
|
+
regexp = args.first
|
172
|
+
return test {|v| v =~ regexp }
|
173
|
+
else
|
174
|
+
mask = template(:boolean) { false }
|
175
|
+
args.each do |str|
|
176
|
+
addr = search(str)
|
177
|
+
mask[addr] = true if addr
|
178
|
+
end
|
179
|
+
return mask
|
180
|
+
end
|
181
|
+
end
|
182
|
+
|
183
|
+
def str_extract (regexp, replace = '\0')
|
184
|
+
return convert {|s| regexp.match(s) {|m| m[0].sub(regexp, replace) } || "" }
|
185
|
+
end
|
186
|
+
|
187
|
+
end
|
188
|
+
|
@@ -1,28 +1,26 @@
|
|
1
1
|
# ----------------------------------------------------------------------------
|
2
2
|
#
|
3
|
-
# carray/
|
3
|
+
# carray/struct.rb
|
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
|
#
|
13
11
|
# The data class for fixed length carray are required to satisfy only
|
14
|
-
#
|
12
|
+
# five conditions.
|
15
13
|
#
|
16
14
|
# * constant data_class::DATA_SIZE -> integer
|
17
|
-
# * constant data_class::MEMBERS -> array of string
|
18
15
|
# * constant data_class::MEMBER_TABLE -> hash
|
16
|
+
# * constant data_class::MEMBERS -> array (MEMBER_TABLE.keys as usual)
|
19
17
|
# * method data_class.decode(data) -> new data_class object
|
20
18
|
# * method data_class#encode() -> string
|
21
19
|
#
|
22
20
|
# The implementation of other properties (cf. initialization, instance,
|
23
21
|
# methods ...) are left free.
|
24
22
|
#
|
25
|
-
#
|
23
|
+
# CAStruct and CAUnion are examples of such data class.
|
26
24
|
#
|
27
25
|
# option = {
|
28
26
|
# :pack => 1, # nil for alignment, int for pack(n)
|
@@ -90,7 +88,7 @@ class CArray
|
|
90
88
|
|
91
89
|
end
|
92
90
|
|
93
|
-
class
|
91
|
+
class CAStruct
|
94
92
|
|
95
93
|
include Enumerable
|
96
94
|
|
@@ -264,7 +262,7 @@ class CA::Struct
|
|
264
262
|
|
265
263
|
end
|
266
264
|
|
267
|
-
class
|
265
|
+
class CAUnion < CAStruct
|
268
266
|
class << self
|
269
267
|
def inspect
|
270
268
|
return name.nil? ? "AnonUnion" : name
|
@@ -275,11 +273,11 @@ end
|
|
275
273
|
module CA
|
276
274
|
|
277
275
|
def self.struct (opt={}, &block)
|
278
|
-
return
|
276
|
+
return CAStruct::Builder.new(:struct, opt).define(&block)
|
279
277
|
end
|
280
278
|
|
281
279
|
def self.union (opt={}, &block)
|
282
|
-
return
|
280
|
+
return CAStruct::Builder.new(:union, opt).define(&block)
|
283
281
|
end
|
284
282
|
|
285
283
|
end
|
@@ -290,7 +288,7 @@ end
|
|
290
288
|
#
|
291
289
|
# ---------------------------------------------------------------------
|
292
290
|
|
293
|
-
class
|
291
|
+
class CAStruct::Builder # :nodoc:
|
294
292
|
|
295
293
|
class Member # :nodoc:
|
296
294
|
|
@@ -358,9 +356,9 @@ class CA::Struct::Builder # :nodoc:
|
|
358
356
|
# ---
|
359
357
|
case @type
|
360
358
|
when :struct
|
361
|
-
klass = Class.new(
|
359
|
+
klass = Class.new(CAStruct)
|
362
360
|
when :union
|
363
|
-
klass = Class.new(
|
361
|
+
klass = Class.new(CAUnion)
|
364
362
|
end
|
365
363
|
# ---
|
366
364
|
if @align.nil?
|
@@ -477,7 +475,7 @@ class CA::Struct::Builder # :nodoc:
|
|
477
475
|
if block
|
478
476
|
opt = {:pack => @align}.update(opt)
|
479
477
|
st = self.class.new(:struct, opt).define(&block)
|
480
|
-
elsif opt[:type] and opt[:type] <=
|
478
|
+
elsif opt[:type] and opt[:type] <= CAStruct
|
481
479
|
st = opt[:type]
|
482
480
|
else
|
483
481
|
raise "type is not given for struct member of struct"
|
@@ -494,7 +492,7 @@ class CA::Struct::Builder # :nodoc:
|
|
494
492
|
if block
|
495
493
|
opt = {:pack => @align}.update(opt)
|
496
494
|
st = self.class.new(:union, opt).define(&block)
|
497
|
-
elsif opt[:type] and opt[:type] <=
|
495
|
+
elsif opt[:type] and opt[:type] <= CAStruct
|
498
496
|
st = opt[:type]
|
499
497
|
else
|
500
498
|
raise "type is not given for union member of struct"
|
@@ -556,14 +554,14 @@ end
|
|
556
554
|
|
557
555
|
|
558
556
|
|
559
|
-
class
|
557
|
+
class CAStruct
|
560
558
|
|
561
559
|
def self.spec
|
562
560
|
output = ""
|
563
561
|
table = self::MEMBER_TABLE
|
564
562
|
stlist = []
|
565
563
|
if self.name.nil?
|
566
|
-
if self <=
|
564
|
+
if self <= CAUnion
|
567
565
|
prefix = "union"
|
568
566
|
else
|
569
567
|
prefix = "struct"
|
@@ -573,7 +571,7 @@ class CA::Struct
|
|
573
571
|
else
|
574
572
|
output << sprintf("%s = ", self.name)
|
575
573
|
end
|
576
|
-
if self <
|
574
|
+
if self < CAUnion
|
577
575
|
output << sprintf("CA.union(:size=>%i) {\n", self::DATA_SIZE)
|
578
576
|
else
|
579
577
|
output << sprintf("CA.struct(:size=>%i) {\n", self::DATA_SIZE)
|
@@ -582,10 +580,10 @@ class CA::Struct
|
|
582
580
|
offset, type, option = *table[member]
|
583
581
|
case type
|
584
582
|
when Class
|
585
|
-
if type <
|
583
|
+
if type < CAStruct
|
586
584
|
stlist << type
|
587
585
|
if type.name.nil?
|
588
|
-
if type <=
|
586
|
+
if type <= CAUnion
|
589
587
|
prefix = "union"
|
590
588
|
else
|
591
589
|
prefix = "struct"
|