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.

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

Fix/composition/add controller #1304

Merged
merged 33 commits into from
Sep 17, 2019
Merged

Fix/composition/add controller #1304

merged 33 commits into from
Sep 17, 2019

Conversation

jdcpni
Copy link
Collaborator

@jdcpni jdcpni commented Sep 17, 2019

• tests/composition/test_control:
  - added tests in TestControlSpecification
that test for order and redundancy of control specification for nodes and controller

• Composition
  - init:  if controller is specified, call self.add_controller
  - add_controller: 
> now adds control_signals to controller for ones specified
for parameters of Mechanism in its constructor
  > added comments to code
  - add_node:  add control_signals to controller for ones specified
for parameters of Mechanism in its constructor
  - "shadow_inputs" > SHADOW_INPUTS

  • UNRESOLVED:
    When a controller is specified to control a Mechanism that is not yet a node in the Composition
    it nevertheless gets activated (in call to controller._activate_projections_for_compositions)
    and can run even if the node is never added

• ModulatoryMechanism
  - _remove_default_modulatory_signal():  added method

• ParameterState
  - _check_for_duplicate_projections:
    > fixed presumed bug:  search for projections in path_afferents rather than mod_afferents

jdcpni and others added 30 commits September 14, 2019 18:08
  - "shadow_inputs" > SHADOW_INPUTS
  - added some comments in add_controller
  - add_controller:  now adds control_signals to controller
                     for ones specified for parameters of Mechanism in its constructor
  - add_node:  add control_signals to controller
               for ones specified for parameters of Mechanism in its constructor
  - _check_for_duplicate_projections:
    fixed presumed bug:  search for projections in path_afferents
    rather than mod_afferents
  - _remove_default_modulatory_signal():  added method
  - __init__:  if controller is specified, call self.add_controller
  - __init__:  if controller is specified, call self.add_controller
  - added tests in TestControlSpecification that test for
    order and redundancy of control specification for nodes and controller
@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 77.968% when pulling 74d3e08 on fix/composition/add_controller into 5762e2c on devel.

@coveralls
Copy link

coveralls commented Sep 17, 2019

Coverage Status

Coverage increased (+0.05%) to 77.973% when pulling 74d3e08 on fix/composition/add_controller into 5762e2c on devel.

@jvesely
Copy link
Collaborator

jvesely commented Sep 17, 2019

Here are the test failures from travis and appveyor.
I don't why Jenkins doesn't report them:

=================================== FAILURES ===================================
_______________________________ pydocstyle-check _______________________________
[gw1] linux -- Python 3.6.7 /home/travis/virtualenv/python3.6.7/bin/python
/home/travis/build/PrincetonUniversity/PsyNeuLink/psyneulink/core/components/mechanisms/adaptive/modulatorymechanism.py:1642 in private method `_activate_projections_for_compositions`:
        D300: Use """triple double quotes""" (found '''-quotes)
_______________________________ pydocstyle-check _______________________________
[gw1] linux -- Python 3.6.7 /home/travis/virtualenv/python3.6.7/bin/python
/home/travis/build/PrincetonUniversity/PsyNeuLink/psyneulink/core/components/states/inputstate.py:964 in private method `_check_for_duplicate_projections`:
        D300: Use """triple double quotes""" (found '''-quotes)
_______________________________ pydocstyle-check _______________________________
[gw1] linux -- Python 3.6.7 /home/travis/virtualenv/python3.6.7/bin/python
/home/travis/build/PrincetonUniversity/PsyNeuLink/psyneulink/core/components/states/outputstate.py:1139 in private method `_check_for_duplicate_projections`:
        D300: Use """triple double quotes""" (found '''-quotes)
_______________________________ pydocstyle-check _______________________________
[gw1] linux -- Python 3.6.7 /home/travis/virtualenv/python3.6.7/bin/python
/home/travis/build/PrincetonUniversity/PsyNeuLink/psyneulink/core/components/states/parameterstate.py:645 in private method `_check_for_duplicate_projections`:
        D300: Use """triple double quotes""" (found '''-quotes)

@jdcpni jdcpni merged commit b2ab847 into devel Sep 17, 2019
@kmantel kmantel deleted the fix/composition/add_controller branch January 23, 2020 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants