change simpleexpression for equality handling

qupulse/expressions/simple.py

@@ -0,0 +1,133 @@
+import numpy as np
+from numbers import Real, Number
+from typing import Optional, Union, Sequence, ContextManager, Mapping, Tuple, Generic, TypeVar, Iterable, Dict, List
+from dataclasses import dataclass
+
+from functools import total_ordering
+from qupulse.utils.sympy import _lambdify_modules
+from qupulse.expressions import sympy as sym_expr, Expression
+from qupulse.utils.types import MeasurementWindow, TimeType, FrozenMapping
+
+
+NumVal = TypeVar('NumVal', bound=Real)
+
+
+@total_ordering
+@dataclass
+class SimpleExpression(Generic[NumVal]):
+    """This is a potential hardware evaluable expression of the form
+
+    C + C1*R1 + C2*R2 + ...
+    where R1, R2, ... are potential runtime parameters.
+
+    The main use case is the expression of for loop dependent variables where the Rs are loop indices. There the
+    expressions can be calculated via simple increments.
+    """
+
+    base: NumVal
+    offsets: Mapping[str, NumVal]
+
+    def __post_init__(self):
+        assert isinstance(self.offsets, Mapping)
+
+    def value(self, scope: Mapping[str, NumVal]) -> NumVal:
+        value = self.base
+        for name, factor in self.offsets.items():
+            value += scope[name] * factor
+        return value
+
+    def __abs__(self):
+        return abs(self.base)+sum([abs(o) for o in self.offsets.values()])
+
+    def __eq__(self, other):
+        #there is no good way to compare it without having a value,
+        #but cannot require more parameters in magic method?
+        #so have this weird full equality for now which doesn logically make sense
+        #in most cases to catch unintended consequences
+
+        if isinstance(other, (float, int, TimeType)):
+            return self.base==other and all([o==other for o in self.offsets])
+
+        if type(other) == type(self):
+            if len(self.offsets)!=len(other.offsets): return False
+            return self.base==other.base and all([o1==o2 for o1,o2 in zip(self.offsets,other.offsets)])
+
+        return NotImplemented
+
+    def __gt__(self, other):
+        return all([b for b in self._return_greater_comparison_bools(other)])
+
+    def __lt__(self, other):
+        return all([not b for b in self._return_greater_comparison_bools(other)])
+
+    def _return_greater_comparison_bools(self, other) -> List[bool]:
+        #there is no good way to compare it without having a value,
+        #but cannot require more parameters in magic method?
+        #so have this weird full equality for now which doesn logically make sense
+        #in most cases to catch unintended consequences
+        if isinstance(other, (float, int, TimeType)):
+            return [self.base>other] + [o>other for o in self.offsets.values()]
+
+        if type(other) == type(self):
+            if len(self.offsets)!=len(other.offsets): return [False]
+            return [self.base>other.base] + [o1>o2 for o1,o2 in zip(self.offsets.values(),other.offsets.values())]
+
+        return NotImplemented
+
+    def __add__(self, other):
+        if isinstance(other, (float, int, TimeType)):
+            return SimpleExpression(self.base + other, self.offsets)
+
+        if type(other) == type(self):
+            offsets = self.offsets.copy()
+            for name, value in other.offsets.items():
+                offsets[name] = value + offsets.get(name, 0)
+            return SimpleExpression(self.base + other.base, offsets)
+
+        return NotImplemented
+
+    def __radd__(self, other):
+        return self.__add__(other)
+
+    def __sub__(self, other):
+        return self.__add__(-other)
+
+    def __rsub__(self, other):
+        (-self).__add__(other)
+
+    def __neg__(self):
+        return SimpleExpression(-self.base, {name: -value for name, value in self.offsets.items()})
+
+    def __mul__(self, other: NumVal):
+        if isinstance(other, (float, int, TimeType)):
+            return SimpleExpression(self.base * other, {name: other * value for name, value in self.offsets.items()})
+
+        return NotImplemented
+
+    def __rmul__(self, other):
+        return self.__mul__(other)
+
+    def __truediv__(self, other):
+        inv = 1 / other
+        return self.__mul__(inv)
+
+    def __hash__(self):
+        return hash((self.base,frozenset(sorted(self.offsets.items()))))
+
+    @property
+    def free_symbols(self):
+        return ()
+
+    def _sympy_(self):
+        return self
+
+    def replace(self, r, s):
+        return self
+
+    def evaluate_in_scope_(self, *args, **kwargs):
+        # TODO: remove. It is currently required to avoid nesting this class in an expression for the MappedScope
+        # We can maybe replace is with a HardwareScope or something along those lines
+        return self
+
+
+_lambdify_modules.append({'SimpleExpression': SimpleExpression})

qupulse/hardware/awgs/base.py

@@ -17,7 +17,7 @@
 from qupulse.hardware.util import get_sample_times, not_none_indices
 from qupulse.utils.types import ChannelID
 from qupulse.program.linspace import LinSpaceNode, LinSpaceArbitraryWaveform, to_increment_commands, Command, \
-    Increment, Set as LSPSet, LoopLabel, LoopJmp, Wait, Play
+    Increment, Set as LSPSet, LoopLabel, LoopJmp, Wait, Play, DEFAULT_INCREMENT_RESOLUTION, DepDomain
 from qupulse.program.loop import Loop
 from qupulse.program.waveforms import Waveform
 from qupulse.comparable import Comparable
@@ -191,6 +191,7 @@ def __init__(self, program: AllowedProgramTypes,
                  voltage_transformations: Tuple[Optional[Callable], ...],
                  sample_rate: TimeType,
                  waveforms: Sequence[Waveform] = None,
+                 # voltage_resolution: Optional[float] = None,
                  program_type: _ProgramType = _ProgramType.Loop):
         """
 
@@ -204,6 +205,8 @@ def __init__(self, program: AllowedProgramTypes,
             sample_rate:
             waveforms: These waveforms are sampled and stored in _waveforms. If None the waveforms are extracted from
             loop
+            # voltage_resolution: voltage resolution for LinSpaceProgram, i.e. 2**(-16) for 16 bit AWG
+            program_type: type of program from _ProgramType, determined by the ProgramBuilder used.
         """
         assert len(channels) == len(amplitudes) == len(offsets) == len(voltage_transformations)
 
