[skip ci]

psyneulink/library/compositions/emcomposition.py

@@ -1441,9 +1441,8 @@ def _construct_retrieval_gating_nodes(self)->list:
         """
 
         # FIX: CONSIDER USING THIS FOR INPUT GATING OF MATCH NODE(S)?
-        if self.concatenate_keys:
-            retrieval_gating_nodes = []
-        else:
+        retrieval_gating_nodes = []
+        if not self.concatenate_keys:
             retrieval_gating_nodes = [GatingMechanism(input_ports={PROJECTIONS: key_match_pair[0].output_ports['RESULT'],
                                                                    NAME: 'OUTCOME'},
                                                       gate=[key_match_pair[1].output_ports[1]],

tests/composition/test_emcomposition.py

@@ -114,14 +114,16 @@ def test_report_prefs(self):
         (11, [[0,0],[0,0,0],[0,0]],   .1,  [1,2,0],     None,      None,    False,     3,     2,   1,    False,  False),
         (12, [[[0,1],[0,0,0],[0,0]],  # two entries specified, fields have same weights
               [[0,2],[0,0,0],[0,0]]], .1,  [1,1,0],     None,      None,      2,       3,     2,   1,    True,   False),
-        (13, [[[0,1],[0,0,0],[0,0]],  # two entries specified, all fields are keys
+        (13, [[[0,1],[0,0,0],[0,0]],  # two entries specified, fields have same weights, but conccatenate_keys is False
+              [[0,2],[0,0,0],[0,0]]], .1,  [1,1,0],     False,      None,      2,       3,     2,   1,    False, False),
+        (14, [[[0,1],[0,0,0],[0,0]],  # two entries specified, all fields are keys
               [[0,2],[0,0,0],[0,0]]], .1,  [1,1,1],     None,      None,      2,       3,     3,   0,    True,   False),
-        (14, [[[0,1],[0,0,0],[0,0]],  # two entries specified; fields have different weights
+        (15, [[[0,1],[0,0,0],[0,0]],  # two entries specified; fields have different weights
               [[0,2],[0,0,0],[0,0]]], .1,  [1,2,0],     None,      None,      2,       3,     2,   1,    False,  False),
-        (15, [[[0,1],[0,0,0],[0,0]],  # three enrtries specified
+        (16, [[[0,1],[0,0,0],[0,0]],  # three enrtries specified
               [[0,2],[0,0,0],[0,0]],
               [[0,3],[0,0,0],[0,0]]], .1,  [1,2,0],     None,      None,      3,       3,     2,   1,    False,  False),
-        (16, [[[0,1],[0,0,0],[0,0]],  # all four enrtries allowed by memory_capacity specified
+        (17, [[[0,1],[0,0,0],[0,0]],  # all four enrtries allowed by memory_capacity specified
               [[0,2],[0,0,0],[0,0]],
               [[0,3],[0,0,0],[0,0]],
               [[0,4],[0,0,0],[0,0]]], .1,  [1,2,0],     None,      None,      4,       3,     2,   1,    False,  False),
@@ -198,7 +200,10 @@ def test_structure(self,
         assert len(em.key_input_nodes) == num_keys
         assert len(em.value_input_nodes) == num_values
         assert len(em.retrieval_nodes) == num_keys + num_values
-        # assert len(em.retrieval_weighting_nodes) == retrieval_weighting_nodes
+        if concatenate_keys:
+            assert em.retrieval_gating_nodes == []
+        else:
+            assert len(em.retrieval_gating_nodes) == num_keys
         assert len(em.retrieval_nodes) == num_fields
         assert isinstance(em.concatenate_keys_node, Mechanism) == concatenate_node
         # assert em.retrieval_weighting_node == retrieval_weighting_nodes