waveforms 1.9.4__tar.gz → 2.0.1__tar.gz

{waveforms-1.9.4/waveforms.egg-info → waveforms-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: waveforms
-Version: 1.9.4
+Version: 2.0.1
 Summary: Edit waveforms used in experiment
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>
@@ -20,27 +20,17 @@ Classifier: Topic :: Scientific/Engineering :: Interface Engine/Protocol Transla
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click>=7.1.2
 Requires-Dist: dill>=0.3.6
-Requires-Dist: GitPython>=3.1.14
-Requires-Dist: matplotlib>=3.7.2
 Requires-Dist: numpy>=1.13.3
 Requires-Dist: ply>=3.11
 Requires-Dist: scipy>=1.0.0
 Provides-Extra: full
-Requires-Dist: antlr4-python3-runtime==4.12.0; extra == "full"
-Requires-Dist: blinker>=1.4; extra == "full"
-Requires-Dist: cryptography>=3.4.7; extra == "full"
-Requires-Dist: matplotlib>=3.4.1; extra == "full"
 Requires-Dist: msgpack>=1.0.5; extra == "full"
-Requires-Dist: portalocker>=1.4.0; extra == "full"
-Requires-Dist: SQLAlchemy>=1.4.11; extra == "full"
-Requires-Dist: scikit-learn>=0.24.1; extra == "full"
-Requires-Dist: scikit-optimize>=0.8.1; extra == "full"
-Requires-Dist: tenacity>=8.2.2; extra == "full"
 Provides-Extra: test
 Requires-Dist: pytest>=7.4.0; extra == "test"
 Requires-Dist: pytest-asyncio>=0.21.1; extra == "test"

{waveforms-1.9.4 → waveforms-2.0.1}/pyproject.toml

@@ -26,13 +26,12 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 requires-python = ">= 3.10"
 dependencies = [
     "click>=7.1.2",
     "dill>=0.3.6",
-    "GitPython>=3.1.14",
-    "matplotlib>=3.7.2",
     "numpy>=1.13.3",
     "ply>=3.11",
     "scipy>=1.0.0"
@@ -41,16 +40,7 @@ dynamic = ["version"]
 
 [project.optional-dependencies]
 full = [
-    "antlr4-python3-runtime==4.12.0",
-    "blinker>=1.4",
-    "cryptography>=3.4.7",
-    "matplotlib>=3.4.1",
     "msgpack>=1.0.5",
-    "portalocker>=1.4.0",
-    "SQLAlchemy>=1.4.11",
-    "scikit-learn>=0.24.1",
-    "scikit-optimize>=0.8.1",
-    "tenacity>=8.2.2",
 ]
 test = [
     "pytest>=7.4.0",

{waveforms-1.9.4 → waveforms-2.0.1}/setup.py

@@ -20,8 +20,8 @@ def get_extensions():
     #from pathlib import Path
 
     extensions = [
-        Extension('waveforms.sys.net._kcp', ['src/kcp.c', 'src/ikcp.c'],
-                  include_dirs=['src']),
+        # Extension('waveforms.sys.net._kcp', ['src/kcp.c', 'src/ikcp.c'],
+        #           include_dirs=['src']),
         # Extension(
         #     'waveforms.math.npufunc',
         #     ['src/multi_type_logit.c'],

waveforms-2.0.1/waveforms/__main__.py

@@ -0,0 +1,16 @@
+import click
+
+
+@click.group()
+def main():
+    pass
+
+
+@main.command()
+def hello():
+    """Print hello world."""
+    click.echo('hello, world')
+
+
+if __name__ == '__main__':
+    main()

waveforms-2.0.1/waveforms/utils.py

@@ -0,0 +1,84 @@
+from itertools import repeat
+from typing import Optional, Sequence
+
+import numpy as np
+
+
+def getFTMatrix(fList: Sequence[float],
+                numOfPoints: int,
+                phaseList: Optional[Sequence[float]] = None,
+                weight: Optional[np.ndarray] = None,
+                sampleRate: float = 1e9) -> np.ndarray:
+    """
+    get a matrix for Fourier transform
+
+    Args:
+        fList (Sequence[float]): list of frequencies
+        numOfPoints (int): size of signal frame
+        phaseList (Optional[Sequence[float]], optional): list of phase. Defaults to None.
+        weight (Optional[np.ndarray], optional): weight or list of weight. Defaults to None.
+        sampleRate (float, optional): sample rate of signal. Defaults to 1e9.
+
+    Returns:
+        numpy.ndarray: exp matrix
+    
+    >>> shots, numOfPoints, sampleRate = 100, 1000, 1e9
+    >>> f1, f2 = -12.7e6, 32.8e6
+    >>> signal = np.random.randn(shots, numOfPoints)
+    >>> e = getFTMatrix([f1, f2], numOfPoints, sampleRate=sampleRate)
+    >>> ret = signal @ e
+    >>> ret.shape
+    (100, 2)
+    >>> t = np.arange(numOfPoints) / sampleRate
+    >>> signal = 0.8 * np.sin(2 * np.pi * f1 * t) + 0.2 * np.cos(2 * np.pi * f2 * t)
+    >>> signal @ e
+    array([-0.00766509-0.79518987j,  0.19531432+0.00207068j])
+    >>> spec = 2 * np.fft.fft(signal) / numOfPoints
+    >>> freq = np.fft.fftfreq(numOfPoints)
+    >>> e = getFTMatrix(freq, numOfPoints, sampleRate=1)
+    >>> np.allclose(spec, signal @ e)
+    True
+    """
+    e = []
+    t = np.linspace(0, numOfPoints / sampleRate, numOfPoints, endpoint=False)
+    if weight is None or len(weight) == 0:
+        weight = np.full(numOfPoints, 2 / numOfPoints)
+    if phaseList is None or len(phaseList) == 0:
+        phaseList = np.zeros_like(fList)
+    if weight.ndim == 1:
+        weightList = repeat(weight)
+    else:
+        weightList = weight
+    for f, phase, weight in zip(fList, phaseList, weightList):
+        e.append(weight * np.exp(-1j * (2 * np.pi * f * t + phase)))
+    return np.asarray(e).T
+
+
+def shift(signal: np.ndarray, delay: float, dt: float) -> np.ndarray:
+    """
+    delay a signal
+
+    Args:
+        signal (np.ndarray): input signal
+        delay (float): delayed time
+        dt (float): time step of signal samples
+
+    Returns:
+        np.ndarray: delayed signal
+    """
+    points = int(delay // dt)
+    delta = delay / dt - points
+
+    if delta > 0:
+        ker = np.array([0, 1 - delta, delta])
+        signal = np.convolve(signal, ker, mode='same')
+
+    if points == 0:
+        return signal
+
+    ret = np.zeros_like(signal)
+    if points < 0:
+        ret[:points] = signal[-points:]
+    else:
+        ret[points:] = signal[:-points]
+    return ret

{waveforms-1.9.4 → waveforms-2.0.1}/waveforms/version.py

@@ -1,2 +1,2 @@
 """Define version number here and read it from setup.py automatically"""
-__version__ = "1.9.4"
+__version__ = "2.0.1"

{waveforms-1.9.4 → waveforms-2.0.1}/waveforms/waveform.py

@@ -127,36 +127,38 @@ class Waveform:
         self.filters = None
         self.label = None
 
-    def _begin(self):
-        for i, s in enumerate(self.seq):
+    @staticmethod
+    def _begin(bounds, seq):
+        for i, s in enumerate(seq):
             if s is not _zero:
                 if i == 0:
                     return -inf
-                return self.bounds[i - 1]
+                return bounds[i - 1]
         return inf
 
-    def _end(self):
-        N = len(self.bounds)
-        for i, s in enumerate(self.seq[::-1]):
+    @staticmethod
+    def _end(bounds, seq):
+        N = len(bounds)
+        for i, s in enumerate(seq[::-1]):
             if s is not _zero:
                 if i == 0:
                     return inf
-                return self.bounds[N - i - 1]
+                return bounds[N - i - 1]
         return -inf
 
     @property
     def begin(self):
         if self.start is None:
-            return self._begin()
+            return self._begin(self.bounds, self.seq)
         else:
-            return max(self.start, self._begin())
+            return max(self.start, self._begin(self.bounds, self.seq))
 
     @property
     def end(self):
         if self.stop is None:
-            return self._end()
+            return self._end(self.bounds, self.seq)
         else:
-            return min(self.stop, self._end())
+            return min(self.stop, self._end(self.bounds, self.seq))
 
     def sample(self,
                sample_rate=None,
@@ -611,6 +613,34 @@ class WaveVStack(Waveform):
         self.label = None
         self.function_lib = None
 
+    def __begin(self):
+        if self.wlist:
+            v = [self._begin(bounds, seq) for bounds, seq in self.wlist]
+            return min(v)
+        else:
+            return -inf
+
+    def __end(self):
+        if self.wlist:
+            v = [self._end(bounds, seq) for bounds, seq in self.wlist]
+            return max(v)
+        else:
+            return inf
+
+    @property
+    def begin(self):
+        if self.start is None:
+            return self.__begin()
+        else:
+            return max(self.start, self.__begin())
+
+    @property
+    def end(self):
+        if self.stop is None:
+            return self.__end()
+        else:
+            return min(self.stop, self.__end())
+
     def __call__(self, x, frag=False, out=None, function_lib=None):
         assert frag is False, 'WaveVStack does not support frag mode'
         out = np.full_like(x, self.offset, dtype=complex)

{waveforms-1.9.4 → waveforms-2.0.1/waveforms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: waveforms
-Version: 1.9.4
+Version: 2.0.1
 Summary: Edit waveforms used in experiment
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>
@@ -20,27 +20,17 @@ Classifier: Topic :: Scientific/Engineering :: Interface Engine/Protocol Transla
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click>=7.1.2
 Requires-Dist: dill>=0.3.6
-Requires-Dist: GitPython>=3.1.14
-Requires-Dist: matplotlib>=3.7.2
 Requires-Dist: numpy>=1.13.3
 Requires-Dist: ply>=3.11
 Requires-Dist: scipy>=1.0.0
 Provides-Extra: full
-Requires-Dist: antlr4-python3-runtime==4.12.0; extra == "full"
-Requires-Dist: blinker>=1.4; extra == "full"
-Requires-Dist: cryptography>=3.4.7; extra == "full"
-Requires-Dist: matplotlib>=3.4.1; extra == "full"
 Requires-Dist: msgpack>=1.0.5; extra == "full"
-Requires-Dist: portalocker>=1.4.0; extra == "full"
-Requires-Dist: SQLAlchemy>=1.4.11; extra == "full"
-Requires-Dist: scikit-learn>=0.24.1; extra == "full"
-Requires-Dist: scikit-optimize>=0.8.1; extra == "full"
-Requires-Dist: tenacity>=8.2.2; extra == "full"
 Provides-Extra: test
 Requires-Dist: pytest>=7.4.0; extra == "test"
 Requires-Dist: pytest-asyncio>=0.21.1; extra == "test"

waveforms-2.0.1/waveforms.egg-info/SOURCES.txt

@@ -0,0 +1,24 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+setup.py
+src/waveform.h
+tests/test_multi_drag.py
+tests/test_waveform.py
+tests/test_wavevstack.py
+waveforms/__init__.py
+waveforms/__main__.py
+waveforms/_waveform.pyi
+waveforms/_waveform.pyx
+waveforms/multy_drag.py
+waveforms/utils.py
+waveforms/version.py
+waveforms/waveform.py
+waveforms/waveform_parser.py
+waveforms.egg-info/PKG-INFO
+waveforms.egg-info/SOURCES.txt
+waveforms.egg-info/dependency_links.txt
+waveforms.egg-info/entry_points.txt
+waveforms.egg-info/requires.txt
+waveforms.egg-info/top_level.txt

waveforms-2.0.1/waveforms.egg-info/requires.txt

@@ -0,0 +1,17 @@
+click>=7.1.2
+dill>=0.3.6
+numpy>=1.13.3
+ply>=3.11
+scipy>=1.0.0
+
+[docs]
+Sphinx
+sphinxcontrib-napoleon
+sphinxcontrib-zopeext
+
+[full]
+msgpack>=1.0.5
+
+[test]
+pytest>=7.4.0
+pytest-asyncio>=0.21.1