New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

create_pyramid now applies features even if pyramid_on_features=False, SDM uses it too #443

Merged
merged 3 commits into from Sep 15, 2014

Conversation

Projects
None yet
2 participants
@jabooth
Member

jabooth commented Sep 13, 2014

Previously, create_pyramid created a pyramid that was ready to use if pyramid_on_features=True (i.e. it applied the feature for us), but if pyramid_on_features=False we have to remember to apply the features ourselves. This lead to repeated code in the AAM and CLM build methods.

This PR changes this so that the create_pyramid yields a pyramid of feature images in both cases, so there is no need to do the extra logic in the build methods. It also removes the repeated @classmethods from SDM for doing the same job - now all deformable models use the same pyramid of features creation routine.

Note that this does not change the order of the feature computation, the pyramid generation, or the use of the pyramid_on_features, so it should be functionally identical to master.

@jabooth

This comment has been minimized.

Member

jabooth commented Sep 14, 2014

I'm fairly sure that this is just a small improvement for the better, which removes redundant code without changing much. Will bring in tomorrow unless there are strong objections.

@nontas

This comment has been minimized.

Member

nontas commented Sep 15, 2014

+1

jabooth added a commit that referenced this pull request Sep 15, 2014

Merge pull request #443 from jabooth/featurepy
create_pyramid now applies features even if pyramid_on_features=False, SDM uses it too

@jabooth jabooth merged commit ba6363b into menpo:master Sep 15, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

@jabooth jabooth removed the in progress label Sep 15, 2014

@jabooth jabooth deleted the jabooth:featurepy branch Sep 15, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment