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

Feat/log #568

Merged
merged 62 commits into from
Dec 4, 2017
Merged

Feat/log #568

merged 62 commits into from
Dec 4, 2017

Commits on Nov 30, 2017

  1. • System 

      - show_graph():
    fixed bug producing empty image for graphs with just one Mechanism
    added auto-recurrent projections
    @jdcpni
    jdcpni committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    3276e28 View commit details
    Browse the repository at this point in the history

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

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

Commits on Dec 1, 2017

  1. • Component 

      - deferred_init:  fixed bug in which "Deferred Init" was remaining in name of initialized Component
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    8603622 View commit details
    Browse the repository at this point in the history

  2. • Component 

      - added call to _assign_default_name()

• PathwayProjection, Projection
  - added _assign_default_name to trap call from Component
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    3467d63 View commit details
    Browse the repository at this point in the history

  3. • Component 

      - added call to _assign_default_name()

• PathwayProjection, Projection
  - added _assign_default_name to trap call from Component
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    856dd03 View commit details
    Browse the repository at this point in the history

  4. Merge branches 'devel' and 'fix/Component/default_naming' of https://… 

    …github.com/PrincetonUniversity/PsyNeuLink into JDC_clean_up
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    36307e9 View commit details
    Browse the repository at this point in the history

  5. • Component 

      - added call to _assign_default_name()

• PathwayProjection, Projection
  - added _assign_default_name to trap call from Component
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    cd8fede View commit details
    Browse the repository at this point in the history

  6. • Moved call to _assign_default_projection_name from MappingProjectio… 

    …n to Projection
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    83221cc View commit details
    Browse the repository at this point in the history

  7. Merge branches 'devel' and 'fix/Component/default_naming' of https://… 

    …github.com/PrincetonUniversity/PsyNeuLink into fix/Component/default_naming
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    54d50ea View commit details
    Browse the repository at this point in the history

  8. • State 

      - _validate_variable:  removed:
        if not context:
            context = kwAssign + ' Base Value'
        else:
            context = context + kwAssign + ' Base Value'
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    3c5e89f View commit details
    Browse the repository at this point in the history

  9. • State 

      - _validate_variable:  removed:
        if not context:
            context = kwAssign + ' Base Value'
        else:
            context = context + kwAssign + ' Base Value'
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    5f7e71b View commit details
    Browse the repository at this point in the history

  10. • System 

      - show_graph(): bug fix for ControlProjections
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    abc48be View commit details
    Browse the repository at this point in the history

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

    …Link into feat/log
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    47adbf2 View commit details
    Browse the repository at this point in the history

  12. • System 

      - show_graph(): bug fix for ControlProjections
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    9251d15 View commit details
    Browse the repository at this point in the history

  13. • System 

      - show_graph(): bug fix for ControlProjections
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    22b5420 View commit details
    Browse the repository at this point in the history

  14. • System 

      - show_graph(): bug fix for ControlProjections
    @jdcpni
    jdcpni committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    0b1eb99 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2017

  1. • Mechanism 

      - added states and projections properties (as well as ones for each projection time)
  - added log_items property that returns a list of logged items and allows them to be set

• State
  - fixed a bug preventing proper logging
    @jdcpni
    jdcpni committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    5f874b2 View commit details
    Browse the repository at this point in the history

  2. • Mechanism 

      - added states and projections properties (as well as ones for each projection time)
  - added log_items property that returns a list of logged items and allows them to be set

• State
  - fixed a bug preventing proper logging
    @jdcpni
    jdcpni committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    fb41fbf View commit details
    Browse the repository at this point in the history

  3. -

    @jdcpni
    jdcpni committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    5fa54a4 View commit details
    Browse the repository at this point in the history

  4. -

    @jdcpni
    jdcpni committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    ac2e128 View commit details
    Browse the repository at this point in the history

  5. -

    @jdcpni
    jdcpni committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    f7aa152 View commit details
    Browse the repository at this point in the history

  6. -

    @jdcpni
    jdcpni committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    5743c61 View commit details
    Browse the repository at this point in the history

  7. -

    @jdcpni
    jdcpni committed Dec 2, 2017
    Configuration menu
    Copy the full SHA
    cf6418b View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2017

  1. • README.rst and index.rst: 

      revs to Intro, Purpose, and Contributors
    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    cc46228 View commit details
    Browse the repository at this point in the history

  2. • Mechanism 

      - docstring: updated to include states, and projections attributes
    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    4038ecf View commit details
    Browse the repository at this point in the history

  3. • Mechanism 

      - docstring: updated to include states, and projections attributes
    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    0842cdc View commit details
    Browse the repository at this point in the history

  4. • Mechanism 

      - docstring: updated to include states, and projections attributes
    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    09aa207 View commit details
    Browse the repository at this point in the history

  5. • Mechanism 

      - docstring: updated to include states, and projections attributes
    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    761cddd View commit details
    Browse the repository at this point in the history

  6. -

    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    f3583a1 View commit details
    Browse the repository at this point in the history

  7. -

    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    05388b4 View commit details
    Browse the repository at this point in the history

  8. -

    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    5e99edb View commit details
    Browse the repository at this point in the history

  9. Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP 

    # Conflicts:
