Commit 46d52c70 authored by Richard Torenvliet's avatar Richard Torenvliet

Fix paths, tests should be run from tests directory to find the right data paths

parent b9c406a7
...@@ -95,7 +95,7 @@ LandmarkCollection<cv::Vec2f> read_pts_landmarks(std::string filename) ...@@ -95,7 +95,7 @@ LandmarkCollection<cv::Vec2f> read_pts_landmarks(std::string filename)
}; };
morphablemodel::MorphableModel loadTestModel() { morphablemodel::MorphableModel loadTestModel() {
return morphablemodel::load_model("share/sfm_shape_3448.bin"); return morphablemodel::load_model("../share/sfm_shape_3448.bin");
} }
/** /**
...@@ -154,11 +154,11 @@ inline float euclidean_distance(cv::Vec2f landmark, cv::Mat vertex_screen_coords ...@@ -154,11 +154,11 @@ inline float euclidean_distance(cv::Vec2f landmark, cv::Mat vertex_screen_coords
TEST_CASE("Test ortographic projection", "[projection]" ){ TEST_CASE("Test ortographic projection", "[projection]" ){
// ======== begin setup ============ // ======== begin setup ============
Mat image = cv::imread("tests/data/image_0010.png"); Mat image = cv::imread("data/image_0010.png");
LandmarkCollection<cv::Vec2f> landmarks; LandmarkCollection<cv::Vec2f> landmarks;
landmarks = read_pts_landmarks("tests/data/image_0010.pts"); landmarks = read_pts_landmarks("data/image_0010.pts");
core::LandmarkMapper landmark_mapper = core::LandmarkMapper("share/ibug2did.txt"); core::LandmarkMapper landmark_mapper = core::LandmarkMapper("../share/ibug2did.txt");
vector<Vec4f> model_points; // the points in the 3D shape model vector<Vec4f> model_points; // the points in the 3D shape model
vector<int> vertex_indices; // their vertex indices vector<int> vertex_indices; // their vertex indices
...@@ -170,6 +170,12 @@ TEST_CASE("Test ortographic projection", "[projection]" ){ ...@@ -170,6 +170,12 @@ TEST_CASE("Test ortographic projection", "[projection]" ){
fitting::ScaledOrthoProjectionParameters pose = fitting::estimate_orthographic_projection_linear( fitting::ScaledOrthoProjectionParameters pose = fitting::estimate_orthographic_projection_linear(
image_points, model_points, true, image.rows image_points, model_points, true, image.rows
); );
std::cout << glm::to_string(pose.R) << endl;
std::cout << pose.s << endl;
std::cout << pose.tx << endl;
std::cout << pose.ty << endl;
fitting::RenderingParameters rendering_params(pose, image.cols, image.rows); fitting::RenderingParameters rendering_params(pose, image.cols, image.rows);
// Estimate the shape coefficients by fitting the shape to the landmarks: // Estimate the shape coefficients by fitting the shape to the landmarks:
...@@ -205,18 +211,20 @@ TEST_CASE("Test ortographic projection", "[projection]" ){ ...@@ -205,18 +211,20 @@ TEST_CASE("Test ortographic projection", "[projection]" ){
mesh.vertices[vertex_idx].x, mesh.vertices[vertex_idx].x,
mesh.vertices[vertex_idx].y, mesh.vertices[vertex_idx].y,
mesh.vertices[vertex_idx].z, mesh.vertices[vertex_idx].z,
mesh.vertices[vertex_idx].w) mesh.vertices[vertex_idx].w
)
); );
// using euclidean distance here, but should look at other ways too. // using euclidean distance here, but should look at other ways too.
total_error.push_back(euclidean_distance(landmarks[i].coordinates, vertex_screen_coords)); float dist = euclidean_distance(landmarks[i].coordinates, vertex_screen_coords);
total_error.push_back(dist);
} }
// Caculate mean error and stddev. // Calculate mean error and stddev.
float accum = 0.0; float accum = 0.0;
float mean_error = std::accumulate(total_error.begin(), total_error.end(), 0) / landmarks.size(); float mean_error = std::accumulate(total_error.begin(), total_error.end(), 0) / landmarks.size();
// cacl. standardeviation // cacl. standard deviation
std::for_each (std::begin(total_error), std::end(total_error), [&](const float d) { std::for_each (std::begin(total_error), std::end(total_error), [&](const float d) {
accum += (d - mean_error) * (d - mean_error); accum += (d - mean_error) * (d - mean_error);
}); });
......
...@@ -49,8 +49,12 @@ target_link_libraries(edgestruct-csv-to-json ${Boost_LIBRARIES}) ...@@ -49,8 +49,12 @@ target_link_libraries(edgestruct-csv-to-json ${Boost_LIBRARIES})
add_executable(json-to-cereal-binary json-to-cereal-binary.cpp) add_executable(json-to-cereal-binary json-to-cereal-binary.cpp)
target_link_libraries(json-to-cereal-binary ${OpenCV_LIBS} ${Boost_LIBRARIES}) target_link_libraries(json-to-cereal-binary ${OpenCV_LIBS} ${Boost_LIBRARIES})
add_executable(accuracy-evaluation accuracy-evaluation.cpp)
target_link_libraries(accuracy-evaluation ${OpenCV_LIBS} ${Boost_LIBRARIES})
# install target: # install target:
install(TARGETS scm-to-cereal DESTINATION bin) install(TARGETS scm-to-cereal DESTINATION bin)
install(TARGETS bfm-binary-to-cereal DESTINATION bin) install(TARGETS bfm-binary-to-cereal DESTINATION bin)
install(TARGETS json-to-cereal-binary DESTINATION bin) install(TARGETS json-to-cereal-binary DESTINATION bin)
install(TARGETS edgestruct-csv-to-json DESTINATION bin) install(TARGETS edgestruct-csv-to-json DESTINATION bin)
install(TARGETS accuracy-evaluation DESTINATION bin)
Markdown is supported
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