Trapping extended jake #513
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
remove evolve_w, objective_history
* move underscore attributes to _reduce (their presence is used by
scikit-learn's check_fitted())
* add explicit _n_tgts, _include_bias, and _interaction_only to init
* subclass from ConstrainedSR3
* Add "method" kwarg to control global/local (this will hopefully be removed
in the future)
This pulls in the changes to ConstrainedSR3 from trapping_resolve
Jacob-Stevens-Haas
force-pushed
the
trapping_extended-jake
branch
from
e5e6e49
to
3436aed
Compare
Jacob-Stevens-Haas
force-pushed
the
trapping_extended-jake
branch
2 times, most recently
from
7775f20
to
ac6fe51
Compare
Jacob-Stevens-Haas
force-pushed
the
trapping_extended-jake
branch
from
ac6fe51
to
02b5a8a
Compare
ALso align some comments and organization with trapping-resolve
Jacob-Stevens-Haas
force-pushed
the
trapping_extended-jake
branch
from
64882e7
to
ecdd800
Compare
Jacob-Stevens-Haas
force-pushed
the
trapping_extended-jake
branch
from
6a4ad14
to
0254032
Compare
Jacob-Stevens-Haas
force-pushed
the
trapping_extended-jake
branch
from
a4e7c41
to
f64de5a
Compare
Also: move m0 initialization to __init__, fix _objective calc
Jacob-Stevens-Haas
force-pushed
the
trapping_extended-jake
branch
from
f64de5a
to
4426965
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This consists of backporting all changes that conflict with master. trapping-resolve consists of the complement of those changes, i.e. resolution of conflicts on the master branch