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

Finally, some luck with the Matrix classes... C++ lessons learned.

Browse Source
This commit is contained in:
jowr
2014-06-06 18:39:33 +02:00
parent c2b06e301c
commit f4be09df63
5 changed files with 187 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/MatrixMath.h
View File

@@ -34,10 +34,10 @@ namespace CoolProp{
* it is still needed.
*/
/// @param coefficients matrix containing the ordered coefficients
template<class T, int R, int C> void convert(const Eigen::Matrix<T,R,C> &coefficients, std::vector<std::vector<T> > &result){
template<class T, typename Derived> void convert(const Eigen::MatrixBase<Derived> &coefficients, std::vector<std::vector<T> > &result){
// Eigen uses columns as major axis, this might be faster than the row iteration.
// However, the 2D vector stores things differently, no idea what is faster...
//size_t nRows = coefficients.rows(), nCols = coefficients.cols();
size_t R = coefficients.rows(), C = coefficients.cols();
//std::vector<std::vector<T> > result(R, std::vector<T>(C, 0));
result.resize(R, std::vector<T>(C, 0)); // extends vector if necessary
for (size_t i = 0; i < R; ++i) {
@@ -48,8 +48,9 @@ template<class T, int R, int C> void convert(const Eigen::Matrix<T,R,C> &coeffic
}
}
/// @param coefficients matrix containing the ordered coefficients
template <class T, int R, int C> void convert(const std::vector<std::vector<T> > &coefficients, Eigen::Matrix<T,R,C> &result){
template <class T, typename Derived> void convert(const std::vector<std::vector<T> > &coefficients, Eigen::MatrixBase<Derived> &result){
size_t nRows = num_rows(coefficients), nCols = num_cols(coefficients);
size_t R = result.rows(), C = result.cols();
if (nRows!=R) throw ValueError(format("You have to provide matrices with the same number of rows: %d is not %d. ",nRows,R));
if (nCols!=C) throw ValueError(format("You have to provide matrices with the same number of columns: %d is not %d. ",nCols,C));
for (size_t i = 0; i < nCols; ++i) {
@@ -60,15 +61,17 @@ template <class T, int R, int C> void convert(const std::vector<std::vector<T> >
}
/// @param coefficients matrix containing the ordered coefficients
template<class T, int R> void convert(const Eigen::Matrix<T,R,1> &coefficients, std::vector<T> &result){
template<class T, typename Derived> void convert(const Eigen::MatrixBase<Derived> &coefficients, std::vector<T> &result){
size_t R = result.rows();
result.resize(R, 0); // extends vector if necessary
for (size_t i = 0; i < R; ++i) {
result[i] = coefficients(i,0);
}
}
/// @param coefficients matrix containing the ordered coefficients
template <class T, int R> void convert(const std::vector<T> &coefficients, Eigen::Matrix<T,R,1> &result){
template <class T, typename Derived> void convert(const std::vector<T> &coefficients, Eigen::MatrixBase<Derived> &result){
size_t nRows = num_rows(coefficients);
size_t R = result.rows();
if (nRows!=R) throw ValueError(format("You have to provide matrices with the same number of rows: %d is not %d. ",nRows,R));
for (size_t i = 0; i < nRows; ++i) {
result(i,0) = coefficients[i];

6
include/PolyMath.h
View File

@@ -100,7 +100,7 @@ private:
public:
/// Constructors
Polynomial2D();
Polynomial2D(){};
Polynomial2D(const Eigen::MatrixXd &coefficients){
this->setCoefficients(coefficients);
}
@@ -114,8 +114,8 @@ public:
public:
/// Set the coefficient matrix.
/// @param coefficients matrix containing the ordered coefficients
bool setCoefficients(const Eigen::MatrixXd &coefficients);
bool setCoefficients(const std::vector<std::vector<double> > &coefficients);
void setCoefficients(const Eigen::MatrixXd &coefficients);
void setCoefficients(const std::vector<std::vector<double> > &coefficients);
/// Basic checks for coefficient vectors.
/** Starts with only the first coefficient dimension