-
Notifications
You must be signed in to change notification settings - Fork 32
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- "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
…rincetonUniversity/PsyNeuLink into fix/composition/add_controller
- _remove_default_modulatory_signal(): added method
- __init__: if controller is specified, call self.add_controller
- __init__: if controller is specified, call self.add_controller
…rincetonUniversity/PsyNeuLink into fix/composition/add_controller
- added tests in TestControlSpecification that test for order and redundancy of control specification for nodes and controller
…//github.com/PrincetonUniversity/PsyNeuLink into fix/composition/add_controller
…//github.com/PrincetonUniversity/PsyNeuLink into fix/composition/add_controller
Here are the test failures from travis and appveyor.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
• 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
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