diff --git a/tests/test_atlases_query.py b/tests/test_atlases_query.py index 051f9cd6b7bf5a22234c31ebd3273f6d924033db..fedb0a00d9fa30405c50d2a1a880d78288e20f4e 100644 --- a/tests/test_atlases_query.py +++ b/tests/test_atlases_query.py @@ -218,8 +218,8 @@ def _eval_coord_voxel_query(atlas, query, qtype, qin): elif qin == 'out': expval = [] - assert atlas.proportions( query, voxel=voxel) == expval - assert atlas.coordProportions(query, voxel=voxel) == expval + assert atlas.values( query, voxel=voxel) == expval + assert atlas.coordValues(query, voxel=voxel) == expval if isinstance(atlas, fslatlases.LabelAtlas): evalLabel() elif isinstance(atlas, fslatlases.ProbabilisticAtlas): evalProb() @@ -343,13 +343,13 @@ def _eval_mask_query(atlas, query, qtype, qin): if qin == 'out': with pytest.raises(fslatlases.MaskError): - atlas.maskProportions(mask) + atlas.maskValues(mask) with pytest.raises(fslatlases.MaskError): - atlas.proportions( mask) + atlas.values( mask) return - props = atlas. proportions(mask) - props2 = atlas.maskProportions(mask) + props = atlas. values(mask) + props2 = atlas.maskValues(mask) assert np.all(np.isclose(props, props2)) diff --git a/tests/test_scripts/test_atlasq_ohi.py b/tests/test_scripts/test_atlasq_ohi.py index c2f2348a532c04f9819c28d980393bc3857c7746..8a9634f7e3ea2063eab8a4c911de0888eaead4c2 100644 --- a/tests/test_scripts/test_atlasq_ohi.py +++ b/tests/test_scripts/test_atlasq_ohi.py @@ -51,7 +51,7 @@ def test_coords(seed): """Test the ohi -a "atlas" -c "coords" mode. """ def expectedProbOutput(atlas, coords): - probs = atlas.proportions(coords) + probs = atlas.values(coords) expected = '<b>{}</b><br>'.format(atlas.desc.name) nzprobs = [] @@ -161,7 +161,7 @@ def test_mask(seed): def expectedProbOutput(mask, atlas): - props = atlas.maskProportions(mask) + props = atlas.maskValues(mask) labels = [l.index for l in atlas.desc.labels] exp = [] diff --git a/tests/test_scripts/test_atlasq_query.py b/tests/test_scripts/test_atlasq_query.py index def92c956a08098afd779102a591044aa63740cf..5b2ab4e9da7a634be84c3aea0fa5f8d901a1fea0 100644 --- a/tests/test_scripts/test_atlasq_query.py +++ b/tests/test_scripts/test_atlasq_query.py @@ -294,7 +294,7 @@ def _eval_coord_voxel_query( if o_type == 'normal': evalLabelNormalOutput(explabel) else: evalLabelShortOutput(explabel) elif isinstance(a_img, fslatlases.ProbabilisticAtlas): - expprops = a_img.proportions(query, voxel=voxel) + expprops = a_img.values(query, voxel=voxel) if o_type == 'normal': evalProbNormalOutput(expprops) else: evalProbShortOutput(expprops) @@ -400,7 +400,7 @@ def _eval_mask_query( explabels, expprops = [], [] elif isinstance(aimg, fslatlases.ProbabilisticAtlas): try: - expprops = aimg.maskProportions(maskimg) + expprops = aimg.maskValues(maskimg) explabels = aimg.desc.labels except fslatlases.MaskError: explabels = []