diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 507f1456368a7bfa108e54a3fdddcac7e0054561..7ef9001d42e311edf83ebfaa43fc22964b5d86f3 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT ${EIGEN3_VERSION} VERSION_LESS "3.2.0") add_lib_unit_test(eigen_ref) endif() add_lib_unit_test(user_type) -add_lib_unit_test(vector) +add_lib_unit_test(std_vector) add_python_unit_test("py-matrix" "unittest/python/test_matrix.py" "unittest") add_python_unit_test("py-geometry" "unittest/python/test_geometry.py" diff --git a/unittest/python/test_std_vector.py b/unittest/python/test_std_vector.py index afa26000977a293baad0038b2da024c8b74b2c28..52fd4c0d3cb623d178831f60f12e0551c1147959 100644 --- a/unittest/python/test_std_vector.py +++ b/unittest/python/test_std_vector.py @@ -2,8 +2,8 @@ import numpy as np import eigenpy import inspect import pprint -import vector -from vector import printVectorOfMatrix, printVectorOf3x3, copyStdVector +import std_vector +from std_vector import printVectorOfMatrix, printVectorOf3x3, copyStdVector np.random.seed(0) @@ -43,8 +43,8 @@ assert isinstance(l4_copy, eigenpy.StdVec_MatrixXd) assert "StdVec_Mat3d" in printVectorOf3x3.__doc__ printVectorOf3x3(l4) -l4_copy2 = vector.copyStdVec_3x3(l4) -assert isinstance(l4_copy2, vector.StdVec_Mat3d) +l4_copy2 = std_vector.copyStdVec_3x3(l4) +assert isinstance(l4_copy2, std_vector.StdVec_Mat3d) def checkZero(l): @@ -54,21 +54,21 @@ def checkZero(l): print("Check setZero() works:") print("l1:") -vector.setZero(l1) +std_vector.setZero(l1) print(l1) checkZero(l1) print("-----------------") print("l2:") l2_py = l2.tolist() -vector.setZero(l2_py) +std_vector.setZero(l2_py) pprint.pprint(l2_py) checkZero(l2_py) print("-----------------") l3_copy = copyStdVector(l3) print("l3_std:") -vector.setZero(l3_copy) +std_vector.setZero(l3_copy) pprint.pprint(list(l3_copy)) checkZero(l3_copy) print("-----------------") diff --git a/unittest/vector.cpp b/unittest/std_vector.cpp similarity index 97% rename from unittest/vector.cpp rename to unittest/std_vector.cpp index b45f70d0496dfb1d1d78839bf170c27d92a96c33..a3679917a61916f761d0202755f935192cd2a442 100644 --- a/unittest/vector.cpp +++ b/unittest/std_vector.cpp @@ -28,7 +28,7 @@ void setZero(std::vector<MatType> &Ms) { } } -BOOST_PYTHON_MODULE(vector) { +BOOST_PYTHON_MODULE(std_vector) { namespace bp = boost::python; using namespace eigenpy;