Skip to content

Commit

Permalink
[TEST][FIX] Fixed some missing using namespace in the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rlagneau committed May 27, 2024
1 parent 07705aa commit 13186d6
Show file tree
Hide file tree
Showing 20 changed files with 169 additions and 123 deletions.
2 changes: 1 addition & 1 deletion modules/core/include/visp3/core/vpMatrix.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#ifndef _vpMatrix_H_
#define _vpMatrix_H_

#include <visp3/core/vpConfig.h>
#if defined(ENABLE_VISP_NAMESPACE)
namespace VISP_NAMESPACE_NAME
{
Expand All @@ -57,7 +58,6 @@ class vpForceTwistMatrix;
#endif

#include <visp3/core/vpArray2D.h>
#include <visp3/core/vpConfig.h>
#include <visp3/core/vpException.h>
#include <visp3/core/vpForceTwistMatrix.h>
#include <visp3/core/vpHomogeneousMatrix.h>
Expand Down
12 changes: 6 additions & 6 deletions modules/core/test/image-with-dataset/testGaussianFilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,14 @@
*
*****************************************************************************/

#include <visp3/core/vpConfig.h>

#ifdef ENABLE_VISP_NAMESPACE
using namespace VISP_NAMESPACE_NAME;
#endif

/*!
\example testGaussianFilter.cpp
\brief Test Gaussian filter.
*/

#include <visp3/core/vpConfig.h>

#if defined(VISP_HAVE_SIMDLIB) && defined(VISP_HAVE_CATCH2) && (VISP_HAVE_DATASET_VERSION >= 0x030400)
#define CATCH_CONFIG_RUNNER
#include <catch.hpp>
Expand All @@ -53,6 +49,10 @@ using namespace VISP_NAMESPACE_NAME;
#include <visp3/core/vpIoTools.h>
#include <visp3/io/vpImageIo.h>

#ifdef ENABLE_VISP_NAMESPACE
using namespace VISP_NAMESPACE_NAME;
#endif

TEST_CASE("Test vpGaussianFilter (unsigned char)")
{
const std::string filepath = vpIoTools::createFilePath(vpIoTools::getViSPImagesDataPath(), "Klimt/Klimt.pgm");
Expand Down
74 changes: 37 additions & 37 deletions modules/core/test/math/testEigenConversion.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,23 @@ TEST_CASE("vpMatrix <--> Eigen::MatrixXd/Matrix3Xd conversion", "[eigen_conversi

{
Eigen::MatrixXd eigen_m;
vp::visp2eigen(visp_m, eigen_m);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_m, eigen_m);
std::cout << "Eigen MatrixXd:\n" << eigen_m << std::endl;

vpMatrix visp_m2;
vp::eigen2visp(eigen_m, visp_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m, visp_m2);
std::cout << "ViSP vpMatrix:\n" << visp_m2 << std::endl;

REQUIRE(visp_m == visp_m2);
std::cout << std::endl;
}
{
Eigen::Matrix3Xd eigen_m;
vp::visp2eigen(visp_m, eigen_m);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_m, eigen_m);
std::cout << "Eigen Matrix3Xd:\n" << eigen_m << std::endl;

vpMatrix visp_m2;
vp::eigen2visp(eigen_m, visp_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m, visp_m2);
std::cout << "ViSP vpMatrix:\n" << visp_m2 << std::endl;

REQUIRE(visp_m == visp_m2);
Expand All @@ -114,18 +114,18 @@ TEST_CASE("Eigen::MatrixXd <--> vpMatrix conversion", "[eigen_conversion]")
std::cout << "Eigen Matrix (row major: " << eigen_m.IsRowMajor << "):\n" << eigen_m << std::endl;

vpMatrix visp_m;
vp::eigen2visp(eigen_m, visp_m);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m, visp_m);
std::cout << "ViSP vpMatrix:\n" << visp_m << std::endl;

Eigen::MatrixXd eigen_m2;
vp::visp2eigen(visp_m, eigen_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_m, eigen_m2);
std::cout << "Eigen MatrixXd (row major: " << eigen_m2.IsRowMajor << "):\n" << eigen_m2 << std::endl;

vpMatrix visp_m2;
vp::eigen2visp(eigen_m2, visp_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m2, visp_m2);
REQUIRE(visp_m == visp_m2);
std::cout << std::endl;
}
}

TEST_CASE("Eigen::MatrixX4d <--> vpMatrix conversion", "[eigen_conversion]")
{
Expand All @@ -143,18 +143,18 @@ TEST_CASE("Eigen::MatrixX4d <--> vpMatrix conversion", "[eigen_conversion]")
std::cout << "Eigen MatrixX4d (row major: " << eigen_m.IsRowMajor << "):\n" << eigen_m << std::endl;

vpMatrix visp_m;
vp::eigen2visp(eigen_m, visp_m);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m, visp_m);
std::cout << "ViSP vpMatrix:\n" << visp_m << std::endl;

Eigen::MatrixX4d eigen_m2;
vp::visp2eigen(visp_m, eigen_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_m, eigen_m2);
std::cout << "Eigen MatrixX4d (row major: " << eigen_m2.IsRowMajor << "):\n" << eigen_m2 << std::endl;

vpMatrix visp_m2;
vp::eigen2visp(eigen_m2, visp_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m2, visp_m2);
REQUIRE(visp_m == visp_m2);
std::cout << std::endl;
}
}

TEST_CASE("Eigen::Matrix<double, Dynamic, Dynamic, RowMajor> <--> vpMatrix conversion", "[eigen_conversion]")
{
Expand All @@ -172,18 +172,18 @@ TEST_CASE("Eigen::Matrix<double, Dynamic, Dynamic, RowMajor> <--> vpMatrix conve
std::cout << "Eigen Matrix (RowMajor):\n" << eigen_m << std::endl;

vpMatrix visp_m;
vp::eigen2visp(eigen_m, visp_m);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m, visp_m);
std::cout << "ViSP vpMatrix:\n" << visp_m << std::endl;

Eigen::MatrixXd eigen_m2;
vp::visp2eigen(visp_m, eigen_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_m, eigen_m2);
std::cout << "Eigen MatrixXd (row major: " << eigen_m2.IsRowMajor << "):\n" << eigen_m2 << std::endl;

vpMatrix visp_m2;
vp::eigen2visp(eigen_m2, visp_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m2, visp_m2);
REQUIRE(visp_m == visp_m2);
std::cout << std::endl;
}
}

TEST_CASE("Eigen::Matrix<double, Dynamic, Dynamic, ColMajor> <--> vpMatrix conversion", "[eigen_conversion]")
{
Expand All @@ -201,28 +201,28 @@ TEST_CASE("Eigen::Matrix<double, Dynamic, Dynamic, ColMajor> <--> vpMatrix conve
std::cout << "Eigen Matrix (ColMajor):\n" << eigen_m << std::endl;

vpMatrix visp_m;
vp::eigen2visp(eigen_m, visp_m);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m, visp_m);
std::cout << "ViSP vpMatrix:\n" << visp_m << std::endl;

Eigen::MatrixXd eigen_m2;
vp::visp2eigen(visp_m, eigen_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_m, eigen_m2);
std::cout << "Eigen MatrixXd (row major: " << eigen_m2.IsRowMajor << "):\n" << eigen_m2 << std::endl;

vpMatrix visp_m2;
vp::eigen2visp(eigen_m2, visp_m2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_m2, visp_m2);
REQUIRE(visp_m == visp_m2);
std::cout << std::endl;
}
}

TEST_CASE("vpHomogeneousMatrix <--> Eigen::Matrix4d conversion", "[eigen_conversion]")
{
vpHomogeneousMatrix visp_cMo(0.1, 0.2, 0.3, 0.1, 0.2, 0.3);
Eigen::Matrix4d eigen_cMo;
vp::visp2eigen(visp_cMo, eigen_cMo);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_cMo, eigen_cMo);
std::cout << "Eigen Matrix4d cMo:\n" << eigen_cMo << std::endl;

