Skip to content

Commit

Permalink
Merge pull request #1269 from PrincetonUniversity/feat/cim/parameter_cim
Browse files Browse the repository at this point in the history
Parameter CIM Class Removal:
  • Loading branch information
dillontsmith authored Aug 2, 2019
2 parents 7fe367c + 69f54e8 commit cfbc6b4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 162 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
from psyneulink.core.components.component import parameter_keywords
from psyneulink.core.components.functions.transferfunctions import Linear
from psyneulink.core.components.mechanisms.adaptive.control.controlmechanism import ControlMechanism
from psyneulink.core.components.mechanisms.processing.parameterinterfacemechanism import ParameterInterfaceMechanism
from psyneulink.core.components.projections.modulatory.modulatoryprojection import ModulatoryProjection_Base
from psyneulink.core.components.projections.projection import ProjectionError, Projection_Base, projection_keywords
from psyneulink.core.components.shellclasses import Mechanism, Process_Base
Expand Down Expand Up @@ -385,7 +384,7 @@ def _instantiate_sender(self, sender, params=None, context=None):
# If sender is specified as a Mechanism, validate that it is a ControlMechanism
if isinstance(sender, Mechanism):
# If sender is a ControlMechanism, call it to instantiate its ControlSignal projection
if not isinstance(sender, (ControlMechanism, ParameterInterfaceMechanism)):
if not isinstance(sender, ControlMechanism):
raise ControlProjectionError(
"Mechanism specified as sender for {} ({}) must be a "
"ControlMechanism (but it is a {})".format(
Expand Down
1 change: 0 additions & 1 deletion psyneulink/core/globals/keywords.py
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,6 @@ def _is_metric(metric):
INTEGRATOR_MECHANISM = "IntegratorMechanism"
DDM_MECHANISM = "DDM"
COMPOSITION_INTERFACE_MECHANISM = "CompositionInterfaceMechanism"
PARAMETER_INTERFACE_MECHANISM = "ParameterInterfaceMechanism"
PROCESSING_MECHANISM = "ProcessingMechanism"

# Functions:
Expand Down

0 comments on commit cfbc6b4

Please sign in to comment.