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/mechanism/input target lable dicts #752

Merged
merged 26 commits into from
Apr 6, 2018
Merged

Feat/mechanism/input target lable dicts #752

merged 26 commits into from
Apr 6, 2018

Commits on Feb 27, 2018

  1. -

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

  2. -

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

Commits on Mar 2, 2018

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

    …Link into devel
    @jdcpni
    jdcpni committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    72133a7 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2018

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

    …Link into devel

# Conflicts:
#	Scripts/Examples/RL-DDM.py
#	Scripts/Examples/Reinforcement-Learning.py
    @jdcpni
    jdcpni committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    6c0a0c2 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. -

    @jdcpni
    jdcpni committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    10aaa31 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 Apr 2, 2018
    Configuration menu
    Copy the full SHA
    5367716 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2018

  1. -

    @jdcpni
    jdcpni committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    243e056 View commit details
    Browse the repository at this point in the history

  2. • Environment 

      added _parse_input_labels() and _parse_target_labels() methods
  run(): modified to use _parse_input_labels and _parse_target_labels
    @jdcpni
    jdcpni committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    c83967c View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2018

  1. • Environment 

      added _parse_input_labels() and _parse_target_labels() methods
  run(): modified to use _parse_input_labels and _parse_target_labels
    @jdcpni
    jdcpni committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    4102ec0 View commit details
    Browse the repository at this point in the history

  2. • Environment 

      added _parse_input_labels() and _parse_target_labels() methods
  run(): modified to use _parse_input_labels and _parse_target_labels
    @jdcpni
    jdcpni committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    2ed8c20 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. -

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

  2. -

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

  3. -

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

  4. -

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

  5. -

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

  6. -

    @jdcpni
    jdcpni committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    17e616f View commit details
    Browse the repository at this point in the history

  7. • Mechanism 

      added input_labels and output_labels propoerties
  added _get_state_value_labels() method
    @jdcpni
    jdcpni committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    1e3a1d3 View commit details
    Browse the repository at this point in the history

  8. Merge branches 'devel' and 'feat/mechanism/input_target_lable_dicts' of 

    https://github.com/PrincetonUniversity/PsyNeuLink into feat/mechanism/input_target_lable_dicts
    @jdcpni
    jdcpni committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    583cb26 View commit details
    Browse the repository at this point in the history

  9. • Merged with devel

    @jdcpni
    jdcpni committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    2b9f2b8 View commit details
    Browse the repository at this point in the history

  10. Merge branches 'devel' and 'feat/mechanism/input_target_lable_dicts' of 

    https://github.com/PrincetonUniversity/PsyNeuLink into feat/mechanism/input_target_lable_dicts
    @jdcpni
    jdcpni committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    fbaa35a View commit details
    Browse the repository at this point in the history

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

    …Link into devel

# Conflicts:
#	Scripts/Markus Stroop.py
    @jdcpni
    jdcpni committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    59c794d View commit details
    Browse the repository at this point in the history

  12. Merge branch 'devel' into feat/mechanism/input_target_lable_dicts

    @jdcpni
    jdcpni committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    7d2d5ff View commit details
    Browse the repository at this point in the history

  13. • Environment 

      _parse_input_labels(): added error messages
    @jdcpni
    jdcpni committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    f31c2f7 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. • Environment 

      _parse_input_labels(): added error messages
    @jdcpni
    jdcpni committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    98f61d1 View commit details
    Browse the repository at this point in the history

  2. • Environment 

      Run: removed _parse_target_labels (they are just the input_labels
       for a TARGET Mechanism

• Mechanism
  docstring revs for INPUT_LABELS_DICDT and OUTPUT_LABELS_DICT
    @jdcpni
    jdcpni committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    23f6c5f View commit details
    Browse the repository at this point in the history

  3. Merge branches 'devel' and 'feat/mechanism/input_target_lable_dicts' of 

    https://github.com/PrincetonUniversity/PsyNeuLink into feat/mechanism/input_target_lable_dicts
    @jdcpni
    jdcpni committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    6ebc407 View commit details
    Browse the repository at this point in the history