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

Devel #490

Merged
merged 16 commits into from
Oct 13, 2017
Merged

Devel #490

merged 16 commits into from
Oct 13, 2017

Commits on Sep 14, 2017

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

    …Link into devel

# Conflicts:
#	.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
    @jdcpni
    jdcpni committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    c7ac4f3 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2017

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

    …Link into devel

# Conflicts:
#	.idea/runConfigurations/_EVC_System_Laming_Validation_Test_Script.xml
    @jdcpni
    jdcpni committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    1f6957f 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 Sep 18, 2017
    Configuration menu
    Copy the full SHA
    e6ab9b5 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2017

  1. -

    @jdcpni
    jdcpni committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    1e985b5 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 Sep 19, 2017
    Configuration menu
    Copy the full SHA
    dc4e015 View commit details
    Browse the repository at this point in the history

  3. -

    @jdcpni
    jdcpni committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    315ae1b View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2017

  1. • System 

      - show_graph(): allowed standard graph to show connections to ObjectiveMechanisms
                  for ControlMechanisms other than the System's controller
    @jdcpni
    jdcpni committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    1779029 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 Sep 20, 2017
    Configuration menu
    Copy the full SHA
    cfa1b2c View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2017

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

    …Link into devel
    @jdcpni
    jdcpni committed Sep 25, 2017
    Configuration menu
    Copy the full SHA
    8df72ab View commit details
    Browse the repository at this point in the history

  2. -

    @jdcpni
    jdcpni committed Sep 25, 2017
    Configuration menu
    Copy the full SHA
    8c44c04 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2017

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

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

  2. -

    @jdcpni
    jdcpni committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    0c1d5cc View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2017

  1. -

    @jdcpni
    jdcpni committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    5009fe5 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 Oct 13, 2017
    Configuration menu
    Copy the full SHA
    0878b01 View commit details
    Browse the repository at this point in the history

  3. • System 

      instantiate_graph:
      patched bug in which search for ORIGIN Mechanisms in Processes
      within the System fails if a Mechanisms belongs to some but not
      all Processes within the System
    @jdcpni
    jdcpni committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    55d8a6a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'devel' into devel

    @jdcpni
    jdcpni authored Oct 13, 2017
    Configuration menu
    Copy the full SHA
    d5754e8 View commit details
    Browse the repository at this point in the history