github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-01 03:00:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

More testing, changed vector to string functions

Browse Source
This commit is contained in:
jowr
2014-06-06 01:03:35 +02:00
parent bdf92d95a9
commit 183c93ac3c
4 changed files with 122 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
include/MatrixMath.h
View File

@@ -20,17 +20,108 @@
template<size_t dimcount, typename T> struct VectorNd {
typedef std::vector< typename VectorNd<dimcount-1, T>::type > type;
};
//template<typename T> struct VectorNd<1,T> {
// typedef std::vector< T > type;
//};
template<typename T> struct VectorNd<0,T> {
typedef T type;
};
namespace CoolProp{
/// Templates for printing numbers, vectors and matrices
static const char* stdFmt = "%7.3f";
///Templates for turning vectors (1D-matrices) into strings
template<class T> std::string vec_to_string(const std::vector<T> &a, const char *fmt) {
if (a.size()<1) return std::string("");
std::stringstream out;
out << "[ " << format(fmt,a[0]);
for (size_t j = 1; j < a.size(); j++) {
out << ", " << format(fmt, a[j]);
}
out << " ]";
return out.str();
};
template<class T> std::string vec_to_string(const std::vector<T> &a) {
return vec_to_string(a, stdFmt);
};
/// Templates for turning numbers (0D-matrices) into strings
template<class T> std::string vec_to_string(const T &a, const char *fmt) {
std::vector<T> vec;
vec.push_back(a);
return vec_to_string(vec, fmt);
};
template<class T> std::string vec_to_string(const T &a) {
return vec_to_string(a, stdFmt);
};
///Templates for turning 2D-matrices into strings
template<class T> std::string vec_to_string(const std::vector<std::vector<T> > &A, const char *fmt) {
if (A.size()<1) return std::string("");
std::stringstream out;
out << "[ " << vec_to_string(A[0], fmt);
for (size_t j = 1; j < A.size(); j++) {
out << ", " << std::endl << " " << vec_to_string(A[j], fmt);
}
out << " ]";
return out.str();
};
template<class T> std::string vec_to_string(const std::vector<std::vector<T> > &A) {
return vec_to_string(A, stdFmt);
};
/// Template class for turning numbers (0D-matrices) into strings
//template<class T> std::string vec_to_string(const T &a){
// return vec_to_string(a, stdFmt);
// std::stringstream out;
// out << format("[ %7.3f ]",a);
// return out.str();
//};
//template<class T> std::string vec_to_string(const VectorNd<0, T> &a){
// return vec_to_string(a, stdFmt);
//};
//template<class T> std::string vec_to_string(const VectorNd<0, T> &a, const char *fmt) {
// VectorNd<1, T> vec;
// vec.push_back(a);
// return vec_to_string(vec, fmt);
//};
//
/////Template classes for turning vectors (1D-matrices) into strings
//template<class T> std::string vec_to_string(const VectorNd<1, T> &a) {
// return vec_to_string(a, stdFmt);
//};
//template<class T> std::string vec_to_string(const VectorNd<1, T> &a, const char *fmt) {
// if (a.size()<1) {
// return std::string("");
// } else {
// std::stringstream out;
// out << "[ ";
// out << format(fmt,a[0]);
// for (size_t j = 1; j < a.size(); j++) {
// out << ", ";
// out << format(fmt,a[j]);
// }
// out << " ]";
// return out.str();
// }
//};
//
/////Template classes for turning 2D-matrices into strings
//template<class T> std::string vec_to_string(const VectorNd<2, T> &A) {
// return vec_to_string(A, stdFmt);
//}
//template<class T> std::string vec_to_string(const VectorNd<2, T> &A, const char *fmt) {
// if (A.size()<1) return std::string("");
// std::stringstream out;
// out << "[ " << format(fmt,A[0]);
// for (size_t j = 1; j < A.size(); j++) {
// out << ", " << std::endl << " " << vec_to_string(A[j], fmt);
// }
// out << " ]";
// return out.str();
//}
///// Publish the linear algebra solver
//template<class T> std::vector<T> linsolve(std::vector<std::vector<T> > const& A, std::vector<T> const& b);
//template<class T> std::vector<std::vector<T> > linsolve(std::vector<std::vector<T> > const& A, std::vector<std::vector<T> > const& B);
@@ -418,104 +509,6 @@ template<class T> std::vector< std::vector<T> > invert(std::vector<std::vecto
};
/// Template classes
const char* stdFmt = "%7.3f";
/// Template class for turning numbers (0D-matrices) into strings
template<class T> std::string vec_to_string( T const& a, const char *fmt) {
//std::vector<T> vec;
//vec.push_back(a);
//return vec_to_string(vec, fmt);
std::stringstream out;
out << "[ " << format(fmt,a);
return out.str();
};
template<class T> std::string vec_to_string( T const& a){
return vec_to_string(a, stdFmt);
};
///Template classes for turning vectors (1D-matrices) into strings
template<class T> std::string vec_to_string( std::vector<T> const& a) {
return vec_to_string(a,stdFmt);
};
template<class T> std::string vec_to_string( std::vector<T> const& a, const char *fmt) {
if (a.size()<1) return std::string("");
std::stringstream out;
out << "[ " << format(fmt,a[0]);
for (size_t j = 1; j < a.size(); j++) {
out << ", " << format(fmt, a[j]);
}
out << " ]";
return out.str();
};
///Template classes for turning 2D-matrices into strings
template<class T> std::string vec_to_string(std::vector<std::vector<T> > const& A) {
return vec_to_string(A, stdFmt);
};
template<class T> std::string vec_to_string(std::vector<std::vector<T> > const& A, const char *fmt) {
if (A.size()<1) return std::string("");
std::stringstream out;
out << "[ " << format(fmt,A[0]);
for (size_t j = 1; j < A.size(); j++) {
out << ", " << std::endl << " " << vec_to_string(A[j], fmt);
}
out << " ]";
return out.str();
};
///// Template class for turning numbers (0D-matrices) into strings
////template<class T> std::string vec_to_string(const T &a){
//// return vec_to_string(a, stdFmt);
//// std::stringstream out;
//// out << format("[ %7.3f ]",a);
//// return out.str();
////};
////template<class T> std::string vec_to_string(const VectorNd<0, T> &a){
//// return vec_to_string(a, stdFmt);
////};
////template<class T> std::string vec_to_string(const VectorNd<0, T> &a, const char *fmt) {
//// VectorNd<1, T> vec;
//// vec.push_back(a);
//// return vec_to_string(vec, fmt);
////};
//
/////Template classes for turning vectors (1D-matrices) into strings
//template<class T> std::string vec_to_string(const VectorNd<1, T> &a) {
// return vec_to_string(a, stdFmt);
//};
//template<class T> std::string vec_to_string(const VectorNd<1, T> &a, const char *fmt) {
// if (a.size()<1) {
// return std::string("");
// } else {
// std::stringstream out;
// out << "[ ";
// out << format(fmt,a[0]);
// for (size_t j = 1; j < a.size(); j++) {
// out << ", ";
// out << format(fmt,a[j]);
// }
// out << " ]";
// return out.str();
// }
//};
//
/////Template classes for turning 2D-matrices into strings
//template<class T> std::string vec_to_string(const VectorNd<2, T> &A) {
// return vec_to_string(A, stdFmt);
//}
//template<class T> std::string vec_to_string(const VectorNd<2, T> &A, const char *fmt) {
// if (A.size()<1) return std::string("");
// std::stringstream out;
// out << "[ " << format(fmt,A[0]);
// for (size_t j = 1; j < A.size(); j++) {
// out << ", " << std::endl << " " << vec_to_string(A[j], fmt);
// }
// out << " ]";
// return out.str();
//}
}; /* namespace CoolProp */

