Merge branch 'fix/sympy_eval' into issues/192_sympy_tests

qctoolkit/pulses/loop_pulse_template.py

@@ -241,8 +241,8 @@ def deserialize(serializer: Serializer,
                     loop_range: Tuple,
                     loop_index: str,
                     identifier: Optional[str]=None,
-                    measurements: Optional=None,
-                    parameter_constraints: Optional=None) -> 'ForLoopPulseTemplate':
+                    measurements: Optional[Sequence[str]]=None,
+                    parameter_constraints: Optional[Sequence[str]]=None) -> 'ForLoopPulseTemplate':
         body = cast(PulseTemplate, serializer.deserialize(body))
         return ForLoopPulseTemplate(body=body,
                                     identifier=identifier,

qctoolkit/pulses/plotting.py

@@ -10,6 +10,7 @@
 from typing import Dict, Tuple, Any, Generator, Optional
 
 import numpy as np
+import warnings
 
 from qctoolkit.utils.types import ChannelID
 from qctoolkit.pulses.pulse_template import PulseTemplate
@@ -44,9 +45,14 @@ def iter_waveforms(instruction_block: AbstractInstructionBlock,
             raise NotImplementedError('Rendering cannot handle instructions of type {}.'.format(type(instruction)))
 
 
-def render(sequence: AbstractInstructionBlock, sample_rate: int=10) -> Tuple[np.ndarray, Dict[ChannelID, np.ndarray]]:
+def render(sequence: AbstractInstructionBlock, sample_rate: float=10.0) -> Tuple[np.ndarray, Dict[ChannelID, np.ndarray]]:
     """'Render' an instruction sequence (sample all contained waveforms into an array).
 
+    Args:
+        sequence (AbstractInstructionBlock): block of instructions representing a (sub)sequence
+            in the control flow of a pulse template instantiation.
+        sample_rate (float): The sample rate in GHz.
+
     Returns:
         a tuple (times, values) of numpy.ndarrays of similar size. times contains the time value
         of all sample times and values the corresponding sampled value.
@@ -61,6 +67,8 @@ def render(sequence: AbstractInstructionBlock, sample_rate: int=10) -> Tuple[np.
 
     # add one sample to see the end of the waveform
     sample_count = total_time * sample_rate + 1
+    if not float(sample_count).is_integer():
+        warnings.warn('Sample count not whole number. Casted to integer.')
     times = np.linspace(0, total_time, num=sample_count, dtype=float)
     # move the last sample inside the waveform
     times[-1] = np.nextafter(times[-1], times[-2])

qctoolkit/utils/sympy.py

@@ -109,9 +109,8 @@ def sympify(expr: Union[str, Number, sympy.Expr, numpy.str_], **kwargs) -> sympy
 def substitute_with_eval(expression: sympy.Expr,
                          substitutions: Dict[str, Union[sympy.Expr, numpy.ndarray, str]]) -> sympy.Expr:
     """Substitutes only sympy.Symbols. Workaround for numpy like array behaviour. ~Factor 3 slower compared to subs"""
-    for k, v in substitutions.items():
-        if not isinstance(v, sympy.Expr):
-            substitutions[k] = sympify(v)
+    substitutions = {k: v if isinstance(v, sympy.Expr) else sympify(v)
+                     for k, v in substitutions.items()}
 
     for symbol in expression.free_symbols:
         symbol_name = str(symbol)