mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-09 14:27:42 +00:00
Windows fixes
This commit is contained in:
@@ -37,6 +37,8 @@
|
||||
#ifndef GMM_OPT_H__
|
||||
#define GMM_OPT_H__
|
||||
|
||||
#include <gmm/gmm_dense_lu.h>
|
||||
|
||||
namespace gmm {
|
||||
|
||||
/* ********************************************************************* */
|
||||
@@ -58,7 +60,7 @@ namespace gmm {
|
||||
default :
|
||||
{
|
||||
dense_matrix<T> B(mat_nrows(A), mat_ncols(A));
|
||||
std::vector<size_type> ipvt(mat_nrows(A));
|
||||
lapack_ipvt ipvt(mat_nrows(A));
|
||||
gmm::copy(A, B);
|
||||
lu_factor(B, ipvt);
|
||||
return lu_det(B, ipvt);
|
||||
@@ -69,13 +71,13 @@ namespace gmm {
|
||||
}
|
||||
|
||||
|
||||
template <typename T> T lu_inverse(const dense_matrix<T> &A_, bool doassert = true) {
|
||||
template <typename T> T lu_inverse(const dense_matrix<T> &A_,
|
||||
bool doassert = true) {
|
||||
dense_matrix<T>& A = const_cast<dense_matrix<T> &>(A_);
|
||||
size_type N = mat_nrows(A);
|
||||
T det(1);
|
||||
if (N) {
|
||||
T *p = &(A(0,0));
|
||||
if (N <= 2) {
|
||||
switch (N) {
|
||||
case 1 : {
|
||||
det = *p;
|
||||
@@ -90,34 +92,35 @@ namespace gmm {
|
||||
std::swap(*p, *(p+3));
|
||||
*p++ /= det; *p++ /= -det; *p++ /= -det; *p++ /= det;
|
||||
} break;
|
||||
// case 3 : { // not stable for nearly singular matrices
|
||||
// T a, b, c, d, e, f, g, h, i;
|
||||
// a = (*(p+4)) * (*(p+8)) - (*(p+5)) * (*(p+7));
|
||||
// b = - (*(p+1)) * (*(p+8)) + (*(p+2)) * (*(p+7));
|
||||
// c = (*(p+1)) * (*(p+5)) - (*(p+2)) * (*(p+4));
|
||||
// d = - (*(p+3)) * (*(p+8)) + (*(p+5)) * (*(p+6));
|
||||
// e = (*(p+0)) * (*(p+8)) - (*(p+2)) * (*(p+6));
|
||||
// f = - (*(p+0)) * (*(p+5)) + (*(p+2)) * (*(p+3));
|
||||
// g = (*(p+3)) * (*(p+7)) - (*(p+4)) * (*(p+6));
|
||||
// h = - (*(p+0)) * (*(p+7)) + (*(p+1)) * (*(p+6));
|
||||
// i = (*(p+0)) * (*(p+4)) - (*(p+1)) * (*(p+3));
|
||||
// det = (*p) * a + (*(p+1)) * d + (*(p+2)) * g;
|
||||
// GMM_ASSERT1(det!=T(0), "non invertible matrix");
|
||||
// *p++ = a / det; *p++ = b / det; *p++ = c / det;
|
||||
// *p++ = d / det; *p++ = e / det; *p++ = f / det;
|
||||
// *p++ = g / det; *p++ = h / det; *p++ = i / det;
|
||||
// } break;
|
||||
case 3 : { // not stable for nearly singular matrices
|
||||
T a, b, c, d, e, f, g, h, i;
|
||||
a = (*(p+4)) * (*(p+8)) - (*(p+5)) * (*(p+7));
|
||||
b = - (*(p+1)) * (*(p+8)) + (*(p+2)) * (*(p+7));
|
||||
c = (*(p+1)) * (*(p+5)) - (*(p+2)) * (*(p+4));
|
||||
d = - (*(p+3)) * (*(p+8)) + (*(p+5)) * (*(p+6));
|
||||
e = (*(p+0)) * (*(p+8)) - (*(p+2)) * (*(p+6));
|
||||
f = - (*(p+0)) * (*(p+5)) + (*(p+2)) * (*(p+3));
|
||||
g = (*(p+3)) * (*(p+7)) - (*(p+4)) * (*(p+6));
|
||||
h = - (*(p+0)) * (*(p+7)) + (*(p+1)) * (*(p+6));
|
||||
i = (*(p+0)) * (*(p+4)) - (*(p+1)) * (*(p+3));
|
||||
det = (*p) * a + (*(p+1)) * d + (*(p+2)) * g;
|
||||
if (std::abs(det) > 1e-5) {
|
||||
*p++ = a / det; *p++ = b / det; *p++ = c / det;
|
||||
*p++ = d / det; *p++ = e / det; *p++ = f / det;
|
||||
*p++ = g / det; *p++ = h / det; *p++ = i / det;
|
||||
break;
|
||||
}
|
||||
}
|
||||
default : {
|
||||
dense_matrix<T> B(mat_nrows(A), mat_ncols(A));
|
||||
lapack_ipvt ipvt(mat_nrows(A));
|
||||
gmm::copy(A, B);
|
||||
size_type info = lu_factor(B, ipvt);
|
||||
GMM_ASSERT1(!info, "non invertible matrix");
|
||||
lu_inverse(B, ipvt, A);
|
||||
return lu_det(B, ipvt);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
dense_matrix<T> B(mat_nrows(A), mat_ncols(A));
|
||||
std::vector<int> ipvt(mat_nrows(A));
|
||||
gmm::copy(A, B);
|
||||
size_type info = lu_factor(B, ipvt);
|
||||
GMM_ASSERT1(!info, "non invertible matrix");
|
||||
lu_inverse(B, ipvt, A);
|
||||
return lu_det(B, ipvt);
|
||||
}
|
||||
}
|
||||
return det;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user