Python binding bug fix (#107)

This revision includes:
* FdmMgpcgSolver3 binding fix
* Vector2D and Vector3F binding fix
* More unit tests

Author: doyubkim

src/python/fdm_mgpcg_solver.cpp

@@ -82,7 +82,7 @@ void addFdmMgpcgSolver3(py::module& m) {
                                R"pbdoc(
             The last residual after the MGPCG iterations.
             )pbdoc")
-        .def_property_readonly("sorFactor", &FdmMgpcgSolver2::sorFactor)
+        .def_property_readonly("sorFactor", &FdmMgpcgSolver3::sorFactor)
         .def_property_readonly("useRedBlackOrdering",
-                               &FdmMgpcgSolver2::useRedBlackOrdering);
+                               &FdmMgpcgSolver3::useRedBlackOrdering);
 }

src/python/vector.cpp

@@ -125,7 +125,7 @@ void addVector2F(pybind11::module& m) {
 void addVector2D(pybind11::module& m) {
     py::class_<Vector2D>(m, "Vector2D")
         // CTOR
-        .def("__init__", [](Vector2D instance, double x,
+        .def("__init__", [](Vector2D& instance, double x,
                             double y) { new (&instance) Vector2D(x, y); },
              R"pbdoc(
              Constructs Vector2D.
@@ -288,11 +288,11 @@ void addVector3F(pybind11::module& m) {
         .def("__setitem__",
              [](Vector3F& instance, size_t i, float val) { instance[i] = val; })
         .def("__add__",
-             [](const Vector3D& instance, py::object object) {
-                 if (py::isinstance<double>(object)) {
-                     return instance.add(object.cast<double>());
+             [](const Vector3F& instance, py::object object) {
+                 if (py::isinstance<float>(object)) {
+                     return instance.add(object.cast<float>());
                  } else {
-                     return instance.add(objectToVector3D(object));
+                     return instance.add(objectToVector3F(object));
                  }
              })
         .def("__sub__",

src/tests/python_tests/vector_tests.py

@@ -10,6 +10,135 @@
 import unittest
 
 
+class Vector2FTest(unittest.TestCase):
+    def testInit(self):
+        a = pyjet.Vector2F()
+        self.assertEqual(a.x, 0.0)
+        self.assertEqual(a.y, 0.0)
+        b = pyjet.Vector2F(1, 2)
+        self.assertEqual(b.x, 1.0)
+        self.assertEqual(b.y, 2.0)
+        c = pyjet.Vector2F(y=2, x=1)
+        self.assertEqual(c.x, 1.0)
+        self.assertEqual(c.y, 2.0)
+
+    def testGetters(self):
+        a = pyjet.Vector2F(1, 2)
+        self.assertEqual(a[0], 1)
+        self.assertEqual(a[1], 2)
+
+    def testSetters(self):
+        a = pyjet.Vector2F(1, 2)
+        a[0] = 4; a[1] = 5;
+        self.assertEqual(a[0], 4)
+        self.assertEqual(a[1], 5)
+
+    def testCalc(self):
+        a = pyjet.Vector2F(1, 2)
+        b = pyjet.Vector2F(4, 6)
+        c = a + b
+        self.assertEqual(c.x, 5.0)
+        self.assertEqual(c.y, 8.0)
+        c = a - b
+        self.assertEqual(c.x, -3.0)
+        self.assertEqual(c.y, -4.0)
+        c = a * b
+        self.assertEqual(c.x, 4.0)
+        self.assertEqual(c.y, 12.0)
+        c = a / b
+        self.assertAlmostEqual(c.x, 1.0 / 4.0)
+        self.assertAlmostEqual(c.y, 1.0 / 3.0)
+
+
+class Vector2DTest(unittest.TestCase):
+    def testInit(self):
+        a = pyjet.Vector2D()
+        self.assertEqual(a.x, 0.0)
+        self.assertEqual(a.y, 0.0)
+        b = pyjet.Vector2D(1, 2)
+        self.assertEqual(b.x, 1.0)
+        self.assertEqual(b.y, 2.0)
+        c = pyjet.Vector2D(y=2, x=1)
+        self.assertEqual(c.x, 1.0)
+        self.assertEqual(c.y, 2.0)
+
+    def testGetters(self):
+        a = pyjet.Vector2D(1, 2)
+        self.assertEqual(a[0], 1)
+        self.assertEqual(a[1], 2)
+
+    def testSetters(self):
+        a = pyjet.Vector2D(1, 2)
+        a[0] = 4; a[1] = 5;
+        self.assertEqual(a[0], 4)
+        self.assertEqual(a[1], 5)
+
+    def testCalc(self):
+        a = pyjet.Vector2D(1, 2)
+        b = pyjet.Vector2D(4, 6)
+        c = a + b
+        self.assertEqual(c.x, 5.0)
+        self.assertEqual(c.y, 8.0)
+        c = a - b
+        self.assertEqual(c.x, -3.0)
+        self.assertEqual(c.y, -4.0)
+        c = a * b
+        self.assertEqual(c.x, 4.0)
+        self.assertEqual(c.y, 12.0)
+        c = a / b
+        self.assertAlmostEqual(c.x, 1.0 / 4.0)
+        self.assertAlmostEqual(c.y, 1.0 / 3.0)
+
+        
+class Vector3FTest(unittest.TestCase):
+    def testInit(self):
+        a = pyjet.Vector3F()
+        self.assertEqual(a.x, 0.0)
+        self.assertEqual(a.y, 0.0)
+        self.assertEqual(a.z, 0.0)
+        b = pyjet.Vector3F(1, 2, 3)
+        self.assertEqual(b.x, 1.0)
+        self.assertEqual(b.y, 2.0)
+        self.assertEqual(b.z, 3.0)
+        c = pyjet.Vector3F(y=2, x=1, z=3)
+        self.assertEqual(c.x, 1.0)
+        self.assertEqual(c.y, 2.0)
+        self.assertEqual(c.z, 3.0)
+
+    def testGetters(self):
+        a = pyjet.Vector3F(1, 2, 3)
+        self.assertEqual(a[0], 1)
+        self.assertEqual(a[1], 2)
+        self.assertEqual(a[2], 3)
+
+    def testSetters(self):
+        a = pyjet.Vector3F(1, 2, 3)
+        a[0] = 4; a[1] = 5; a[2] = 6
+        self.assertEqual(a[0], 4)
+        self.assertEqual(a[1], 5)
+        self.assertEqual(a[2], 6)
+
+    def testCalc(self):
+        a = pyjet.Vector3F(1, 2, 3)
+        b = pyjet.Vector3F(4, 6, 8)
+        c = a + b
+        self.assertEqual(c.x, 5.0)
+        self.assertEqual(c.y, 8.0)
+        self.assertEqual(c.z, 11.0)
+        c = a - b
+        self.assertEqual(c.x, -3.0)
+        self.assertEqual(c.y, -4.0)
+        self.assertEqual(c.z, -5.0)
+        c = a * b
+        self.assertEqual(c.x, 4.0)
+        self.assertEqual(c.y, 12.0)
+        self.assertEqual(c.z, 24.0)
+        c = a / b
+        self.assertAlmostEqual(c.x, 1.0 / 4.0)
+        self.assertAlmostEqual(c.y, 1.0 / 3.0)
+        self.assertAlmostEqual(c.z, 3.0 / 8.0)
+
+
 class Vector3DTest(unittest.TestCase):
     def testInit(self):
         a = pyjet.Vector3D()
@@ -54,10 +183,9 @@ def testCalc(self):
         self.assertEqual(c.y, 12.0)
         self.assertEqual(c.z, 24.0)
         c = a / b
-        self.assertEqual(c.x, 1.0 / 4.0)
-        self.assertEqual(c.y, 1.0 / 3.0)
-        self.assertEqual(c.z, 3.0 / 8.0)
-
+        self.assertAlmostEqual(c.x, 1.0 / 4.0)
+        self.assertAlmostEqual(c.y, 1.0 / 3.0)
+        self.assertAlmostEqual(c.z, 3.0 / 8.0)
 
 def main():
     pyjet.Logging.mute()