The past few months, I've been backporting changes between trapping_extended and master: refactoring the former with the clean, tested code of the latter and incorporating the local trapping theorem of the former into the latter. Two branches have mediated these backports, trapping-resolve from and shadowing master, trapping_extended-jake from and shadowing trapping_extended.
Nearly all of the conflicts between trapping_extended and master have been removed, and at this point, I'm ready to merge all of the unrelated (and breaking) API changes from master into trapping_extended. From this PR, I will work to make the trapping notebooks and tests fully functional, then I'll quickly merge it into trapping_extended and thence PR into master for a final review.
Afterwards, I'll clean up trapping in a series of PRs on master. I will also, at that point, pin the version of pysindy used in the noteoboks.
The past few months, I've been backporting changes between
trapping_extendedandmaster: refactoring the former with the clean, tested code of the latter and incorporating the local trapping theorem of the former into the latter. Two branches have mediated these backports,trapping-resolvefrom and shadowingmaster,trapping_extended-jakefrom and shadowingtrapping_extended.Nearly all of the conflicts between
trapping_extendedandmasterhave been removed, and at this point, I'm ready to merge all of the unrelated (and breaking) API changes frommasterintotrapping_extended. From this PR, I will work to make the trapping notebooks and tests fully functional, then I'll quickly merge it intotrapping_extendedand thence PR into master for a final review.Afterwards, I'll clean up trapping in a series of PRs on master. I will also, at that point, pin the version of pysindy used in the noteoboks.