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/show structure #728

Merged
merged 31 commits into from
Mar 17, 2018
Merged

Feat/mechanism/show structure #728

merged 31 commits into from
Mar 17, 2018

Commits on Mar 8, 2018

  1. • ControlMechanism 

      assign_as_controller:  fixed bug (assignment of self.allocation)
    @jdcpni
    jdcpni committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    9133f82 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 Mar 8, 2018
    Configuration menu
    Copy the full SHA
    85bb281 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2018

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

    …Link into devel
    @jdcpni
    jdcpni committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    e35a870 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 Mar 9, 2018
    Configuration menu
    Copy the full SHA
    52066a5 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 Mar 9, 2018
    Configuration menu
    Copy the full SHA
    5621a80 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2018

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

    …Link into devel
    @jdcpni
    jdcpni committed Mar 11, 2018
    Configuration menu
    Copy the full SHA
    ed9f617 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 Mar 11, 2018
    Configuration menu
    Copy the full SHA
    1721580 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. • Function 

      UserDefinedFunction:
  - fixed some bugs examples
    @jdcpni
    jdcpni committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    70be1c8 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. • Mechanism 

      show_mechanism():  added method
    @jdcpni
    jdcpni committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    9398f8f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2018

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

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

  2. • Mechanism 

      show_structure(): minor mods to formatting
    @jdcpni
    jdcpni committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    64090a8 View commit details
    Browse the repository at this point in the history

  3. • System 

      show_graph(): show_mechanism_structure option added, that shows
                Mechanisms using the GraphViz record shape with
                States and optionally functions and values.
    @jdcpni
    jdcpni committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    02907be View commit details
    Browse the repository at this point in the history

  4. -

    @jdcpni
    jdcpni committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    88efd03 View commit details
    Browse the repository at this point in the history

  5. • System 

      show_graph: docstring rev re: show_mechanism_structure
    @jdcpni
    jdcpni committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    79c6afe View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2018

  1. • System 

      show_graph: show_mechanism_structure shows structure of control components
    @jdcpni
    jdcpni committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    202e2ff View commit details
    Browse the repository at this point in the history

  2. -

    @jdcpni
    jdcpni committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    8f2f420 View commit details
    Browse the repository at this point in the history

  3. -

    @jdcpni
    jdcpni committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    c0467ee View commit details
    Browse the repository at this point in the history

  4. -

    @jdcpni
    jdcpni committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    bb86867 View commit details
    Browse the repository at this point in the history

  5. • System 

      show_graph:
  - added active_item argument and color
  - add structure for learning components (still needs to be debugged)
    @jdcpni
    jdcpni committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    35ea045 View commit details
    Browse the repository at this point in the history

  6. -

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

  7. -

    @jdcpni
    jdcpni committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    e3e86d5 View commit details
    Browse the repository at this point in the history

  8. -

    @jdcpni
    jdcpni committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    cf33749 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2018

  1. -

    @jdcpni
    jdcpni committed Mar 17, 2018
    Configuration menu
    Copy the full SHA
    7d90d96 View commit details
    Browse the repository at this point in the history

  2. -

    @jdcpni
    jdcpni committed Mar 17, 2018
    Configuration menu
    Copy the full SHA
    7c7d7fc View commit details
    Browse the repository at this point in the history

  3. -

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

  4. -

    @jdcpni
    jdcpni committed Mar 17, 2018
    Configuration menu
    Copy the full SHA
    94d8223 View commit details
    Browse the repository at this point in the history

  5. • System 

      show_graph: added show_projection_labels option
    @jdcpni
    jdcpni committed Mar 17, 2018
    Configuration menu
    Copy the full SHA
    5b2a62d View commit details
    Browse the repository at this point in the history

  6. -

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

  7. -

    @jdcpni
    jdcpni committed Mar 17, 2018
    Configuration menu
    Copy the full SHA
    51ca392 View commit details
    Browse the repository at this point in the history

  8. -

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

  9. -

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