Skip to content

Commit d95eda9

Browse files
0todd00000todd0000
committed
update nonparam tests
1 parent 23a3871 commit d95eda9

File tree

3 files changed

+71
-58
lines changed

3 files changed

+71
-58
lines changed

‎tests/run_tests.m‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,26 @@
55

66

77

8-
testCase = test_0d;
9-
testCase.run;
10-
11-
12-
testCase = test_0d_mv;
13-
testCase.run;
14-
15-
16-
testCase = test_1d;
17-
testCase.run;
8+
% testCase = test_0d;
9+
% testCase.run;
10+
%
11+
%
12+
% testCase = test_0d_mv;
13+
% testCase.run;
14+
%
15+
%
16+
% testCase = test_1d;
17+
% testCase.run;
1818

1919

2020

2121

2222
%nonparam tests:
2323
if run_np
24-
dir_np = fullfile(spm1d.path, 'tests', 'np');
25-
addpath( dir_np )
26-
testCase = test_0d_np;
27-
testCase.run;
24+
% testCase = test_0d_np;
25+
% testCase.run;
2826

2927

3028
testCase = test_1d_np;
3129
testCase.run;
32-
rmpath( dir_np )
3330
end

tests/np/test_0d_np.m renamed to tests/test_0d_np.m

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,12 @@ function test_anova2(testCase)
130130
rng(0);
131131
cmd = sprintf('spm1d.data.uv0d.anova2.%s();', names{i});
132132
data = eval(cmd);
133-
spm = spm1d.stats.nonparam.anova2(data.Y, data.A, data.B).inference(0.05, 'iterations', 1000);
133+
spms = spm1d.stats.nonparam.anova2(data.Y, data.A, data.B).inference(0.05, 'iterations', 1000);
134134
expected = load( fullfile(spm1d.path, 'results', 'nonparam0d', sprintf('%s.mat',names{i}) ) );
135135
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
136-
verifyThat(testCase, spm, IsEqualTo(expected.spm, 'Using',comps,'Within', RelativeTolerance(1e-6)))
136+
for ii = 1:numel(spms)
137+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
138+
end
137139
end
138140
end
139141

@@ -147,10 +149,12 @@ function test_anova2nested(testCase)
147149
rng(0);
148150
cmd = sprintf('spm1d.data.uv0d.anova2nested.%s();', names{i});
149151
data = eval(cmd);
150-
spm = spm1d.stats.nonparam.anova2nested(data.Y, data.A, data.B).inference(0.05, 'iterations', 1000);
152+
spms = spm1d.stats.nonparam.anova2nested(data.Y, data.A, data.B).inference(0.05, 'iterations', 1000);
151153
expected = load( fullfile(spm1d.path, 'results', 'nonparam0d', sprintf('%s.mat',names{i}) ) );
152154
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
153-
verifyThat(testCase, spm, IsEqualTo(expected.spm, 'Using',comps,'Within', RelativeTolerance(1e-6)))
155+
for ii = 1:numel(spms)
156+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
157+
end
154158
end
155159
end
156160

@@ -164,10 +168,12 @@ function test_anova2onerm(testCase)
164168
rng(0);
165169
cmd = sprintf('spm1d.data.uv0d.anova2onerm.%s();', names{i});
166170
data = eval(cmd);
167-
spm = spm1d.stats.nonparam.anova2onerm(data.Y, data.A, data.B, data.SUBJ).inference(0.05, 'iterations', 1000);
171+
spms = spm1d.stats.nonparam.anova2onerm(data.Y, data.A, data.B, data.SUBJ).inference(0.05, 'iterations', 1000);
168172
expected = load( fullfile(spm1d.path, 'results', 'nonparam0d', sprintf('%s.mat',names{i}) ) );
169173
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
170-
verifyThat(testCase, spm, IsEqualTo(expected.spm, 'Using',comps,'Within', RelativeTolerance(1e-6)))
174+
for ii = 1:numel(spms)
175+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
176+
end
171177
end
172178
end
173179

