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

check_regression_features unified with check_features, classmethods removed from SDM #434

Merged
merged 4 commits into from Sep 6, 2014

Conversation

Projects
None yet
2 participants
@jabooth
Member

jabooth commented Sep 6, 2014

This builds on #430 for the SDM package:

  1. Remove classmethods from SDTrainer. If duplicated check, use check in fitmutlilevel.checks. If not repeated, leave as standalone function in the fitmultilevel.sdm.trainer package.
  2. Refine checks for features. If you pass pyramid_on_features features must now be a single callable and not a list of length one. Unless I'm missing something this just adds something else to worry about - it's clearer if it's just not allowed to be a list if you aren't allowing multiple features.
  3. check_list_callables(...) is broken out from check_features(...). This is reused by check_regression_features to save repetition.

@jabooth jabooth added the in progress label Sep 6, 2014

Merge remote-tracking branch 'upstream/master' into regression_featur…
…es_check

Conflicts:
	menpo/fitmultilevel/test/sdm_test.py
@jalabort

This comment has been minimized.

Member

jalabort commented Sep 6, 2014

Point 2 seems to be correct to me. You can remove the option of passing a list when features_on_pyramid is activated if you like.

@jabooth

This comment has been minimized.

Member

jabooth commented Sep 6, 2014

@jalabort thanks for the feedback!

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

Merge pull request #434 from jabooth/regression_features_check
check_regression_features unified with check_features, classmethods removed from SDM

@jabooth jabooth merged commit ed10615 into menpo:master Sep 6, 2014

1 check passed

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

@jabooth jabooth deleted the jabooth:regression_features_check branch Sep 6, 2014

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

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