Refactor/ports/restrict projections #2327
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
…Link into feat/ocm/feature_input_ports
- _instantiate_control_signals: random_seeds -> random_seed_mod_values
- _add_controller: modifying to instantiate feature_input_ports if none are specified
- add_controller: now adds feature_input_ports for Compostion INPUT nodes if not state_features not specified
- _add_controller: modifying to instantiate feature_input_ports if none are specified
- add_controller: assign simulation_input_ports
- feature_input_ports -> state_input_ports
- _instantiate_input_ports():
state_features only allowed to specifying state_input_ports if
agent_rep is a CompositionFunctionApproximator (i.e., model-free optimization)
• composition.py:
- add_controller: adds state_input_ports to shadow INPUT Nodes of Composition
if controller.agent_rep is Composition (model-based optimziation)
or state_features have not been specified (for model-free optimizaton)
_instantiate_input_ports:
reinstate allowance of state_features specification if agent_rep is a Composition
(i.e., model-based optimization) as long as they are all INPUT Nodes of agent_rep
- _gen_llvm_evaluate_function: num_estimates -> num_estimates_per_trial
- _gen_llvm_evaluate_function: num_estimates -> num_trial_per_estimate
…rincetonUniversity/PsyNeuLink into refactor/ocm/state_input_ports � Conflicts: � psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py
- _gen_llvm_evaluate_function: num_estimates -> num_trials_per_estimate
…Link into refactor/ocm/state_input_ports
…ut_ports # Conflicts: # psyneulink/core/components/mechanisms/modulatory/control/optimizationcontrolmechanism.py
- __init__: moved controller instantiation until after nodes, projections and pathways
…Link into misc/input_ports/disallow_efferents
- refactor to eliminate:
- efferents attribute from InputPorts and Parameters
- path_afferents attribute from OutputPports
- add remove_projections()
- add mod_afferents property
- _get_input_struct_type(): add try and accept for path_afferents
• inputport.py:
- add path_afferents override
• parameterport.py:
- add path_afferents override
• outputport.py:
- add efferents override
• composition.py:
- add_projection(): call port.remove_projection
• keywords.py:
add PATH_AFFERENTS, MOD_AFFERENTS, EFFERENTS
…Link into refactor/ports/restrict_projections
- add test_no_efferents()
- add test_no_path_afferents()
- add test_no_path_afferents() - add test_no_efferents()
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
|
This pull request introduces 5 alerts when merging 82ef44c into d7f68ad - view on LGTM.com new alerts:
|
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.
• Refactor port.py to prohibit:
- efferents attribute on InputPorts and ParameterPorts
- path_afferents attribute on OutputPports
• Tests added to test_input_ports, test_parameter_ports, test_output_ports
• Add keywords PATH_AFFERENTS, MOD_AFFERENTS, EFFERENTS