Skip to content

Commit df684aa

Browse files
committed
syntax compatiable with older Matlab
1 parent 79c3227 commit df684aa

File tree

4 files changed

+59
-10
lines changed

4 files changed

+59
-10
lines changed

+stdlib/extract_zstd.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function extract_zstd(archive, out_dir)
1515
extract_zstd_bin(archive, out_dir)
1616
end
1717

18-
[ret, msg] = stdlib.subprocess_run([exe, "-E", "tar", "xf", archive], cwd=out_dir);
18+
[ret, msg] = stdlib.subprocess_run([exe, "-E", "tar", "xf", archive], "cwd", out_dir);
1919
assert(ret == 0, "problem extracting %s %s", archive, msg)
2020

2121
end

test/TestHDF5.m

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,16 @@ function setup_file(tc)
4444
stdlib.h5save(bf, '/A3', A3, "size", size(A3))
4545
stdlib.h5save(bf, '/A4', A4)
4646

47+
try
48+
if ~isMATLABReleaseOlderThan("R2020b")
4749
stdlib.h5save(bf, "/utf", utf)
4850
stdlib.h5save(bf, "/utf2", utf2)
51+
end
52+
catch e
53+
if e.identifier ~= "MATLAB:UndefinedFunction"
54+
rethrow(e)
55+
end
56+
end
4957

5058
stdlib.h5save(bf, '/t/x', 12)
5159
stdlib.h5save(bf, '/t/y', 13)
@@ -71,7 +79,18 @@ function test_get_variables(tc)
7179
basic = tc.TestData.basic;
7280

7381
v = stdlib.h5variables(basic);
74-
k = ["A0", "A1", "A2", "A3", "A4", "utf", "utf2"];
82+
k = ["A0", "A1", "A2", "A3", "A4"];
83+
84+
try
85+
if ~isMATLABReleaseOlderThan("R2020b")
86+
k = [k, "utf", "utf2"];
87+
end
88+
catch e
89+
if e.identifier ~= "MATLAB:UndefinedFunction"
90+
rethrow(e)
91+
end
92+
end
93+
7594
tc.verifyEqual(sort(v), k)
7695

7796
% 1-level group
@@ -121,11 +140,19 @@ function test_size(tc)
121140
tc.verifyTrue(isvector(s))
122141
tc.verifyEqual(s, [4,3,2,5])
123142

143+
try
144+
if ~isMATLABReleaseOlderThan("R2020b")
124145
s = stdlib.h5size(basic, '/utf');
125146
tc.verifyEmpty(s)
126147

127148
s = stdlib.h5size(basic, '/utf2');
128149
tc.verifyEqual(s, 2)
150+
end
151+
catch e
152+
if e.identifier ~= "MATLAB:UndefinedFunction"
153+
rethrow(e)
154+
end
155+
end
129156

130157
end
131158

@@ -155,13 +182,21 @@ function test_read(tc)
155182
tc.verifyEqual(ndims(s), 4)
156183
tc.verifyEqual(s, tc.TestData.A4)
157184

185+
try
186+
if ~isMATLABReleaseOlderThan("R2020b")
158187
s = h5read(basic, '/utf');
159188
tc.verifyTrue(ischar(s))
160189
tc.verifyEqual(s, tc.TestData.utf)
161190

162191
s = h5read(basic, '/utf2');
163192
tc.verifyThat(s, IsOfClass('string'))
164193
tc.verifyEqual(s, tc.TestData.utf2)
194+
end
195+
catch e
196+
if e.identifier ~= "MATLAB:UndefinedFunction"
197+
rethrow(e)
198+
end
199+
end
165200

166201
end
167202

test/TestNetCDF.m

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,23 @@ function setup_file(tc)
3636

