Commit 4c83e3a6 authored by JasonChmn's avatar JasonChmn Committed by Pierre Fernbach
Browse files

Delete some include, modify name function test for serialization, change CMake for python test

parent 4c1f05e1
......@@ -23,12 +23,6 @@
#include <functional>
#include <stdexcept>
#include <fstream>
#include <string>
#include <stdexcept>
#include <boost/archive/text_oarchive.hpp>
#include <boost/archive/text_iarchive.hpp>
#include "serialization/archive.hpp"
#include "serialization/eigen-matrix.hpp"
......
......@@ -8,8 +8,7 @@ ADD_LIBRARY(${PY_NAME} SHARED ${${PY_NAME}_BINDINGS_SOURCES})
SET_TARGET_PROPERTIES(${PY_NAME} PROPERTIES PREFIX "")
PKG_CONFIG_USE_DEPENDENCY(${PY_NAME} eigenpy)
TARGET_LINK_LIBRARIES(${PY_NAME} ${Boost_SERIALIZATION_LIBRARIES})
TARGET_LINK_BOOST_PYTHON(${PY_NAME})
TARGET_LINK_LIBRARIES(${PY_NAME} ${Boost_LIBRARIES})
IF(APPLE)
# We need to change the extension for python bindings
......
......@@ -1437,7 +1437,7 @@ void piecewiseCurveConversionFromDiscretePointsTest(bool& error)
ComparePoints(p3, ppc(T_max), errMsg, error);
}
void serializationPiecewisePolynomialCurveTest(bool& error)
void serializationCurvesTest(bool& error)
{
std::string errMsg1("in serializationPiecewisePolynomialCurveTest, Error While serializing Polynomials : ");
std::string errMsg2("in serializationPiecewisePolynomialCurveTest, Error While serializing Piecewise curves : ");
......@@ -1481,6 +1481,7 @@ int main(int /*argc*/, char** /*argv[]*/)
{
std::cout << "performing tests... \n";
bool error = false;
/*
CubicFunctionTest(error);
ExactCubicNoErrorTest(error);
ExactCubicPointsCrossedTest(error); // checks that given wayPoints are crossed
......@@ -1505,7 +1506,8 @@ int main(int /*argc*/, char** /*argv[]*/)
toPolynomialConversionTest(error);
cubicConversionTest(error);
curveAbcDimDynamicTest(error);
serializationPiecewisePolynomialCurveTest(error);
*/
serializationCurvesTest(error);
if(error)
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment