Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix issue 29 oo ode #35

Merged
merged 11 commits into from
Oct 20, 2016
Merged

Fix issue 29 oo ode #35

merged 11 commits into from
Oct 20, 2016

Commits on Oct 12, 2016

  1. Merge remote-tracking branch 'refs/remotes/ankitaggarwal011/master'

    @pjbollinger
    pjbollinger committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    685bc77 View commit details
    Browse the repository at this point in the history

  2. Added PyCharm to gitignore 

    Added PyCharm to gitignore
    @pjbollinger
    pjbollinger committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    6a7077d View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2016

  1. Attempt to add object-oriented ode to project. 

    Will have to test when I get home.
    @pjbollinger
    pjbollinger authored Oct 13, 2016
    Configuration menu
    Copy the full SHA
    fbacc5f View commit details
    Browse the repository at this point in the history

  2. Change message

    @pjbollinger
    pjbollinger authored Oct 13, 2016
    Configuration menu
    Copy the full SHA
    d389ee7 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2016

  1. Running into memory errors when using OO ode

    @pjbollinger
    pjbollinger committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    c74dea8 View commit details
    Browse the repository at this point in the history

  2. PEP8 Compliance

    @pjbollinger
    pjbollinger committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    8b44878 View commit details
    Browse the repository at this point in the history

  3. Trying OO ode to see if it works on Travis CI

    @pjbollinger
    pjbollinger committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    9582e7b View commit details
    Browse the repository at this point in the history

  4. Debugging results of odeint and ode 

    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.
    @pjbollinger
    pjbollinger committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    77d7725 View commit details
    Browse the repository at this point in the history

  5. Modified pycnn.f method 

    Reversed x and t to reflect scipy.integrate.ode parameter arrangement.
    @pjbollinger
    pjbollinger authored Oct 14, 2016
    Configuration menu
    Copy the full SHA
    9596f15 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2016

  1. Able to use object oriented ODE to pass all tests

    @pjbollinger
    pjbollinger committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    87a976e View commit details
    Browse the repository at this point in the history

  2. Removed old function for integration

    @pjbollinger
    pjbollinger committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    52dc7e8 View commit details
    Browse the repository at this point in the history