Make it an error to pass string and value at the same time

pygae · Mar 24, 2020 · 019a426 · 019a426
1 parent 4e470ab
commit 019a426
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/clifford/_multivector.py b/clifford/_multivector.py
@@ -45,11 +45,14 @@ def __init__(self, layout, value=None, string=None, *, dtype: np.dtype = np.floa
 
         self.layout = layout
 
-        if value is None:
-            if string is None:
-                self.value = np.zeros((self.layout.gaDims,), dtype=dtype)
-            else:
-                self.value = layout.parse_multivector(string).value
+        if string is not None:
+            if value is not None:
+                raise TypeError("Cannot pass both string and value")
+            self.value = layout.parse_multivector(string).value
+
+        elif value is None:
+            self.value = np.zeros((self.layout.gaDims,), dtype=dtype)
+
         else:
             self.value = np.array(value)
             if self.value.shape != (self.layout.gaDims,):

diff --git a/clifford/test/test_clifford.py b/clifford/test/test_clifford.py
@@ -477,6 +477,14 @@ def test_meet(self, g3):
         assert equivalent_up_to_scale((b^c).meet(a), 1)
         assert equivalent_up_to_scale((a).meet(a), a)
 
+    def test_multivector_constructor(self, g3):
+        # either is ok
+        g3.MultiVector(string='e1')
+        g3.MultiVector(value=np.zeros(8))
+        # both together is illegal
+        with pytest.raises(TypeError):
+            g3.MultiVector(string='e1', value=np.zeros(8))
+
 
 class TestBasicConformal41:
     def test_metric(self, g4_1):