Fix issue 29 oo ode #35
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
Added PyCharm to gitignore
Will have to test when I get home.
It appears there is an issue with re-shaping the result of the CNN. Most likely due to the ode_result but need to investigate further.
Reversed x and t to reflect scipy.integrate.ode parameter arrangement.
Current coverage is 100% (diff: 100%)@@ master #35 diff @@
===================================
Files 5 5
Lines 165 171 +6
Methods 0 0
Messages 0 0
Branches 0 0
===================================
+ Hits 165 171 +6
Misses 0 0
Partials 0 0
|
|
Good work @pjbollinger. I just have a doubt about why you have increased the number of time samples by 1 in each of the example. Thanks. |
|
The reason for that is to create cleaner looking arrays. Below are examples. >>> np.linspace(0.0, 10.0, num=10)
[0.0, 1.11111111, 2.2222222, 3.333333, ... , 8.8888888, 10.0]
>>> np.linspace(0.0, 10.0, num=11)
[0.0, 1.0, 2.0, 3.0, ..., 8.0, 9.0, 10.0]Please verify if you would like, I don't have access to Python/NumPy at the moment so the result might not be exact. |
|
That works @pjbollinger. Thank you for your contribution. Excellent work! |
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 is to add scipy.integrate.ode to the project and allow for the more object-oriented friendly ODE instead of the previous scipy.integrate.odeint functionality.
This should resolve Issue #29.
I made some other modifications to allow for the new ode function.
You can see that this passes all tests found here: https://codecov.io/gh/pjbollinger/PyCNN/commit/52dc7e8b60d0df1a586a674670599af08cef1bd9