From 0d845cf9663d08063023ddd7122815b2d1600848 Mon Sep 17 00:00:00 2001 From: jowr Date: Fri, 6 Jun 2014 15:29:41 +0200 Subject: [PATCH] moved tests to catch --- src/MatrixMath.cpp | 79 +++++++++++++++++++++++++++++++++++++++++ src/Tests/eigenTest.cpp | 77 --------------------------------------- 2 files changed, 79 insertions(+), 77 deletions(-) delete mode 100644 src/Tests/eigenTest.cpp diff --git a/src/MatrixMath.cpp b/src/MatrixMath.cpp index 5636c58d..24eb5ef5 100644 --- a/src/MatrixMath.cpp +++ b/src/MatrixMath.cpp @@ -39,3 +39,82 @@ TEST_CASE("Internal consistency checks and example use cases for MatrixMath.h"," } #endif /* CATCH_ENABLED */ + + +//#include +//#include +////using namespace Eigen; +////using namespace std; +// +//#include +//#include +//#include +// +//int main() +//{ +//Eigen::Vector4d roots = Eigen::Vector4d::Random(); +//std::cout << "Roots: " << roots.transpose() << std::endl; +//Eigen::Matrix polynomial; +//Eigen::roots_to_monicPolynomial( roots, polynomial ); +//std::cout << "Polynomial: "; +//for( int i=0; i<4; ++i ){ std::cout << polynomial[i] << ".x^" << i << "+ "; } +//std::cout << polynomial[4] << ".x^4" << std::endl; +//Eigen::Vector4d evaluation; +//for( int i=0; i<4; ++i ){ +//evaluation[i] = Eigen::poly_eval( polynomial, roots[i] ); } +//std::cout << "Evaluation of the polynomial at the roots: " << evaluation.transpose() << std::endl; +//std::cout << std::endl; +//// +////Eigen::MatrixXd coeffs = Eigen::MatrixXd::Random(5,1); +////Eigen::MatrixXd input = Eigen::MatrixXd::Random(2,1)*1e0; +//Eigen::Vector4d coeffs = Eigen::Vector4d::Random()*1e2; +//double input = 1.9e0; +//std::cout << "Coeffs: " << std::endl << coeffs.transpose() << std::endl; +//double eval = Eigen::poly_eval( coeffs, input); +//std::cout << "Evaluation of the polynomial at " << input << std::endl; +//std::cout << eval << std::endl; +// +//double vec0 = 0.1; +//std::vector vec1(2,0.44); +//std::vector< std::vector > vec2; +//vec2.push_back(std::vector(2,0.2)); +//vec2.push_back(std::vector(2,0.3)); +// +//std::cout << CoolProp::vec_to_string(vec0) << std::endl; +//std::cout << CoolProp::vec_to_string(vec1) << std::endl; +//std::cout << CoolProp::vec_to_string(vec2) << std::endl; +// +//Eigen::Matrix mat; +//mat.setConstant(2,2,0.25); +//std::vector< std::vector > vec; +// +//CoolProp::convert(mat, vec); +//std::cout << CoolProp::vec_to_string(vec) << std::endl; +// +////Eigen::Matrix mat; +////mat.resize(6,2); +// +//Eigen::Matrix mat2; +//CoolProp::convert(vec2, mat2); +//CoolProp::convert(mat2, vec); +//std::cout << CoolProp::vec_to_string(vec) << std::endl; +// +//Eigen::Matrix mat1; +//CoolProp::convert(vec1, mat1); +//std::vector vec3; +//CoolProp::convert(mat1, vec); +//std::cout << CoolProp::vec_to_string(vec) << std::endl; +// +////std::vector< std::vector > vec(vec2); +////CoolProp::convert(mat,vec); +// +////std::cout << CoolProp::vec_to_string() << std::endl; +// +////Eigen::Matrix2d mat2 = CoolProp::convert(vec2); +// +////Eigen::MatrixXd mat2(10,10); +////CoolProp::convert(vec2, mat2); +// +////std::cout << CoolProp::vec_to_string(CoolProp::convert(mat2)) << std::endl; +// +//} diff --git a/src/Tests/eigenTest.cpp b/src/Tests/eigenTest.cpp deleted file mode 100644 index ec211b7d..00000000 --- a/src/Tests/eigenTest.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include -#include -//using namespace Eigen; -//using namespace std; - -#include -#include -#include - -int main() -{ -Eigen::Vector4d roots = Eigen::Vector4d::Random(); -std::cout << "Roots: " << roots.transpose() << std::endl; -Eigen::Matrix polynomial; -Eigen::roots_to_monicPolynomial( roots, polynomial ); -std::cout << "Polynomial: "; -for( int i=0; i<4; ++i ){ std::cout << polynomial[i] << ".x^" << i << "+ "; } -std::cout << polynomial[4] << ".x^4" << std::endl; -Eigen::Vector4d evaluation; -for( int i=0; i<4; ++i ){ -evaluation[i] = Eigen::poly_eval( polynomial, roots[i] ); } -std::cout << "Evaluation of the polynomial at the roots: " << evaluation.transpose() << std::endl; -std::cout << std::endl; -// -//Eigen::MatrixXd coeffs = Eigen::MatrixXd::Random(5,1); -//Eigen::MatrixXd input = Eigen::MatrixXd::Random(2,1)*1e0; -Eigen::Vector4d coeffs = Eigen::Vector4d::Random()*1e2; -double input = 1.9e0; -std::cout << "Coeffs: " << std::endl << coeffs.transpose() << std::endl; -double eval = Eigen::poly_eval( coeffs, input); -std::cout << "Evaluation of the polynomial at " << input << std::endl; -std::cout << eval << std::endl; - -double vec0 = 0.1; -std::vector vec1(2,0.44); -std::vector< std::vector > vec2; -vec2.push_back(std::vector(2,0.2)); -vec2.push_back(std::vector(2,0.3)); - -std::cout << CoolProp::vec_to_string(vec0) << std::endl; -std::cout << CoolProp::vec_to_string(vec1) << std::endl; -std::cout << CoolProp::vec_to_string(vec2) << std::endl; - -Eigen::Matrix mat; -mat.setConstant(2,2,0.25); -std::vector< std::vector > vec; - -CoolProp::convert(mat, vec); -std::cout << CoolProp::vec_to_string(vec) << std::endl; - -//Eigen::Matrix mat; -//mat.resize(6,2); - -Eigen::Matrix mat2; -CoolProp::convert(vec2, mat2); -CoolProp::convert(mat2, vec); -std::cout << CoolProp::vec_to_string(vec) << std::endl; - -Eigen::Matrix mat1; -CoolProp::convert(vec1, mat1); -std::vector vec3; -CoolProp::convert(mat1, vec); -std::cout << CoolProp::vec_to_string(vec) << std::endl; - -//std::vector< std::vector > vec(vec2); -//CoolProp::convert(mat,vec); - -//std::cout << CoolProp::vec_to_string() << std::endl; - -//Eigen::Matrix2d mat2 = CoolProp::convert(vec2); - -//Eigen::MatrixXd mat2(10,10); -//CoolProp::convert(vec2, mat2); - -//std::cout << CoolProp::vec_to_string(CoolProp::convert(mat2)) << std::endl; - -}