Merge from default. Hope I did it right...

This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions

View File

@@ -89,7 +89,7 @@ public:
//This is the same as above, but designed to take this class as a pass through variable. By this way you can feed
//the meat of this class into an independent function, such as SparseConjugateGradient.
static void PassThroughVectorProduct(float *Product, float *x, void *Pass){
((MultiDiagonalSymmetricMatrix *)Pass)->VectorProduct(Product, x);
(static_cast<MultiDiagonalSymmetricMatrix *>(Pass))->VectorProduct(Product, x);
};
/* CreateIncompleteCholeskyFactorization creates another matrix which is an incomplete (or complete if MaxFillAbove is big enough)
@@ -102,7 +102,7 @@ public:
MultiDiagonalSymmetricMatrix *IncompleteCholeskyFactorization;
static void PassThroughCholeskyBackSolve(float *Product, float *x, void *Pass){
((MultiDiagonalSymmetricMatrix *)Pass)->CholeskyBackSolve(Product, x);
(static_cast<MultiDiagonalSymmetricMatrix *>(Pass))->CholeskyBackSolve(Product, x);
};
};