Merge remote-tracking branch 'remotes/origin/master' into issues/para…

…meter_constrainer_fix

qctoolkit/pulses/loop_pulse_template.py

@@ -178,7 +178,7 @@ def duration(self) -> ExpressionScalar:
     def parameter_names(self) -> Set[str]:
         parameter_names = self.body.parameter_names.copy()
         parameter_names.remove(self._loop_index)
-        return parameter_names | self._loop_range.parameter_names
+        return parameter_names | self._loop_range.parameter_names | self.constrained_parameters
 
     def _body_parameter_generator(self, parameters: Dict[str, Parameter], forward=True) -> Generator:
         loop_range_parameters = dict((parameter_name, parameters[parameter_name].get_value())

qctoolkit/pulses/repetition_pulse_template.py

@@ -123,7 +123,7 @@ def __str__(self) -> str:
 
     @property
     def parameter_names(self) -> Set[str]:
-        return self.body.parameter_names | set(self.repetition_count.variables)
+        return self.body.parameter_names | set(self.repetition_count.variables) | self.constrained_parameters
 
     @property
     def measurement_names(self) -> Set[str]:

qctoolkit/pulses/sequence_pulse_template.py

@@ -169,7 +169,7 @@ def __init__(self,
 
     @property
     def parameter_names(self) -> Set[str]:
-        return set.union(*(st.parameter_names for st in self.__subtemplates))
+        return self.constrained_parameters.union(*(st.parameter_names for st in self.__subtemplates))
 
     @property
     def subtemplates(self) -> List[MappingPulseTemplate]:

tests/pulses/loop_pulse_template_tests.py

@@ -148,6 +148,11 @@ def test_parameter_names(self):
 
         self.assertEqual(flt.parameter_names, {'k', 'a', 'b', 'c'})
 
+    def test_parameter_names_param_only_in_constraint(self) -> None:
+        flt = ForLoopPulseTemplate(body=DummyPulseTemplate(parameter_names={'k', 'i'}), loop_index='i',
+                                   loop_range=('a', 'b', 'c',), parameter_constraints=['k<=f'])
+        self.assertEqual(flt.parameter_names, {'k', 'a', 'b', 'c', 'f'})
+
     def test_build_sequence(self):
         dt = DummyPulseTemplate(parameter_names={'i'})
         flt = ForLoopPulseTemplate(body=dt, loop_index='i', loop_range=('a', 'b', 'c'),

tests/pulses/repetition_pulse_template_tests.py

@@ -204,7 +204,6 @@ def test_parameter_not_provided(self):
             template.build_sequence(self.sequencer, parameters, conditions, measurement_mapping, channel_mapping,
                                      self.block)
 
-
     def test_build_sequence_declaration_exceeds_bounds(self) -> None:
         parameters = dict(foo=ConstantParameter(9))
         conditions = dict(foo=DummyCondition(requires_stop=True))
@@ -226,6 +225,10 @@ def test_build_sequence_declaration_parameter_value_not_whole(self) -> None:
             self.template.build_sequence(self.sequencer, parameters, conditions, {}, {}, self.block)
         self.assertFalse(self.sequencer.sequencing_stacks)
 
+    def test_parameter_names_param_only_in_constraint(self) -> None:
+        pt = RepetitionPulseTemplate(DummyPulseTemplate(parameter_names={'a'}), 'n', parameter_constraints=['a<c'])
+        self.assertEqual(pt.parameter_names, {'a','c', 'n'})
+
 
 class RepetitionPulseTemplateSerializationTests(unittest.TestCase):
 

tests/pulses/sequence_pulse_template_tests.py

@@ -127,6 +127,10 @@ def test_duration(self):
                                    DummyPulseTemplate(duration='b'))
         self.assertEqual(pt.duration, Expression('a+a+b'))
 
+    def test_parameter_names_param_only_in_constraint(self) -> None:
+        pt = SequencePulseTemplate(DummyPulseTemplate(parameter_names={'a'}), DummyPulseTemplate(parameter_names={'b'}), parameter_constraints=['a==b', 'a<c'])
+        self.assertEqual(pt.parameter_names, {'a','b','c'})
+
     def test_build_waveform(self):
         wfs = [DummyWaveform(), DummyWaveform()]
         pts = [DummyPulseTemplate(waveform=wf) for wf in wfs]