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

Docs/input state specs #522

Merged
merged 21 commits into from
Nov 10, 2017
Merged

Docs/input state specs #522

merged 21 commits into from
Nov 10, 2017

Commits on Nov 4, 2017

  1. -

    @jdcpni
    jdcpni committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    e725a33 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2017

  1. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel
    @jdcpni
    jdcpni committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    cb04745 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2017

  1. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    ea3b359 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into CURRENT

# Conflicts:
#	tests/mechanisms/test_transfer_mechanism.py
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    0c24e98 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into CURRENT

# Conflicts:
#	tests/mechanisms/test_transfer_mechanism.py
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    7b545b4 View commit details
    Browse the repository at this point in the history

  4. • Mechanism, PathwayProjection 

      - fixed bugs related to input_state specifications
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    d9248ea View commit details
    Browse the repository at this point in the history

  5. • Mechanism, PathwayProjection 

      - fixed bugs related to input_state specifications
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    29b7372 View commit details
    Browse the repository at this point in the history

  6. • Mechanism 

      - _parse_arg_input_states, add_states:  modified to accomdodate deferred_init
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    7d2d824 View commit details
    Browse the repository at this point in the history

  7. • Mechanism 

      - _parse_arg_input_states, add_states:  modified to accomdodate deferred_init
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    b47c0b2 View commit details
    Browse the repository at this point in the history

  8. • State 

      - _parse_state_spec re: owner name
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    158138c View commit details
    Browse the repository at this point in the history

  9. • State 

      - _parse_state_spec re: owner name
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    9188a61 View commit details
    Browse the repository at this point in the history

  10. • State 

      - _parse_state_spec re: owner name
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    aac56d3 View commit details
    Browse the repository at this point in the history

  11. • State 

      - _parse_state_spec re: owner name
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    9797b5c View commit details
    Browse the repository at this point in the history

  12. • States 

      __init__: now calls add_states to add state to owner if called from COMMAND_LINE
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    b090fc4 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2017

  1. • States 

      __init__: now calls add_states to add state to owner if called from COMMAND_LINE
  add_states works for deferred_init state
  assignment of State to owner now works
    @jdcpni
    jdcpni committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    640bdf7 View commit details
    Browse the repository at this point in the history

  2. • States 

      __init__: now calls add_states to add state to owner if called from COMMAND_LINE
  add_states works for deferred_init state
  assignment of State to owner now works
    @jdcpni
    jdcpni committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    f1367b6 View commit details
    Browse the repository at this point in the history

  3. -

    @jdcpni
    jdcpni committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    5f76586 View commit details
    Browse the repository at this point in the history

  4. -

    @jdcpni
    jdcpni committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    4c1249b View commit details
    Browse the repository at this point in the history

  5. -

    @jdcpni
    jdcpni committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    b587749 View commit details
    Browse the repository at this point in the history

  6. • Mechanism, InputState 

      docstring revs
    @jdcpni
    jdcpni committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    3f8da49 View commit details
    Browse the repository at this point in the history

  7. • Mechanism, InputState 

      docstring revs
    @jdcpni
    jdcpni committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    fb5b9c5 View commit details
    Browse the repository at this point in the history