FYS3150/Project-4
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update testlib

Browse Source
This commit is contained in:
Cory Balaton 2023-10-31 20:10:56 +01:00
parent 865a3e4b47
commit f5404307e1
No known key found for this signature in database
GPG Key ID: 3E5FCEBFD80F432B
2 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/testlib.hpp
View File

@ -44,19 +44,55 @@
void m_assert(bool expr, std::string expr_str, std::string func, void m_assert(bool expr, std::string expr_str, std::string func,
std::string file, int line, std::string msg); std::string file, int line, std::string msg);
/** @brief Test if two armadillo vectors are close to each other. /** @brief Test if two armadillo matrices/vectors are close to each other.
* *
* @details This function takes in 2 vectors and checks if they are * @details This function takes in 2 matrices/vectors and checks if they are
* approximately equal to each other given a tolerance. * approximately equal to each other given a tolerance.
* *
* @param a Vector a * @param a Matrix/vector a
* @param b Vector b * @param b Matrix/vector b
* @param tol The tolerance * @param tol The tolerance
* *
* @return bool * @return bool
* */ * */
bool close_to(arma::vec &a, arma::vec &b, double tol = 1e-8); template <class T,
class = typename std::enable_if<std::is_arithmetic<T>::value>::type>
static bool close_to(arma::Mat<T> &a, arma::Mat<T> &b, double tol = 1e-8)
{
if (a.n_elem != b.n_elem) {
return false;
}
for (size_t i = 0; i < a.n_elem; i++) {
if (std::abs(a(i) - b(i)) >= tol) {
return false;
}
}
return true;
}
/** @brief Test if two armadillo matrices/vectors are equal.
*
* @details This function takes in 2 matrices/vectors and checks if they are
* equal to each other. This should only be used for integral types.
*
* @param a Matrix/vector a
* @param b Matrix/vector b
*
* @return bool
* */
template <class T,
class = typename std::enable_if<std::is_integral<T>::value>::type>
static bool is_equal(arma::Mat<T> &a, arma::Mat<T> &b)
{
for (size_t i = 0; i < a.n_elem; i++) {
if (!(a(i) == b(i))) {
return false;
}
}
return true;
}
/** @brief Test that all elements fulfill the condition. /** @brief Test that all elements fulfill the condition.
* *
* @param expr The boolean expression to apply to each element * @param expr The boolean expression to apply to each element

16
src/testlib.cpp
View File

@ -12,8 +12,6 @@
#include "testlib.hpp" #include "testlib.hpp"
#include <type_traits>
static void print_message(std::string msg) static void print_message(std::string msg)
{ {
if (msg.size() > 0) { if (msg.size() > 0) {
@ -42,17 +40,3 @@ void m_assert(bool expr, std::string expr_str, std::string f, std::string file,
abort(); abort();
} }
} }
bool close_to(arma::vec &a, arma::vec &b, double tol)
{
if (a.n_elem != b.n_elem) {
return false;
}
for (size_t i = 0; i < a.n_elem; i++) {
if (std::abs(a(i) - b(i)) >= tol) {
return false;
}
}
return true;
}