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

Clean up/learning/misc #668

Merged
merged 16 commits into from
Feb 18, 2018
Merged

Clean up/learning/misc #668

merged 16 commits into from
Feb 18, 2018

Commits on Feb 2, 2018

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

    …Link into refactor/Projection/Context_devel

# Conflicts:
#	psyneulink/components/mechanisms/adaptive/control/controlmechanism.py
    @jdcpni
    jdcpni committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    fc772b3 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 Feb 2, 2018
    Configuration menu
    Copy the full SHA
    75db09f View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2018

  1. -

    @jdcpni
    jdcpni committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    537c696 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2018

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

    …Link into devel

# Conflicts:
#	Scripts/Examples/RL-DDM.py
    @jdcpni
    jdcpni committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    2212777 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2018

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

    …Link into devel
    @jdcpni
    jdcpni committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    9b9771e 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 Feb 16, 2018
    Configuration menu
    Copy the full SHA
    50a0076 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2018

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

    …Link into devel
    @jdcpni
    jdcpni committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    748ec88 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 Feb 17, 2018
    Configuration menu
    Copy the full SHA
    9d56786 View commit details
    Browse the repository at this point in the history

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

    …Link into devel
    @jdcpni
    jdcpni committed Feb 17, 2018
    Configuration menu
    Copy the full SHA
    8ce25b2 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2018

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

    …Link into devel
    @jdcpni
    jdcpni committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    8503299 View commit details
    Browse the repository at this point in the history

  2. • LearningAuxiliary 

      - renamed MappingProjections for errors_signals of LearningMechanisms
    @jdcpni
    jdcpni committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    5c15449 View commit details
    Browse the repository at this point in the history

  3. • LearningAuxiliary 

      - renamed MappingProjections for errors_signals of LearningMechanisms

• LearningMechanism
  - added _error_signal_input_states backing field for efficiency
    @jdcpni
    jdcpni committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    35a78d5 View commit details
    Browse the repository at this point in the history

  4. • LearningAuxiliary 

      - renamed MappingProjections for errors_signals of LearningMechanisms

• LearningMechanism
  - added _error_signal_input_states backing field for efficiency

• InputState
  - _assign_variable_from_projection(): added method, that allows variable
     of InputState to be specified by its projection arg.
    @jdcpni
    jdcpni committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    feb0b75 View commit details
    Browse the repository at this point in the history

  5. • InputState 

      - docstring revs
    @jdcpni
    jdcpni committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    de6aec4 View commit details
    Browse the repository at this point in the history

  6. -

    @jdcpni
    jdcpni committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    69c2952 View commit details
    Browse the repository at this point in the history

  7. -

    @jdcpni
    jdcpni committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    b1a5346 View commit details
    Browse the repository at this point in the history