Skip to content
Snippets Groups Projects
Commit f4fd73e6 authored by JasonChmn's avatar JasonChmn
Browse files

Edit file name spline_python.cpp to curve_python.cpp, in test.py edit...

Edit file name spline_python.cpp to curve_python.cpp, in test.py edit TestSpline and test_spline to TestCurve and test_curve, edit all makefiles, make test 100% OK
parent 8ec1d970
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME}) ...@@ -3,7 +3,7 @@ STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
ADD_REQUIRED_DEPENDENCY("eigenpy") ADD_REQUIRED_DEPENDENCY("eigenpy")
# Define the wrapper library that wraps our library # Define the wrapper library that wraps our library
add_library( ${PY_NAME} SHARED spline_python.cpp ) add_library( ${PY_NAME} SHARED curve_python.cpp )
#~ target_link_libraries( centroidal_dynamics ${Boost_LIBRARIES} ${PROJECT_NAME} ) #~ target_link_libraries( centroidal_dynamics ${Boost_LIBRARIES} ${PROJECT_NAME} )
# don't prepend wrapper library name with lib # don't prepend wrapper library name with lib
set_target_properties( ${PY_NAME} PROPERTIES PREFIX "" ) set_target_properties( ${PY_NAME} PROPERTIES PREFIX "" )
...@@ -18,4 +18,4 @@ INSTALL( ...@@ -18,4 +18,4 @@ INSTALL(
TARGETS ${PY_NAME} DESTINATION ${PYTHON_SITELIB} TARGETS ${PY_NAME} DESTINATION ${PYTHON_SITELIB}
) )
ADD_PYTHON_UNIT_TEST("python-spline" "python/test/test.py" "python") ADD_PYTHON_UNIT_TEST("python-curve" "python/test/test.py" "python")
File moved
...@@ -9,8 +9,8 @@ from numpy.testing import assert_allclose ...@@ -9,8 +9,8 @@ from numpy.testing import assert_allclose
from curves import bezier3, bezier6, curve_constraints, exact_cubic, from_bezier, polynom, spline_deriv_constraint from curves import bezier3, bezier6, curve_constraints, exact_cubic, from_bezier, polynom, spline_deriv_constraint
class TestSpline(unittest.TestCase): class TestCurve(unittest.TestCase):
def test_spline(self): def test_curve(self):
waypoints = matrix([[1., 2., 3.], [4., 5., 6.]]).T waypoints = matrix([[1., 2., 3.], [4., 5., 6.]]).T
waypoints6 = matrix([[1., 2., 3., 7., 5., 5.], [4., 5., 6., 4., 5., 6.]]).T waypoints6 = matrix([[1., 2., 3., 7., 5., 5.], [4., 5., 6., 4., 5., 6.]]).T
time_waypoints = matrix([0., 1.]).T time_waypoints = matrix([0., 1.]).T
......
ADD_UNIT_TEST( ADD_UNIT_TEST(
spline_tests Main.cpp curve_tests Main.cpp
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment