fix RValue conversion bug

gimli-org · Sep 27, 2018 · 172c31f · 172c31f
1 parent 8a2fa34
commit 172c31f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/python/custom_rvalue.cpp b/python/custom_rvalue.cpp
@@ -61,6 +61,13 @@ template < class ValueType > void * checkConvertibleSequenz(PyObject * obj){
                 __DC(obj << "\t Object is nd.array with dtype == bool* .. non convertable to GIMLI::IVector")    
                 return NULL;
             }
+        } else if (typeid(ValueType) == typeid(bool)){
+            PyArrayObject *arr = (PyArrayObject *)obj;
+
+            if (PyArray_TYPE(arr) != NPY_BOOL){
+                __DC(obj << "\t Object is nd.array with dtype != bool .. non convertable to GIMLI::BVector")    
+                return NULL;
+            }
         }
 
         return obj;

diff --git a/python/pygimli/testing/test_XVector.py b/python/pygimli/testing/test_XVector.py
@@ -96,6 +96,14 @@ def test_RVectorOP(self):
         self.assertEqual(sum(2.0 * v), 10)
         self.assertEqual(sum(1.0 / v), 5)
 
+
+        v2 = np.ones(len(v))* 0.01
+        # check pg * np
+        self.assertEqual(sum(v * v2), 5*0.01)
+        # check np * pg
+        self.assertEqual(sum(v2 * v), 5*0.01)
+
+
         #v = pg.CVector(5, 1.0)
 
         #self.assertEqual(sum(v + 1), 10)