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/comp/proj warnings #2264

Merged
merged 247 commits into from
Dec 30, 2021
Merged

Fix/comp/proj warnings #2264

merged 247 commits into from
Dec 30, 2021

Conversation

jdcpni
Copy link
Collaborator

@jdcpni jdcpni commented Dec 30, 2021

• composition.py

  • _check_for_unused_projections(): fix crash for projections in deferred_init
  • _check_controller_initialization_status(): edited warning message
  • _add_node_aux_components(): add projections in deferred_init to invalid_aux_components

• test_control.py:

  • add test_add_node_with_controller_spec_and_control_mech_but_not_a_controller()
  • add test_bad_objective_mechanism_spec()

jdcpni added 30 commits April 29, 2021 21:07
  docstring mod to **size**
  added feature_input_ports attribute and num_feature_input_ports property
  added feature_input_ports attribute and num_feature_input_ports property

• parameterestimationcomposition.py: fixed misplacement of its Parameters() attribute
  added feature_input_ports attribute and num_feature_input_ports property

• parameterestimationcomposition.py: fixed misplacement of its Parameters() attribute

• optimizationfunctions.py: made num_estimates a Parameter
  - _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
jdcpni and others added 25 commits December 12, 2021 01:03
  - add test_unnested_PROBE
  - add test_nested_PROBES
    TBD: test include_probes_in_output
  - add_node():  support tuple with required_role
  - _determine_node_roles:
     fix bug in which nested comp was prevented from being an OUTPUT Node if,
     in addition to Nodes that qualifed as OUTPUT, it also had nodes that projected
     to Nodes in an outer comp (making it look like it was INTERNAL)
…nUniversity/PsyNeuLink into feat/composition/probes

� Conflicts:
�	tests/composition/test_composition.py
  - add_node(): enforce include_probes_in_output = True for nested Compositions
  - execute():
    - replace return of output_value with get_output_value()
  - correct path ref

• compositioninterfacemechanism.py:
  - docstring fixes
…Link into devel

� Conflicts:
�	psyneulink/core/components/mechanisms/processing/compositioninterfacemechanism.py
  - add test_warning_for_add_controller_twice()
  - add test_warning_for_controller_assigned_to_another_comp()
  - add test_warning_for_replacement_of_controller()
  - _check_for_unused_projections(): fix crash for projections in deferred_init
  - _check_controller_initialization_status(): edited warning message
  - _add_node_aux_components(): add projections in deferred_init to invalid_aux_components
  - add test_add_node_with_controller_spec_and_control_mech_but_not_a_controller()
  = add test_bad_objective_mechanism_spec()
@github-actions
Copy link

This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64):

No differences!

...

See CI logs for the full diff.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 84.341% when pulling 194bc48 on fix/comp/proj_warnings into 5d2089a on devel.

@lgtm-com
Copy link
Contributor

lgtm-com bot commented Dec 30, 2021

This pull request introduces 1 alert when merging 194bc48 into 5d2089a - view on LGTM.com

new alerts:

  • 1 for Unused import

@jdcpni jdcpni merged commit 9da53b9 into devel Dec 30, 2021
@jdcpni jdcpni deleted the fix/comp/proj_warnings branch December 30, 2021 04:26
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.

4 participants