vpHomogeneousMatrix visp_cMo2;
vp::eigen2visp(eigen_cMo, visp_cMo2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_cMo, visp_cMo2);
std::cout << "ViSP vpHomogeneousMatrix cMo:\n" << visp_cMo2 << std::endl;
REQUIRE(visp_cMo == visp_cMo2);
std::cout << std::endl;
Expand All @@ -232,12 +232,12 @@ TEST_CASE("vpHomogeneousMatrix <--> Eigen::Matrix4f + double casting conversion"
{
vpHomogeneousMatrix visp_cMo; // identity for float to double casting
Eigen::Matrix4d eigen_cMo_tmp;
vp::visp2eigen(visp_cMo, eigen_cMo_tmp);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_cMo, eigen_cMo_tmp);
Eigen::Matrix4f eigen_cMo = eigen_cMo_tmp.cast<float>();
std::cout << "Eigen Matrix4f cMo:\n" << eigen_cMo << std::endl;

vpHomogeneousMatrix visp_cMo2;
vp::eigen2visp(eigen_cMo.cast<double>(), visp_cMo2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_cMo.cast<double>(), visp_cMo2);
std::cout << "ViSP vpHomogeneousMatrix cMo:\n" << visp_cMo2 << std::endl;
REQUIRE(visp_cMo == visp_cMo2);
std::cout << std::endl;
Expand All @@ -247,11 +247,11 @@ TEST_CASE("vpQuaternionVector <--> Eigen::Quaternionf conversion", "[eigen_conve
{
vpQuaternionVector visp_quaternion(0, 1, 2, 3);
Eigen::Quaternionf eigen_quaternion;
vp::visp2eigen(visp_quaternion, eigen_quaternion);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_quaternion, eigen_quaternion);
std::cout << "Eigen quaternion: " << eigen_quaternion << std::endl;

vpQuaternionVector visp_quaternion2;
vp::eigen2visp(eigen_quaternion, visp_quaternion2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_quaternion, visp_quaternion2);
std::cout << "ViSP quaternion: " << visp_quaternion2.t() << std::endl;
REQUIRE(visp_quaternion == visp_quaternion2);
std::cout << std::endl;
Expand All @@ -261,11 +261,11 @@ TEST_CASE("vpThetaUVector <--> Eigen::AngleAxisf conversion", "[eigen_conversion
{
vpThetaUVector visp_thetau(0, 1, 2);
Eigen::AngleAxisf eigen_angle_axis;
vp::visp2eigen(visp_thetau, eigen_angle_axis);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_thetau, eigen_angle_axis);
std::cout << "Eigen AngleAxis: " << eigen_angle_axis << std::endl;

vpThetaUVector visp_thetau2;
vp::eigen2visp(eigen_angle_axis, visp_thetau2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_angle_axis, visp_thetau2);
std::cout << "ViSP AngleAxis: " << visp_thetau2.t() << std::endl;
REQUIRE(visp_thetau == visp_thetau2);
std::cout << std::endl;
Expand All @@ -276,11 +276,11 @@ TEST_CASE("vpColVector <--> Eigen::VectorXd conversion", "[eigen_conversion]")
vpColVector visp_col(4, 4);
visp_col = 10;
Eigen::VectorXd eigen_col;
vp::visp2eigen(visp_col, eigen_col);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_col, eigen_col);
std::cout << "Eigen VectorXd: " << eigen_col.transpose() << std::endl;

vpColVector visp_col2;
vp::eigen2visp(eigen_col, visp_col2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_col, visp_col2);
std::cout << "ViSP vpColVector: " << visp_col2.t() << std::endl;
REQUIRE(visp_col == visp_col2);
std::cout << std::endl;
Expand All @@ -291,11 +291,11 @@ TEST_CASE("vpRowVector <--> Eigen::RowVectorXd conversion", "[eigen_conversion]"
vpRowVector visp_row(4, 10);
visp_row = 10;
Eigen::RowVectorXd eigen_row;
vp::visp2eigen(visp_row, eigen_row);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_row, eigen_row);
std::cout << "Eigen RowVectorXd: " << eigen_row << std::endl;

vpRowVector visp_row2;
vp::eigen2visp(eigen_row, visp_row2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_row, visp_row2);
std::cout << "ViSP vpRowVector: " << visp_row2 << std::endl;
REQUIRE(visp_row == visp_row2);
std::cout << std::endl;
Expand All @@ -306,15 +306,15 @@ TEST_CASE("Eigen::RowVector4d <--> vpRowVector conversion", "[eigen_conversion]"
Eigen::RowVector4d eigen_row;
eigen_row << 9, 8, 7, 6;
vpRowVector visp_row;
vp::eigen2visp(eigen_row, visp_row);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_row, visp_row);
std::cout << "ViSP vpRowVector: " << visp_row << std::endl;

Eigen::RowVector4d eigen_row2;
vp::visp2eigen(visp_row, eigen_row2);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_row, eigen_row2);
std::cout << "Eigen RowVector4d: " << eigen_row2 << std::endl;

vpRowVector visp_row2;
vp::eigen2visp(eigen_row2, visp_row2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_row2, visp_row2);
REQUIRE(visp_row == visp_row2);
std::cout << std::endl;
}
Expand All @@ -324,11 +324,11 @@ TEST_CASE("vpRowVector <--> Eigen::RowVector4d conversion", "[eigen_conversion]"
vpRowVector visp_row(4, 10);
visp_row = 10;
Eigen::RowVector4d eigen_row;
vp::visp2eigen(visp_row, eigen_row);
VISP_EIGEN_CONVERSION_NAMESPACE::visp2eigen(visp_row, eigen_row);
std::cout << "Eigen RowVector4d: " << eigen_row << std::endl;

vpRowVector visp_row2;
vp::eigen2visp(eigen_row, visp_row2);
VISP_EIGEN_CONVERSION_NAMESPACE::eigen2visp(eigen_row, visp_row2);
std::cout << "ViSP vpRowVector: " << visp_row2 << std::endl;
REQUIRE(visp_row == visp_row2);
std::cout << std::endl;
Expand Down
8 changes: 5 additions & 3 deletions modules/imgproc/include/visp3/imgproc/vpContours.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,13 @@
#include <visp3/core/vpImage.h>
#include <visp3/core/vpPolygon.h>

#if defined(VISP_BUILD_DEPRECATED_FUNCTIONS)
namespace vp
#ifdef VISP_BUILD_DEPRECATED_FUNCTIONS
#define VISP_CONTOURS_NAMESPACE vp
#else
namespace VISP_NAMESPACE_NAME
#define VISP_CONTOURS_NAMESPACE VISP_NAMESPACE_NAME
#endif

namespace VISP_CONTOURS_NAMESPACE
{

/*!
Expand Down
12 changes: 6 additions & 6 deletions modules/imgproc/test/with-dataset/testAutoThreshold.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ int main(int argc, const char **argv)

// Huang
double t = vpTime::measureTimeMs();
double threshold = vp::autoThreshold(I_thresh, vp::AUTO_THRESHOLD_HUANG);
double threshold = VISP_IMGPROC_NAMESPACE::autoThreshold(I_thresh, VISP_IMGPROC_NAMESPACE::AUTO_THRESHOLD_HUANG);
t = vpTime::measureTimeMs() - t;
std::cout << "\nAutomatic thresholding (Huang): " << threshold << " ; t=" << t << " ms" << std::endl;

Expand All @@ -263,7 +263,7 @@ int main(int argc, const char **argv)
// Intermodes
I_thresh = I;
t = vpTime::measureTimeMs();
threshold = vp::autoThreshold(I_thresh, vp::AUTO_THRESHOLD_INTERMODES);
threshold = VISP_IMGPROC_NAMESPACE::autoThreshold(I_thresh, VISP_IMGPROC_NAMESPACE::AUTO_THRESHOLD_INTERMODES);
t = vpTime::measureTimeMs() - t;
std::cout << "\nAutomatic thresholding (Intermodes): " << threshold << " ; t=" << t << " ms" << std::endl;

Expand All @@ -274,7 +274,7 @@ int main(int argc, const char **argv)
// IsoData
I_thresh = I;
t = vpTime::measureTimeMs();
threshold = vp::autoThreshold(I_thresh, vp::AUTO_THRESHOLD_ISODATA);
threshold = VISP_IMGPROC_NAMESPACE::autoThreshold(I_thresh, VISP_IMGPROC_NAMESPACE::AUTO_THRESHOLD_ISODATA);
t = vpTime::measureTimeMs() - t;
std::cout << "\nAutomatic thresholding (IsoData): " << threshold << " ; t=" << t << " ms" << std::endl;

Expand All @@ -285,7 +285,7 @@ int main(int argc, const char **argv)
// Mean
I_thresh = I;
t = vpTime::measureTimeMs();
threshold = vp::autoThreshold(I_thresh, vp::AUTO_THRESHOLD_MEAN);
threshold = VISP_IMGPROC_NAMESPACE::autoThreshold(I_thresh, VISP_IMGPROC_NAMESPACE::AUTO_THRESHOLD_MEAN);
t = vpTime::measureTimeMs() - t;
std::cout << "\nAutomatic thresholding (Mean): " << threshold << " ; t=" << t << " ms" << std::endl;

Expand All @@ -296,7 +296,7 @@ int main(int argc, const char **argv)
// Otsu
I_thresh = I;
t = vpTime::measureTimeMs();
threshold = vp::autoThreshold(I_thresh, vp::AUTO_THRESHOLD_OTSU);
threshold = VISP_IMGPROC_NAMESPACE::autoThreshold(I_thresh, VISP_IMGPROC_NAMESPACE::AUTO_THRESHOLD_OTSU);
t = vpTime::measureTimeMs() - t;
std::cout << "\nAutomatic thresholding (Otsu): " << threshold << " ; t=" << t << " ms" << std::endl;

Expand All @@ -307,7 +307,7 @@ int main(int argc, const char **argv)
// Triangle
I_thresh = I;
t = vpTime::measureTimeMs();
threshold = vp::autoThreshold(I_thresh, vp::AUTO_THRESHOLD_TRIANGLE);
threshold = VISP_IMGPROC_NAMESPACE::autoThreshold(I_thresh, VISP_IMGPROC_NAMESPACE::AUTO_THRESHOLD_TRIANGLE);
t = vpTime::measureTimeMs() - t;
std::cout << "\nAutomatic thresholding (Triangle): " << threshold << " ; t=" << t << " ms" << std::endl;

Expand Down
4 changes: 2 additions & 2 deletions modules/imgproc/test/with-dataset/testConnectedComponents.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,15 @@ int main(int argc, const char **argv)
vpImage<int> labels_connex4;
int nbComponents = 0;
double t = vpTime::measureTimeMs();
vp::connectedComponents(I, labels_connex4, nbComponents, vpImageMorphology::CONNEXITY_4);
VISP_IMGPROC_NAMESPACE::connectedComponents(I, labels_connex4, nbComponents, vpImageMorphology::CONNEXITY_4);
t = vpTime::measureTimeMs() - t;
std::cout << "\n4-connexity connected components:" << std::endl;
std::cout << "Time: " << t << " ms" << std::endl;
std::cout << "nbComponents=" << nbComponents << std::endl;

vpImage<int> labels_connex8;
t = vpTime::measureTimeMs();
vp::connectedComponents(I, labels_connex8, nbComponents, vpImageMorphology::CONNEXITY_8);
VISP_IMGPROC_NAMESPACE::connectedComponents(I, labels_connex8, nbComponents, vpImageMorphology::CONNEXITY_8);
t = vpTime::measureTimeMs() - t;
std::cout << "\n8-connexity connected components:" << std::endl;
std::cout << "Time: " << t << " ms" << std::endl;
Expand Down
Loading

0 comments on commit 13186d6

Please sign in to comment.