4
include/PolyMath.h
View File

@@ -20,6 +20,8 @@ namespace CoolProp{
/// The base class for Polynomials
class BasePolynomial{
@@ -35,8 +37,6 @@ public:
* and checks the vector length against parameter n. */
bool checkCoefficients(const Eigen::VectorXd &coefficients, const unsigned int n);
bool checkCoefficients(const Eigen::MatrixXd &coefficients, const unsigned int rows, const unsigned int columns);
bool checkCoefficients(const vectorNd<1, double>::type &coefficients, const unsigned int n);
bool checkCoefficients(const vectorNd<2, double>::type &coefficients, const unsigned int rows, const unsigned int columns);
bool checkCoefficients(const std::vector<double> &coefficients, const unsigned int n);
bool checkCoefficients(const std::vector< std::vector<double> > &coefficients, const unsigned int rows, const unsigned int columns);

15
src/MatrixMath.cpp
View File

@@ -12,6 +12,21 @@
namespace CoolProp{
///*
//Owe a debt of gratitude to http://sole.ooz.ie/en - very clear treatment of GJ
//*/

12
src/Tests/eigenTest.cpp
View File

@@ -4,6 +4,7 @@
//using namespace std;
#include <vector>
#include <string>
#include <MatrixMath.h>
int main()
@@ -30,9 +31,14 @@ double eval = Eigen::poly_eval( coeffs, input);
std::cout << "Evaluation of the polynomial at " << input << std::endl;
std::cout << eval << std::endl;
//std::vector<double> vec(2,0.2);
//std::cout << CoolProp::vec_to_string(vec) << std::endl;
double vec0 = 0.1;
std::vector<double> vec1(2,0.2);
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(0.3) << std::endl;
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;
}