comparison VectorConversion.cpp @ 48:0e0e18629917

Set parameters in bulk

   authorization.
 */
 
 #include <Python.h>
 
+#include "FloatConversion.h"
 #include "VectorConversion.h"
 
 #include <math.h>
 #include <float.h>
 

 
 /// floating point numbers (TODO: check numpy.float128)
 float 
 VectorConversion::PyValue_To_Float(PyObject* pyValue) const
 {
-    // convert float
-    if (pyValue && PyFloat_Check(pyValue)) {
-        return (float) PyFloat_AS_DOUBLE(pyValue);
-    }
-
-    // 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;		
-    }
-		
+    if (FloatConversion::check(pyValue)) {
+        return FloatConversion::convert(pyValue);
+    }
+
     setValueError("Conversion error: object" + PyValue_Get_TypeName(pyValue) +" is not float, int, or long.");
     return 0.0;
 }
 
 vector<float>