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/function/hebbian #661

Merged
merged 6 commits into from
Feb 16, 2018
Merged

Docs/function/hebbian #661

merged 6 commits into from
Feb 16, 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. • Function 

      Hebbian().function - updated docstring to show proper calculation
    @jdcpni
    jdcpni committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    fa45e95 View commit details
    Browse the repository at this point in the history