moved tests to catch

src/MatrixMath.cpp

@@ -39,3 +39,82 @@ TEST_CASE("Internal consistency checks and example use cases for MatrixMath.h","
 }
 
 #endif /* CATCH_ENABLED */
+
+
+//#include <unsupported/Eigen/Polynomials>
+//#include <iostream>
+////using namespace Eigen;
+////using namespace std;
+//
+//#include <vector>
+//#include <string>
+//#include <MatrixMath.h>
+//
+//int main()
+//{
+//Eigen::Vector4d roots = Eigen::Vector4d::Random();
+//std::cout << "Roots: " << roots.transpose() << std::endl;
+//Eigen::Matrix<double,5,1> 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<double> vec1(2,0.44);
+//std::vector< std::vector<double> > vec2;
+//vec2.push_back(std::vector<double>(2,0.2));
+//vec2.push_back(std::vector<double>(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<double,2,2> mat;
+//mat.setConstant(2,2,0.25);
+//std::vector< std::vector<double> > vec;
+//
+//CoolProp::convert(mat, vec);
+//std::cout << CoolProp::vec_to_string(vec) << std::endl;
+//
+////Eigen::Matrix<double,Eigen::Dynamic,Eigen::Dynamic> mat;
+////mat.resize(6,2);
+//
+//Eigen::Matrix<double,2,2> mat2;
+//CoolProp::convert(vec2, mat2);
+//CoolProp::convert(mat2, vec);
+//std::cout << CoolProp::vec_to_string(vec) << std::endl;
+//
+//Eigen::Matrix<double,2,1> mat1;
+//CoolProp::convert(vec1, mat1);
+//std::vector<double> vec3;
+//CoolProp::convert(mat1, vec);
+//std::cout << CoolProp::vec_to_string(vec) << std::endl;
+//
+////std::vector< std::vector<double> > 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;
+//
+//}

src/Tests/eigenTest.cpp

@@ -1,77 +0,0 @@
-#include <unsupported/Eigen/Polynomials>
-#include <iostream>
-//using namespace Eigen;
-//using namespace std;
-
-#include <vector>
-#include <string>
-#include <MatrixMath.h>
-
-int main()
-{
-Eigen::Vector4d roots = Eigen::Vector4d::Random();
-std::cout << "Roots: " << roots.transpose() << std::endl;
-Eigen::Matrix<double,5,1> 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<double> vec1(2,0.44);
-std::vector< std::vector<double> > vec2;
-vec2.push_back(std::vector<double>(2,0.2));
-vec2.push_back(std::vector<double>(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<double,2,2> mat;
-mat.setConstant(2,2,0.25);
-std::vector< std::vector<double> > vec;
-
-CoolProp::convert(mat, vec);
-std::cout << CoolProp::vec_to_string(vec) << std::endl;
-
-//Eigen::Matrix<double,Eigen::Dynamic,Eigen::Dynamic> mat;
-//mat.resize(6,2);
-
-Eigen::Matrix<double,2,2> mat2;
-CoolProp::convert(vec2, mat2);
-CoolProp::convert(mat2, vec);
-std::cout << CoolProp::vec_to_string(vec) << std::endl;
-
-Eigen::Matrix<double,2,1> mat1;
-CoolProp::convert(vec1, mat1);
-std::vector<double> vec3;
-CoolProp::convert(mat1, vec);
-std::cout << CoolProp::vec_to_string(vec) << std::endl;
-
-//std::vector< std::vector<double> > 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;
-
-}