QuLab 2.3.0__tar.gz → 2.3.1__tar.gz

{qulab-2.3.0 → qulab-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.3.0
+Version: 2.3.1
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{qulab-2.3.0 → qulab-2.3.1}/QuLab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.3.0
+Version: 2.3.1
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{qulab-2.3.0 → qulab-2.3.1}/qulab/scan/expression.py

@@ -210,6 +210,16 @@ class Expression():
             return -self
         return BinaryExpression(other, self, operator.mul)
 
+    def __matmul__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(self, other, operator.matmul)
+
+    def __rmatmul__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(other, self, operator.matmul)
+
     def __truediv__(self, other):
         if isinstance(other, Expression):
             other = other.eval(_default_env)
@@ -226,6 +236,34 @@ class Expression():
             return 0
         return BinaryExpression(other, self, operator.truediv)
 
+    def __floordiv__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        if isinstance(other, ConstType) and other == 1:
+            return self
+        if isinstance(other, ConstType) and other == -1:
+            return -self
+        return BinaryExpression(self, other, operator.floordiv)
+
+    def __rfloordiv__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        if isinstance(other, ConstType) and other == 0:
+            return 0
+        return BinaryExpression(other, self, operator.floordiv)
+
+    def __mod__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        if isinstance(other, ConstType) and other == 1:
+            return 0
+        return BinaryExpression(self, other, operator.mod)
+
+    def __rmod__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(other, self, operator.mod)
+
     def __pow__(self, other):
         if isinstance(other, Expression):
             other = other.eval(_default_env)
@@ -248,6 +286,21 @@ class Expression():
     def __pos__(self):
         return UnaryExpression(self, operator.pos)
 
+    def __abs__(self):
+        return UnaryExpression(self, operator.abs)
+
+    def __not__(self):
+        return UnaryExpression(self, operator.not_)
+
+    def __inv__(self):
+        return UnaryExpression(self, operator.inv)
+
+    def __invert__(self):
+        return UnaryExpression(self, operator.invert)
+
+    def __index__(self):
+        return UnaryExpression(self, operator.index)
+
     def __eq__(self, other):
         if isinstance(other, Expression):
             other = other.eval(_default_env)
@@ -278,6 +331,56 @@ class Expression():
             other = other.eval(_default_env)
         return BinaryExpression(self, other, operator.ge)
 
+    def __and__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(self, other, operator.and_)
+
+    def __rand__(self, other):
+        if isinstance(other, Expression):
+            other
+        return BinaryExpression(other, self, operator.and_)
+
+    def __or__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(self, other, operator.or_)
+
+    def __ror__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(other, self, operator.or_)
+
+    def __lshift__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(self, other, operator.lshift)
+
+    def __rlshift__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(other, self, operator.lshift)
+
+    def __rshift__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(self, other, operator.rshift)
+
+    def __rrshift__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(other, self, operator.rshift)
+
+    def __xor__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(self, other, operator.xor)
+
+    def __rxor__(self, other):
+        if isinstance(other, Expression):
+            other = other.eval(_default_env)
+        return BinaryExpression(other, self, operator.xor)
+
     def __getitem__(self, other):
         if isinstance(other, Expression):
             other = other.eval(_default_env)
@@ -301,6 +404,9 @@ class Expression():
     def __round__(self, n=None):
         return self
 
+    def __bool__(self):
+        return True
+
     def eval(self, env):
         raise NotImplementedError
 

{qulab-2.3.0 → qulab-2.3.1}/qulab/scan/record.py

@@ -589,7 +589,9 @@ class Record():
         return record
 
     def __repr__(self):
-        return f"<Record: id={self.id} app={self.description['app']}, keys={self.keys()}>"
+        if self.is_remote_record() and not self._items:
+            self._items = {key: None for key in self.keys()}
+        return f"<Record: id={self.id} app={self.description['app']}, keys={self._items.keys()}>"
 
     # def _repr_html_(self):
     #     return f"""

{qulab-2.3.0 → qulab-2.3.1}/qulab/scan/space.py

@@ -104,14 +104,14 @@ def geomspace(start, stop, num=50, endpoint=True):
 
 class OptimizeSpace():
 
-    def __init__(self, optimizer: 'Optimizer', space, suggestions=None):
+    def __init__(self, optimizer: 'Optimizer', space, suggestion=None):
         self.optimizer = optimizer
         self.space = space
         self.name = None
-        if suggestions is not None and not isinstance(
-                suggestions, (list, tuple, np.ndarray)):
-            suggestions = [suggestions]
-        self.suggestions = suggestions
+        if suggestion is not None and not isinstance(
+                suggestion, (list, tuple, np.ndarray)):
+            suggestion = [suggestion]
+        self.suggestion = suggestion
 
     def __len__(self):
         return self.optimizer.maxiter
@@ -135,7 +135,7 @@ class Optimizer():
         self.level = level
         self.kwds = kwds
         self.minimize = minimize
-        self.suggestions = {}
+        self.suggestion = {}
 
     def create(self):
         opt = self.method(list(self.dimensions.values()), **self.kwds)
@@ -144,9 +144,9 @@ class Optimizer():
             while True:
                 yield space.rvs()[0]
 
-        if self.suggestions:
+        if self.suggestion:
             for suggestion in zip(*[
-                    self.suggestions.get(key, rvs(space))
+                    self.suggestion.get(key, rvs(space))
                     for key, space in self.dimensions.items()
             ]):
                 opt.suggest(*suggestion)
@@ -157,10 +157,10 @@ class Optimizer():
                     prior=None,
                     transform=None,
                     name=None,
-                    suggestions=None) -> OptimizeSpace:
+                    suggestion=None) -> OptimizeSpace:
         return OptimizeSpace(self,
                              Categorical(categories, prior, transform, name),
-                             suggestions)
+                             suggestion)
 
     def Integer(self,
                 low,
@@ -170,10 +170,10 @@ class Optimizer():
                 transform="normalize",
                 name=None,
                 dtype=np.int64,
-                suggestions=None) -> OptimizeSpace:
+                suggestion=None) -> OptimizeSpace:
         return OptimizeSpace(
             self, Integer(low, high, prior, base, transform, name, dtype),
-            suggestions)
+            suggestion)
 
     def Real(self,
              low,
@@ -183,10 +183,10 @@ class Optimizer():
              transform="normalize",
              name=None,
              dtype=float,
-             suggestions=None) -> OptimizeSpace:
+             suggestion=None) -> OptimizeSpace:
         return OptimizeSpace(
             self, Real(low, high, prior, base, transform, name, dtype),
-            suggestions)
+            suggestion)
 
     def __getstate__(self) -> dict:
         state = self.__dict__.copy()

qulab-2.3.1/qulab/version.py

@@ -0,0 +1 @@
+__version__ = "2.3.1"

qulab-2.3.0/qulab/version.py

@@ -1 +0,0 @@
-__version__ = "2.3.0"