@@ -181,10 +187,12 @@ function test_anova2rm(testCase)
181187
rng(0);
182188
cmd = sprintf('spm1d.data.uv0d.anova2rm.%s();', names{i});
183189
data = eval(cmd);
184-
spm = spm1d.stats.nonparam.anova2rm(data.Y, data.A, data.B, data.SUBJ).inference(0.05, 'iterations', 1000);
190+
spms = spm1d.stats.nonparam.anova2rm(data.Y, data.A, data.B, data.SUBJ).inference(0.05, 'iterations', 1000);
185191
expected = load( fullfile(spm1d.path, 'results', 'nonparam0d', sprintf('%s.mat',names{i}) ) );
186192
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
187-
verifyThat(testCase, spm, IsEqualTo(expected.spm, 'Using',comps,'Within', RelativeTolerance(1e-6)))
193+
for ii = 1:numel(spms)
194+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
195+
end
188196
end
189197
end
190198

@@ -198,10 +206,12 @@ function test_anova3(testCase)
198206
rng(0);
199207
cmd = sprintf('spm1d.data.uv0d.anova3.%s();', names{i});
200208
data = eval(cmd);
201-
spm = spm1d.stats.nonparam.anova3(data.Y, data.A, data.B, data.C).inference(0.05, 'iterations', 1000);
209+
spms = spm1d.stats.nonparam.anova3(data.Y, data.A, data.B, data.C).inference(0.05, 'iterations', 1000);
202210
expected = load( fullfile(spm1d.path, 'results', 'nonparam0d', sprintf('%s.mat',names{i}) ) );
203211
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
204-
verifyThat(testCase, spm, IsEqualTo(expected.spm, 'Using',comps,'Within', RelativeTolerance(1e-6)))
212+
for ii = 1:numel(spms)
213+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
214+
end
205215
end
206216
end
207217

@@ -233,10 +243,12 @@ function test_anova3onerm(testCase)
233243
rng(0);
234244
cmd = sprintf('spm1d.data.uv0d.anova3onerm.%s();', names{i});
235245
data = eval(cmd);
236-
spm = spm1d.stats.nonparam.anova3onerm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
246+
spms = spm1d.stats.nonparam.anova3onerm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
237247
expected = load( fullfile(spm1d.path, 'results', 'nonparam0d', sprintf('%s.mat',names{i}) ) );
238248
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
239-
verifyThat(testCase, spm, IsEqualTo(expected.spm, 'Using',comps,'Within', RelativeTolerance(1e-6)))
249+
for ii = 1:numel(spms)
250+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
251+
end
240252
end
241253
end
242254

@@ -250,10 +262,12 @@ function test_anova3rm(testCase)
250262
rng(0);
251263
cmd = sprintf('spm1d.data.uv0d.anova3rm.%s();', names{i});
252264
data = eval(cmd);
253-
spm = spm1d.stats.nonparam.anova3rm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
265+
spms = spm1d.stats.nonparam.anova3rm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
254266
expected = load( fullfile(spm1d.path, 'results', 'nonparam0d', sprintf('%s.mat',names{i}) ) );
255267
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
256-
verifyThat(testCase, spm, IsEqualTo(expected.spm, 'Using',comps,'Within', RelativeTolerance(1e-6)))
268+
for ii = 1:numel(spms)
269+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
270+
end
257271
end
258272
end
259273

@@ -268,10 +282,12 @@ function test_anova3tworm(testCase)
268282
rng(0);
269283
cmd = sprintf('spm1d.data.uv0d.anova3tworm.%s();', names{i});
270284
data = eval(cmd);
271-
spm = spm1d.stats.nonparam.anova3tworm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
285+
spms = spm1d.stats.nonparam.anova3tworm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
272286
expected = load( fullfile(spm1d.path, 'results', 'nonparam0d', sprintf('%s.mat',names{i}) ) );
273287
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
274-
verifyThat(testCase, spm, IsEqualTo(expected.spm, 'Using',comps,'Within', RelativeTolerance(1e-6)))
288+
for ii = 1:numel(spms)
289+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
290+
end
275291
end
276292
end
277293