#	Scripts/Scratch Pad.py
#	psyneulink/components/projections/pathway/mappingprojection.py
#	psyneulink/components/projections/projection.py
#	psyneulink/components/states/inputstate.py
#	psyneulink/components/states/modulatorysignals/controlsignal.py
#	psyneulink/components/states/outputstate.py
#	psyneulink/components/states/parameterstate.py
#	psyneulink/components/states/state.py
#	tests/mechanisms/test_input_state_spec.py
#	tests/projections/test_projections_specifications.py
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    51a54ca View commit details
    Browse the repository at this point in the history

  10. Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP 

    # Conflicts:
#	Scripts/Scratch Pad.py
#	psyneulink/components/projections/pathway/mappingprojection.py
#	psyneulink/components/projections/projection.py
#	psyneulink/components/states/inputstate.py
#	psyneulink/components/states/modulatorysignals/controlsignal.py
#	psyneulink/components/states/outputstate.py
#	psyneulink/components/states/parameterstate.py
#	psyneulink/components/states/state.py
#	tests/mechanisms/test_input_state_spec.py
#	tests/projections/test_projections_specifications.py
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    d3465e3 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP 

    # Conflicts:
#	Scripts/Scratch Pad.py
#	psyneulink/components/projections/pathway/mappingprojection.py
#	psyneulink/components/projections/projection.py
#	psyneulink/components/states/inputstate.py
#	psyneulink/components/states/modulatorysignals/controlsignal.py
#	psyneulink/components/states/outputstate.py
#	psyneulink/components/states/parameterstate.py
#	psyneulink/components/states/state.py
#	tests/mechanisms/test_input_state_spec.py
#	tests/projections/test_projections_specifications.py
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    3fa9ba4 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'TEMP' into feat/log

    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    01b66c6 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP 

    # Conflicts:
#	Scripts/Scratch Pad.py
#	psyneulink/components/projections/pathway/mappingprojection.py
#	psyneulink/components/projections/projection.py
#	psyneulink/components/states/inputstate.py
#	psyneulink/components/states/modulatorysignals/controlsignal.py
#	psyneulink/components/states/outputstate.py
#	psyneulink/components/states/parameterstate.py
#	psyneulink/components/states/state.py
#	tests/mechanisms/test_input_state_spec.py
#	tests/projections/test_projections_specifications.py
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    33fdac7 View commit details
    Browse the repository at this point in the history

  14. -

    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    b924c75 View commit details
    Browse the repository at this point in the history

  15. -

    @jdcpni
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    e3fce3f View commit details
    Browse the repository at this point in the history

  16. Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP 

    # Conflicts:
#	Scripts/Scratch Pad.py
#	psyneulink/components/projections/pathway/mappingprojection.py
#	psyneulink/components/projections/projection.py
#	psyneulink/components/states/inputstate.py
#	psyneulink/components/states/modulatorysignals/controlsignal.py
#	psyneulink/components/states/outputstate.py
#	psyneulink/components/states/parameterstate.py
#	psyneulink/components/states/state.py
#	tests/mechanisms/test_input_state_spec.py
#	tests/projections/test_projections_specifications.py
    jdcpni committed Dec 3, 2017
    Configuration menu
    Copy the full SHA
    fd75e2b View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2017

  1. Merge branch 'TEMP' of https://github.com/jdcpni/PsyNeuLink into TEMP 

    # Conflicts:
#	Scripts/Scratch Pad.py
#	psyneulink/components/projections/pathway/mappingprojection.py
#	psyneulink/components/projections/projection.py
#	psyneulink/components/states/inputstate.py
#	psyneulink/components/states/modulatorysignals/controlsignal.py
#	psyneulink/components/states/outputstate.py
#	psyneulink/components/states/parameterstate.py
#	psyneulink/components/states/state.py
#	tests/mechanisms/test_input_state_spec.py
#	tests/projections/test_projections_specifications.py
    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    e3f0a1f View commit details
    Browse the repository at this point in the history

  2. -

    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    11402f8 View commit details
    Browse the repository at this point in the history

  3. -

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

  4. -

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

  5. -

    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    5d9c2b9 View commit details
    Browse the repository at this point in the history

  6. -

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

  7. -

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

  8. -

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

  9. -

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

  10. -

    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    4588e63 View commit details
    Browse the repository at this point in the history

  11. -

    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    2a6b46c View commit details
    Browse the repository at this point in the history

  12. -

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

  13. -

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

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

    …Link into feat/log
    @jdcpni
    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    5b4819c View commit details
    Browse the repository at this point in the history

  15. -

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

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

    …Link into feat/log
    @jdcpni
    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    b7aac29 View commit details
    Browse the repository at this point in the history

  17. • Log 

      - added an example to docstring
    @jdcpni
    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    8429bf5 View commit details
    Browse the repository at this point in the history

  18. -

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

  19. • Log 

      - docstring:  added full example (including logging a MappingProjection)
    @jdcpni
    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    e71f73e View commit details
    Browse the repository at this point in the history

  20. • Log 

      - docstring:  added full example (including logging a MappingProjection)
    @jdcpni
    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    f79d202 View commit details
    Browse the repository at this point in the history

  21. • Log 

      - docstring:  added full example (including logging a MappingProjection)
    @jdcpni
    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    21923e7 View commit details
    Browse the repository at this point in the history

  22. • Log 

      - docstring:  added full example (including logging a MappingProjection)
    @jdcpni
    jdcpni committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    a04fca6 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'devel' into feat/log

    @jdcpni
    jdcpni authored Dec 4, 2017
    Configuration menu
    Copy the full SHA
    a1675eb View commit details
    Browse the repository at this point in the history