@@ -218,8 +221,11 @@ def __init__(self, program: AllowedProgramTypes,
         self._program_type = program_type
         self._program = program
 
+        # self._voltage_resolution = voltage_resolution
+
         if program_type == _ProgramType.Linspace:
-            self._transformed_commands = self._transform_linspace_commands(to_increment_commands(program))
+            #!!! the voltage resolution may not be adequately represented if voltage transformations are not None?
+            self._transformed_commands = self._transform_linspace_commands(to_increment_commands(program,))
 
         if waveforms is None:
             if program_type is _ProgramType.Loop:
@@ -267,20 +273,30 @@ def _channel_transformations(self) -> Mapping[ChannelID, ChannelTransformation]:
 
     def _transform_linspace_commands(self, command_list: List[Command]) -> List[Command]:
         # all commands = Union[Increment, Set, LoopLabel, LoopJmp, Wait, Play]
-        trafos_by_channel_idx = list(self._channel_transformations().values())
-
+        # TODO: voltage resolution
+
+        # trafos_by_channel_idx = list(self._channel_transformations().values())
+        # increment_domains_to_transform = {DepDomain.VOLTAGE, DepDomain.WF_SCALE, DepDomain.WF_OFFSET}
+
         for command in command_list:
             if isinstance(command, (LoopLabel, LoopJmp, Play, Wait)):
                 # play is handled by transforming the sampled waveform
                 continue
             elif isinstance(command, Increment):
-                ch_trafo = trafos_by_channel_idx[command.channel]
+                if command.dependency_key.domain is not DepDomain.VOLTAGE:
+                    #for sweeps of wf-scale and wf-offset, the channel amplitudes/offsets are already considered in the wf sampling.
+                    continue
+                ch_trafo = self._channel_transformations()[command.channel]
                 if ch_trafo.voltage_transformation:
                     raise RuntimeError("Cannot apply a voltage transformation to a linspace increment command")
                 command.value /= ch_trafo.amplitude
             elif isinstance(command, LSPSet):
-                ch_trafo = trafos_by_channel_idx[command.channel]
+                if command.key.domain is not DepDomain.VOLTAGE:
+                    #for sweeps of wf-scale and wf-offset, the channel amplitudes/offsets are already considered in the wf sampling.
+                    continue
+                ch_trafo = self._channel_transformations()[command.channel]
                 if ch_trafo.voltage_transformation:
+                    # for the case of swept parameters, this is defaulted to identity
                     command.value = float(ch_trafo.voltage_transformation(command.value))
                 command.value -= ch_trafo.offset
                 command.value /= ch_trafo.amplitude

qupulse/program/__init__.py

@@ -1,101 +1,12 @@
-import contextlib
-from abc import ABC, abstractmethod
-from dataclasses import dataclass
 from typing import Optional, Union, Sequence, ContextManager, Mapping, Tuple, Generic, TypeVar, Iterable, Dict
-from numbers import Real, Number
-
-import numpy as np
+from typing import Protocol, runtime_checkable
 
 from qupulse._program.waveforms import Waveform
-from qupulse.utils.types import MeasurementWindow, TimeType, FrozenMapping
+from qupulse.utils.types import MeasurementWindow, TimeType
 from qupulse._program.volatile import VolatileRepetitionCount
 from qupulse.parameter_scope import Scope
-from qupulse.expressions import sympy as sym_expr, Expression
-from qupulse.utils.sympy import _lambdify_modules
-
-from typing import Protocol, runtime_checkable
-
-
-NumVal = TypeVar('NumVal', bound=Real)
-
-
-@dataclass
-class SimpleExpression(Generic[NumVal]):
-    """This is a potential hardware evaluable expression of the form
-
-    C + C1*R1 + C2*R2 + ...
-    where R1, R2, ... are potential runtime parameters.
-
-    The main use case is the expression of for loop dependent variables where the Rs are loop indices. There the
-    expressions can be calculated via simple increments.
-    """
-
-    base: NumVal
-    offsets: Mapping[str, NumVal]
-
-    def __post_init__(self):
-        assert isinstance(self.offsets, Mapping)
-
-    def value(self, scope: Mapping[str, NumVal]) -> NumVal:
-        value = self.base
-        for name, factor in self.offsets:
-            value += scope[name] * factor
-        return value
-
-    def __add__(self, other):
-        if isinstance(other, (float, int, TimeType)):
-            return SimpleExpression(self.base + other, self.offsets)
-
-        if type(other) == type(self):
-            offsets = self.offsets.copy()
-            for name, value in other.offsets.items():
-                offsets[name] = value + offsets.get(name, 0)
-            return SimpleExpression(self.base + other.base, offsets)
-
-        return NotImplemented
-
-    def __radd__(self, other):
-        return self.__add__(other)
-
-    def __sub__(self, other):
-        return self.__add__(-other)
-
-    def __rsub__(self, other):
-        (-self).__add__(other)
-
-    def __neg__(self):
-        return SimpleExpression(-self.base, {name: -value for name, value in self.offsets.items()})
-
-    def __mul__(self, other: NumVal):
-        if isinstance(other, (float, int, TimeType)):
-            return SimpleExpression(self.base * other, {name: other * value for name, value in self.offsets.items()})
-
-        return NotImplemented
-
-    def __rmul__(self, other):
-        return self.__mul__(other)
-
-    def __truediv__(self, other):
-        inv = 1 / other
-        return self.__mul__(inv)
-
-    @property
-    def free_symbols(self):
-        return ()
-
-    def _sympy_(self):
-        return self
-
-    def replace(self, r, s):
-        return self
-
-    def evaluate_in_scope_(self, *args, **kwargs):
-        # TODO: remove. It is currently required to avoid nesting this class in an expression for the MappedScope
-        # We can maybe replace is with a HardwareScope or something along those lines
-        return self
-
-
-_lambdify_modules.append({'SimpleExpression': SimpleExpression})
+from qupulse.expressions import sympy as sym_expr
+from qupulse.expressions.simple import SimpleExpression
 
 
 RepetitionCount = Union[int, VolatileRepetitionCount, SimpleExpression[int]]