Skip to content
Snippets Groups Projects
Commit e3f6c86f authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

TEST: Update refs to deprecated methods

parent 40650612
No related branches found
No related tags found
No related merge requests found
...@@ -218,8 +218,8 @@ def _eval_coord_voxel_query(atlas, query, qtype, qin): ...@@ -218,8 +218,8 @@ def _eval_coord_voxel_query(atlas, query, qtype, qin):
elif qin == 'out': elif qin == 'out':
expval = [] expval = []
assert atlas.proportions( query, voxel=voxel) == expval assert atlas.values( query, voxel=voxel) == expval
assert atlas.coordProportions(query, voxel=voxel) == expval assert atlas.coordValues(query, voxel=voxel) == expval
if isinstance(atlas, fslatlases.LabelAtlas): evalLabel() if isinstance(atlas, fslatlases.LabelAtlas): evalLabel()
elif isinstance(atlas, fslatlases.ProbabilisticAtlas): evalProb() elif isinstance(atlas, fslatlases.ProbabilisticAtlas): evalProb()
...@@ -343,13 +343,13 @@ def _eval_mask_query(atlas, query, qtype, qin): ...@@ -343,13 +343,13 @@ def _eval_mask_query(atlas, query, qtype, qin):
if qin == 'out': if qin == 'out':
with pytest.raises(fslatlases.MaskError): with pytest.raises(fslatlases.MaskError):
atlas.maskProportions(mask) atlas.maskValues(mask)
with pytest.raises(fslatlases.MaskError): with pytest.raises(fslatlases.MaskError):
atlas.proportions( mask) atlas.values( mask)
return return
props = atlas. proportions(mask) props = atlas. values(mask)
props2 = atlas.maskProportions(mask) props2 = atlas.maskValues(mask)
assert np.all(np.isclose(props, props2)) assert np.all(np.isclose(props, props2))
......
...@@ -51,7 +51,7 @@ def test_coords(seed): ...@@ -51,7 +51,7 @@ def test_coords(seed):
"""Test the ohi -a "atlas" -c "coords" mode. """ """Test the ohi -a "atlas" -c "coords" mode. """
def expectedProbOutput(atlas, coords): def expectedProbOutput(atlas, coords):
probs = atlas.proportions(coords) probs = atlas.values(coords)
expected = '<b>{}</b><br>'.format(atlas.desc.name) expected = '<b>{}</b><br>'.format(atlas.desc.name)
nzprobs = [] nzprobs = []
...@@ -161,7 +161,7 @@ def test_mask(seed): ...@@ -161,7 +161,7 @@ def test_mask(seed):
def expectedProbOutput(mask, atlas): def expectedProbOutput(mask, atlas):
props = atlas.maskProportions(mask) props = atlas.maskValues(mask)
labels = [l.index for l in atlas.desc.labels] labels = [l.index for l in atlas.desc.labels]
exp = [] exp = []
......
...@@ -294,7 +294,7 @@ def _eval_coord_voxel_query( ...@@ -294,7 +294,7 @@ def _eval_coord_voxel_query(
if o_type == 'normal': evalLabelNormalOutput(explabel) if o_type == 'normal': evalLabelNormalOutput(explabel)
else: evalLabelShortOutput(explabel) else: evalLabelShortOutput(explabel)
elif isinstance(a_img, fslatlases.ProbabilisticAtlas): 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) if o_type == 'normal': evalProbNormalOutput(expprops)
else: evalProbShortOutput(expprops) else: evalProbShortOutput(expprops)
...@@ -400,7 +400,7 @@ def _eval_mask_query( ...@@ -400,7 +400,7 @@ def _eval_mask_query(
explabels, expprops = [], [] explabels, expprops = [], []
elif isinstance(aimg, fslatlases.ProbabilisticAtlas): elif isinstance(aimg, fslatlases.ProbabilisticAtlas):
try: try:
expprops = aimg.maskProportions(maskimg) expprops = aimg.maskValues(maskimg)
explabels = aimg.desc.labels explabels = aimg.desc.labels
except fslatlases.MaskError: except fslatlases.MaskError:
explabels = [] explabels = []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment