From 99d78b354f19b347e5a28edb7a8eb7bad268715e Mon Sep 17 00:00:00 2001
From: jdcpni <jdc@princeton.edu>
Date: Fri, 20 Jul 2018 15:16:54 -0400
Subject: [PATCH] Fix/state/duplicate projection fa (#882)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* -

* • State
  - _instantiate_projections_to_state:
     fixed bug in which deferred_init projection was triggering duplicate warning
---
 .idea/runConfigurations/Scratch_Pad.xml                     | 6 +++---
 .idea/runConfigurations/py_test_in_tests.xml                | 6 +++---
 .../components/mechanisms/processing/objectivemechanism.py  | 1 -
 psyneulink/components/states/state.py                       | 3 ++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.idea/runConfigurations/Scratch_Pad.xml b/.idea/runConfigurations/Scratch_Pad.xml
index b1cfd51a09e..7600f1c22e0 100644
--- a/.idea/runConfigurations/Scratch_Pad.xml
+++ b/.idea/runConfigurations/Scratch_Pad.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" factoryName="Python" name="Scratch Pad" singleton="true" type="PythonConfigurationType">
-    <module name="" />
+  <configuration default="false" name="Scratch Pad" type="PythonConfigurationType" factoryName="Python" singleton="true">
+    <module name="PsyNeuLink (Dropbox)" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="" />
+    <option name="SDK_HOME" value="$USER_HOME$/anaconda/envs/python35/bin/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Scripts" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/.idea/runConfigurations/py_test_in_tests.xml b/.idea/runConfigurations/py_test_in_tests.xml
index eb285f47ecd..1b7454c3ac1 100644
--- a/.idea/runConfigurations/py_test_in_tests.xml
+++ b/.idea/runConfigurations/py_test_in_tests.xml
@@ -1,9 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" factoryName="py.test" name="py.test in tests" nameIsGenerated="true" singleton="true" type="tests">
-    <module name="" />
+  <configuration default="false" name="py.test in tests" type="tests" factoryName="py.test" singleton="true" nameIsGenerated="true">
+    <module name="PsyNeuLink (Dropbox)" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
-    <option name="SDK_HOME" value="" />
+    <option name="SDK_HOME" value="$USER_HOME$/anaconda/envs/python35/bin/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tests" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/psyneulink/components/mechanisms/processing/objectivemechanism.py b/psyneulink/components/mechanisms/processing/objectivemechanism.py
index 61595fa6cc6..1ccc52806b8 100644
--- a/psyneulink/components/mechanisms/processing/objectivemechanism.py
+++ b/psyneulink/components/mechanisms/processing/objectivemechanism.py
@@ -633,7 +633,6 @@ def _instantiate_input_states(self, monitored_output_states_specs=None, referenc
             # Use self.input_states (containing specs from **input_states** arg of constructor) or
             #    or pass off instantiation of default InputState(s) to super
             input_states = self.input_states or None
-            # return super()._instantiate_input_states(input_states=input_states, context=context)
             input_states = super()._instantiate_input_states(input_states=input_states, context=context)
 
         else:
diff --git a/psyneulink/components/states/state.py b/psyneulink/components/states/state.py
index 65517af7ca8..c1ff9e44b56 100644
--- a/psyneulink/components/states/state.py
+++ b/psyneulink/components/states/state.py
@@ -1498,7 +1498,8 @@ def _instantiate_projections_to_state(self, projections, context=None):
 
             # Avoid duplicates, since instantiation of projection may have already called this method
             #    and assigned Projection to self.path_afferents or mod_afferents lists
-            if any(proj.sender == projection.sender for proj in self.path_afferents):
+            # if any(proj.sender == projection.sender and proj != projection for proj in self.path_afferents):
+            if any(proj.sender == projection.sender and proj != projection for proj in self.path_afferents):
                 warnings.warn('{} from {} of {} to {} of {} already exists; will ignore additional one specified ({})'.
                               format(Projection.__name__, repr(projection.sender.name),
                                      projection.sender.owner.name,