comparison VectorConversion.cpp @ 43:36cc53aad853

Test output values a bit; fix input conversion from int

 /// floating point numbers (TODO: check numpy.float128)
 float 
 VectorConversion::PyValue_To_Float(PyObject* pyValue) const
 {
     // convert float
-    if (pyValue && PyFloat_Check(pyValue)) 
-        //TODO: check for limits here (same on most systems)
+    if (pyValue && PyFloat_Check(pyValue)) {
         return (float) PyFloat_AS_DOUBLE(pyValue);
-	
-    if (pyValue == NULL)
-    {
+    }
+
+    // convert long
+    if (pyValue && PyLong_Check(pyValue)) {
+        return (float) PyLong_AsDouble(pyValue);
+    }
+
+    // convert int
+    if (pyValue && PyInt_Check(pyValue)) {
+        return (float) PyInt_AsLong(pyValue);
+    }
+
+    if (pyValue == NULL) {
         setValueError("Error while converting object " + PyValue_Get_TypeName(pyValue) + " to float. ");
         return 0.0;		
     }
 		
-    setValueError("Conversion error: object" + PyValue_Get_TypeName(pyValue) +" is not float.");
+    setValueError("Conversion error: object" + PyValue_Get_TypeName(pyValue) +" is not float, int, or long.");
     return 0.0;
 }
 
 vector<float> 
 VectorConversion::PyValue_To_FloatVector (PyObject *pyValue) const