3737
% create test data first, so that parallel tests works
3838
stdlib.ncsave(basic, 'A0', A0)
39-
stdlib.ncsave(basic, 'A1', A1, dims={'x1', size(A1,1)})
40-
stdlib.ncsave(basic, 'A2', A2, dims={'x2', size(A2,1), 'y2', size(A2,2)})
41-
stdlib.ncsave(basic, 'A3', A3, dims={'x3', size(A3,1), 'y3', size(A3,2), 'z3', size(A3,3)})
42-
stdlib.ncsave(basic, 'A4', A4, dims={'x4', size(A4,1), 'y4', size(A4,2), 'z4', size(A4,3), 'w4', size(A4,4)})
39+
stdlib.ncsave(basic, 'A1', A1, "dims", {'x1', size(A1,1)})
40+
stdlib.ncsave(basic, 'A2', A2, "dims", {'x2', size(A2,1), 'y2', size(A2,2)})
41+
stdlib.ncsave(basic, 'A3', A3, "dims", {'x3', size(A3,1), 'y3', size(A3,2), 'z3', size(A3,3)})
42+
stdlib.ncsave(basic, 'A4', A4, "dims", {'x4', size(A4,1), 'y4', size(A4,2), 'z4', size(A4,3), 'w4', size(A4,4)})
4343

44+
try
4445
if ~isMATLABReleaseOlderThan('R2021b')
4546
stdlib.ncsave(basic, "utf0", utf0)
46-
stdlib.ncsave(basic, "utf1", utf1, dims={'s1', size(utf1, 1)})
47-
stdlib.ncsave(basic, "utf2", utf2, dims={'s1', size(utf2, 1), 't1', size(utf2, 2)})
47+
stdlib.ncsave(basic, "utf1", utf1, "dims", {'s1', size(utf1, 1)})
48+
stdlib.ncsave(basic, "utf2", utf2, "dims", {'s1', size(utf2, 1), 't1', size(utf2, 2)})
4849
end
50+
catch e
51+
if e.identifier ~= "MATLAB:UndefinedFunction"
52+
rethrow(e)
53+
end
54+
end
55+
4956

5057
stdlib.ncsave(basic, '/t/x', 12)
5158
stdlib.ncsave(basic, '/t/y', 13)
@@ -61,9 +68,16 @@ function test_get_variables(tc)
6168
basic = tc.TestData.basic;
6269

6370
k = ["A0", "A1", "A2", "A3", "A4"];
71+
72+
try
6473
if ~isMATLABReleaseOlderThan('R2021b')
6574
k = [k, ["utf0", "utf1", "utf2"]];
6675
end
76+
catch e
77+
if e.identifier ~= "MATLAB:UndefinedFunction"
78+
rethrow(e)
79+
end
80+
end
6781

6882
tc.verifyEqual(sort(stdlib.ncvariables(basic)), k)
6983

@@ -199,7 +213,7 @@ function test_rewrite(tc)
199213
basic = tc.TestData.basic;
200214

201215
A2 = 3*magic(4);
202-
stdlib.ncsave(basic, "A2", A2, dims={'x2', size(A2,1), 'y2', size(A2,2)})
216+
stdlib.ncsave(basic, "A2", A2, "dims", {'x2', size(A2,1), 'y2', size(A2,2)})
203217

204218
tc.assumeThat(basic, IsFile)
205219
tc.verifyEqual(ncread(basic, 'A2'), 3*magic(4))

test/TestSubprocess.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function test_cwd(tc)
4242
tc.verifyGreaterThan(strlength(m), 0, "empty directory not expected")
4343
tc.verifyEqual(strlength(e), 0, e)
4444

45-
[s, mc, e] = stdlib.subprocess_run(c, cwd=td);
45+
[s, mc, e] = stdlib.subprocess_run(c, "cwd", td);
4646
tc.assertEqual(s, 0, "status non-zero")
4747
tc.verifyNotEqual(m, mc, "expected different directory to have different contents")
4848
tc.verifyEqual(strlength(e), 0, e)

0 commit comments

Comments
 (0)