forked from bartvdbraak/blender
BLI: add SVD solver for mat3 (using eigen3).
This commit is contained in:
parent
ad5f6a95dd
commit
8159718faf
2
extern/Eigen3/CMakeLists.txt
vendored
2
extern/Eigen3/CMakeLists.txt
vendored
@ -34,8 +34,10 @@ set(SRC
|
||||
eigen3_capi.h
|
||||
|
||||
intern/eigenvalues.cc
|
||||
intern/svd.cc
|
||||
|
||||
intern/eigenvalues.h
|
||||
intern/svd.h
|
||||
)
|
||||
|
||||
blender_add_lib(extern_eigen3 "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
1
extern/Eigen3/eigen3_capi.h
vendored
1
extern/Eigen3/eigen3_capi.h
vendored
@ -28,5 +28,6 @@
|
||||
#define __EIGEN3_C_API_H__
|
||||
|
||||
#include "intern/eigenvalues.h"
|
||||
#include "intern/svd.h"
|
||||
|
||||
#endif /* __EIGEN3_C_API_H__ */
|
||||
|
72
extern/Eigen3/intern/svd.cc
vendored
Normal file
72
extern/Eigen3/intern/svd.cc
vendored
Normal file
@ -0,0 +1,72 @@
|
||||
/*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2015 Blender Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Contributor(s): Blender Foundation,
|
||||
* Bastien Montagne
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef __EIGEN3_SVD_C_API_CC__
|
||||
#define __EIGEN3_SVD_C_API_CC__
|
||||
|
||||
/* Eigen gives annoying huge amount of warnings here, silence them! */
|
||||
#ifdef __GNUC__
|
||||
# pragma GCC diagnostic ignored "-Wlogical-op"
|
||||
#endif
|
||||
|
||||
#include <Eigen/Core>
|
||||
#include <Eigen/SVD>
|
||||
|
||||
#include "svd.h"
|
||||
|
||||
using Eigen::JacobiSVD;
|
||||
|
||||
using Eigen::NoQRPreconditioner;
|
||||
|
||||
using Eigen::ComputeThinU;
|
||||
using Eigen::ComputeThinV;
|
||||
|
||||
using Eigen::MatrixXf;
|
||||
using Eigen::VectorXf;
|
||||
using Eigen::Map;
|
||||
|
||||
void EG3_svd_square_matrix(const int size, const float *matrix, float *r_U, float *r_S, float *r_V)
|
||||
{
|
||||
/* Since our matrix is squared, we can use thinU/V. */
|
||||
unsigned int flags = (r_U ? ComputeThinU : 0) | (r_V ? ComputeThinV : 0);
|
||||
|
||||
/* Blender and Eigen matrices are both column-major. */
|
||||
JacobiSVD<MatrixXf, NoQRPreconditioner> svd(Map<MatrixXf>((float *)matrix, size, size), flags);
|
||||
|
||||
if (r_U) {
|
||||
Map<MatrixXf>(r_U, size, size) = svd.matrixU();
|
||||
}
|
||||
|
||||
if (r_S) {
|
||||
Map<VectorXf>(r_S, size) = svd.singularValues();
|
||||
}
|
||||
|
||||
if (r_V) {
|
||||
Map<MatrixXf>(r_V, size, size) = svd.matrixV();
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* __EIGEN3_SVD_C_API_CC__ */
|
40
extern/Eigen3/intern/svd.h
vendored
Normal file
40
extern/Eigen3/intern/svd.h
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
/*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* The Original Code is Copyright (C) 2015 Blender Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Contributor(s): Blender Foundation,
|
||||
* Bastien Montagne
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef __EIGEN3_SVD_C_API_H__
|
||||
#define __EIGEN3_SVD_C_API_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void EG3_svd_square_matrix(const int size, const float *matrix, float *r_U, float *r_S, float *r_V);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __EIGEN3_SVD_C_API_H__ */
|
@ -46,6 +46,7 @@ extern "C" {
|
||||
|
||||
bool BLI_eigen_solve_selfadjoint_m3(const float m3[3][3], float r_eigen_values[3], float r_eigen_vectors[3][3]);
|
||||
|
||||
void BLI_svd_m3(const float m3[3][3], float r_U[3][3], float r_S[], float r_V[3][3]);
|
||||
|
||||
/**************************** Inline Definitions ******************************/
|
||||
#if 0 /* None so far. */
|
||||
|
@ -59,3 +59,16 @@ bool BLI_eigen_solve_selfadjoint_m3(const float m3[3][3], float r_eigen_values[3
|
||||
|
||||
return EG3_self_adjoint_eigen_solve(3, (const float *)m3, r_eigen_values, (float *)r_eigen_vectors);
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Compute the SVD (Singular Values Decomposition) of given 3D matrix (m3 = USV*).
|
||||
*
|
||||
* \param m3 the matrix to decompose.
|
||||
* \return r_U the computed left singular vector of \a m3 (NULL if not needed).
|
||||
* \return r_S the computed singular values of \a m3 (NULL if not needed).
|
||||
* \return r_V the computed right singular vector of \a m3 (NULL if not needed).
|
||||
*/
|
||||
void BLI_svd_m3(const float m3[3][3], float r_U[3][3], float r_S[3], float r_V[3][3])
|
||||
{
|
||||
EG3_svd_square_matrix(3, (const float *)m3, (float *)r_U, (float *)r_S, (float *)r_V);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user