tests/np/test_1d_np.m renamed to tests/test_1d_np.m

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ function anova2(testCase)
128128
rng(0);
129129
name = names{i};
130130
data = eval( sprintf('spm1d.data.uv1d.anova2.%s();', name) );
131-
spm = spm1d.stats.nonparam.anova2(data.Y, data.A, data.B).inference(0.05, 'iterations', 1000);
131+
spms = spm1d.stats.nonparam.anova2(data.Y, data.A, data.B).inference(0.05, 'iterations', 1000);
132132
expected = load( fullfile(spm1d.path, 'results', 'nonparam1d', sprintf('%s.mat',name) ) );
133133
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
134-
for ii = 1:numel(spm)
135-
verifyThat(testCase, spm(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
134+
for ii = 1:numel(spms)
135+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
136136
end
137137
end
138138
warning('on','all')
@@ -148,11 +148,11 @@ function anova2nested(testCase)
148148
rng(0);
149149
name = names{i};
150150
data = eval( sprintf('spm1d.data.uv1d.anova2nested.%s();', name) );
151-
spm = spm1d.stats.nonparam.anova2nested(data.Y, data.A, data.B).inference(0.05, 'iterations', 1000);
151+
spms = spm1d.stats.nonparam.anova2nested(data.Y, data.A, data.B).inference(0.05, 'iterations', 1000);
152152
expected = load( fullfile(spm1d.path, 'results', 'nonparam1d', sprintf('%s.mat',name) ) );
153153
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
154-
for ii = 1:numel(spm)
155-
verifyThat(testCase, spm(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
154+
for ii = 1:numel(spms)
155+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
156156
end
157157
end
158158
warning('on','all')
@@ -168,11 +168,11 @@ function anova2onerm(testCase)
168168
rng(0);
169169
name = names{i};
170170
data = eval( sprintf('spm1d.data.uv1d.anova2onerm.%s();', name) );
171-
spm = spm1d.stats.nonparam.anova2onerm(data.Y, data.A, data.B, data.SUBJ).inference(0.05, 'iterations', 1000);
171+
spms = spm1d.stats.nonparam.anova2onerm(data.Y, data.A, data.B, data.SUBJ).inference(0.05, 'iterations', 1000);
172172
expected = load( fullfile(spm1d.path, 'results', 'nonparam1d', sprintf('%s.mat',name) ) );
173173
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
174-
for ii = 1:numel(spm)
175-
verifyThat(testCase, spm(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
174+
for ii = 1:numel(spms)
175+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
176176
end
177177
end
178178
warning('on','all')
@@ -188,11 +188,11 @@ function anova2rm(testCase)
188188
rng(0);
189189
name = names{i};
190190
data = eval( sprintf('spm1d.data.uv1d.anova2rm.%s();', name) );
191-
spm = spm1d.stats.nonparam.anova2rm(data.Y, data.A, data.B, data.SUBJ).inference(0.05, 'iterations', 1000);
191+
spms = spm1d.stats.nonparam.anova2rm(data.Y, data.A, data.B, data.SUBJ).inference(0.05, 'iterations', 1000);
192192
expected = load( fullfile(spm1d.path, 'results', 'nonparam1d', sprintf('%s.mat',name) ) );
193193
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
194-
for ii = 1:numel(spm)
195-
verifyThat(testCase, spm(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
194+
for ii = 1:numel(spms)
195+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
196196
end
197197
end
198198
warning('on','all')
@@ -208,11 +208,11 @@ function anova3(testCase)
208208
rng(0);
209209
name = names{i};
210210
data = eval( sprintf('spm1d.data.uv1d.anova3.%s();', name) );
211-
spm = spm1d.stats.nonparam.anova3(data.Y, data.A, data.B, data.C).inference(0.05, 'iterations', 1000);
211+
spms = spm1d.stats.nonparam.anova3(data.Y, data.A, data.B, data.C).inference(0.05, 'iterations', 1000);
212212
expected = load( fullfile(spm1d.path, 'results', 'nonparam1d', sprintf('%s.mat',name) ) );
213213
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
214-
for ii = 1:numel(spm)
215-
verifyThat(testCase, spm(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
214+
for ii = 1:numel(spms)
215+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
216216
end
217217
end
218218
warning('on','all')
@@ -228,11 +228,11 @@ function anova3nested(testCase)
228228
rng(0);
229229
name = names{i};
230230
data = eval( sprintf('spm1d.data.uv1d.anova3nested.%s();', name) );
231-
spm = spm1d.stats.nonparam.anova3nested(data.Y, data.A, data.B, data.C).inference(0.05, 'iterations', 1000);
231+
spms = spm1d.stats.nonparam.anova3nested(data.Y, data.A, data.B, data.C).inference(0.05, 'iterations', 1000);
232232
expected = load( fullfile(spm1d.path, 'results', 'nonparam1d', sprintf('%s.mat',name) ) );
233233
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
234-
for ii = 1:numel(spm)
235-
verifyThat(testCase, spm(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
234+
for ii = 1:numel(spms)
235+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
236236
end
237237
end
238238
warning('on','all')
@@ -248,11 +248,11 @@ function anova3onerm(testCase)
248248
rng(0);
249249
name = names{i};
250250
data = eval( sprintf('spm1d.data.uv1d.anova3onerm.%s();', name) );
251-
spm = spm1d.stats.nonparam.anova3onerm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
251+
spms = spm1d.stats.nonparam.anova3onerm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
252252
expected = load( fullfile(spm1d.path, 'results', 'nonparam1d', sprintf('%s.mat',name) ) );
253253
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
254-
for ii = 1:numel(spm)
255-
verifyThat(testCase, spm(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
254+
for ii = 1:numel(spms)
255+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
256256
end
257257
end
258258
warning('on','all')
@@ -268,11 +268,11 @@ function anova3tworm(testCase)
268268
rng(0);
269269
name = names{i};
270270
data = eval( sprintf('spm1d.data.uv1d.anova3tworm.%s();', name) );
271-
spm = spm1d.stats.nonparam.anova3tworm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
271+
spms = spm1d.stats.nonparam.anova3tworm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
272272
expected = load( fullfile(spm1d.path, 'results', 'nonparam1d', sprintf('%s.mat',name) ) );
273273
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
274-
for ii = 1:numel(spm)
275-
verifyThat(testCase, spm(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
274+
for ii = 1:numel(spms)
275+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
276276
end
277277
end
278278
warning('on','all')
@@ -288,11 +288,11 @@ function anova3rm(testCase)
288288
rng(0);
289289
name = names{i};
290290
data = eval( sprintf('spm1d.data.uv1d.anova3rm.%s();', name) );
291-
spm = spm1d.stats.nonparam.anova3rm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
291+
spms = spm1d.stats.nonparam.anova3rm(data.Y, data.A, data.B, data.C, data.SUBJ).inference(0.05, 'iterations', 1000);
292292
expected = load( fullfile(spm1d.path, 'results', 'nonparam1d', sprintf('%s.mat',name) ) );
293293
comps = [PublicPropertyComparator.supportingAllValues(), IsEqualTo([]).Comparator];
294-
for ii = 1:numel(spm)
295-
verifyThat(testCase, spm(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
294+
for ii = 1:numel(spms)
295+
verifyThat(testCase, spms(ii), IsEqualTo(expected.spm(ii), 'Using',comps,'Within', RelativeTolerance(1e-6)))
296296
end
297297
end
298298
warning('on','all')

0 commit comments

Comments
 (0)