fix/lccontrolmechanism_objectivemechanism

psyneulink/core/components/mechanisms/modulatory/control/controlmechanism.py

@@ -1452,7 +1452,7 @@ def _instantiate_objective_mechanism(self, input_ports=None, context=None):
         if not isinstance(monitor_for_control, list):
             monitor_for_control = [monitor_for_control]
 
-        # If objective_mechanism is used to specify OutputPorts to be monitored (legacy feature)
+        # If objective_mechanism arg is used to specify OutputPorts to be monitored (legacy feature)
         #    move them to monitor_for_control
         if isinstance(self.objective_mechanism, list):
             monitor_for_control.extend(self.objective_mechanism)

psyneulink/core/compositions/composition.py

@@ -2912,7 +2912,7 @@
 from psyneulink.core.components.mechanisms.modulatory.modulatorymechanism import ModulatoryMechanism_Base
 from psyneulink.core.components.mechanisms.processing.compositioninterfacemechanism import CompositionInterfaceMechanism
 from psyneulink.core.components.mechanisms.processing.objectivemechanism import ObjectiveMechanism
-from psyneulink.core.components.mechanisms.processing.processingmechanism import ProcessingMechanism
+from psyneulink.core.components.mechanisms.processing.processingmechanism import ProcessingMechanism, ProcessingMechanism_Base
 from psyneulink.core.components.ports.inputport import InputPort, InputPortError
 from psyneulink.core.components.ports.modulatorysignals.controlsignal import ControlSignal
 from psyneulink.core.components.ports.modulatorysignals.learningsignal import LearningSignal
@@ -2934,17 +2934,18 @@
 from psyneulink.core.compositions.showgraph import ShowGraph, INITIAL_FRAME, SHOW_CIM, EXECUTION_SET, SHOW_CONTROLLER
 from psyneulink.core.globals.context import Context, ContextFlags, handle_external_context
 from psyneulink.core.globals.keywords import \
-    AFTER, ALL, ALLOW_PROBES, ANY, BEFORE, COMPONENT, COMPOSITION, CONTROL, CONTROL_SIGNAL, CONTROLLER, CROSS_ENTROPY, \
+    (AFTER, ALL, ALLOW_PROBES, ANY, BEFORE, COMPONENT, COMPOSITION, CONTROL, CONTROL_SIGNAL, CONTROLLER, CROSS_ENTROPY, \
     DEFAULT, DEFAULT_VARIABLE, DICT, FEEDBACK, FULL, FUNCTION, HARD_CLAMP, IDENTITY_MATRIX, \
     INPUT, INPUT_PORTS, INPUTS, INPUT_CIM_NAME, \
     LEARNABLE, LEARNED_PROJECTIONS, LEARNING_FUNCTION, LEARNING_MECHANISM, LEARNING_MECHANISMS, LEARNING_PATHWAY, \
     LEARNING_SIGNAL, Loss, \
-    MATRIX, MAYBE, MODEL_SPEC_ID_METADATA, MONITOR, MONITOR_FOR_CONTROL, NAME, NESTED, NO_CLAMP, NODE, NODES, \
+    MATRIX, MAYBE, MODEL_SPEC_ID_METADATA, MONITOR, MONITOR_FOR_CONTROL, MULTIPLICATIVE_PARAM,
+    NAME, NESTED, NO_CLAMP, NODE, NODES, \
     OBJECTIVE_MECHANISM, ONLINE, ONLY, OUTCOME, OUTPUT, OUTPUT_CIM_NAME, OUTPUT_MECHANISM, OUTPUT_PORTS, OWNER_VALUE, \
     PARAMETER, PARAMETER_CIM_NAME, PORT, \
     PROCESSING_PATHWAY, PROJECTION, PROJECTIONS, PROJECTION_TYPE, PROJECTION_PARAMS, PULSE_CLAMP, RECEIVER, \
     SAMPLE, SENDER, SHADOW_INPUTS, SOFT_CLAMP, SUM, \
-    TARGET, TARGET_MECHANISM, TEXT, VARIABLE, WEIGHT, OWNER_MECH
+    TARGET, TARGET_MECHANISM, TEXT, VARIABLE, WEIGHT, OWNER_MECH)
 from psyneulink.core.globals.log import CompositionLog, LogCondition
 from psyneulink.core.globals.parameters import Parameter, ParametersBase, check_user_specified, copy_parameter_value
 from psyneulink.core.globals.preferences.basepreferenceset import BasePreferenceSet
@@ -4368,8 +4369,7 @@
         else:
             self._pre_existing_pathway_components[NODES].append(node)
 
-        # Aux components are being added by Composition, even if main Node being added was from COMMAND_LINE
-        # (this suppresses warnings pertaining to illegal or ill-advised direct addition of some components)
+        # Aux components are being added by Composition, even if main Node is being added was from COMMAND_LINE
         invalid_aux_components = self._add_node_aux_components(node, context=context)
 
         # Implement required_roles
@@ -5114,7 +5114,7 @@
             # ignore these for now and try to activate them again during every call to _analyze_graph
             # and, at runtime, if there are still any invalid aux_components left, issue a warning
             projections = []
-            # Add all "nodes" to the composition first (in case projections reference them)
+            # Add all Nodes to the Composition first (in case Projections reference them)
             for i, component in enumerate(node.aux_components):
                 if isinstance(component, (Mechanism, Composition)):
                     if isinstance(component, Composition):
@@ -9801,6 +9801,15 @@
 
         return total_cost
 
+    def _get_modulable_mechanisms(self):
+        modulated_mechanisms = []
+        for mech in [m for m in self.nodes if (isinstance(m, ProcessingMechanism_Base) and
+                                                      not (isinstance(m, ObjectiveMechanism)
+                                                           and self.get_roles_for_node(m) != NodeRole.CONTROL)
+                                                      and hasattr(m.function, MULTIPLICATIVE_PARAM))]:
+            modulated_mechanisms.append(mech)
+        return modulated_mechanisms
+
     # endregion CONTROL
 
     # ******************************************************************************************************************