Add BLI_math_solver, where non-linear solvers should be.
For now, only has an eigen solver for 3×3 (symmetric) matrix.
This commit is contained in:
parent
582e7a6347
commit
0e9842dd04
|
@ -73,5 +73,6 @@
|
|||
#include "BLI_math_vector.h"
|
||||
#include "BLI_math_geom.h"
|
||||
#include "BLI_math_interp.h"
|
||||
#include "BLI_math_solvers.h"
|
||||
|
||||
#endif /* __BLI_MATH_H__ */
|
||||
|
|
|
@ -0,0 +1,66 @@
|
|||
/*
|
||||
* ***** 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 by Blender Foundation
|
||||
* All rights reserved.
|
||||
*
|
||||
* The Original Code is: all of this file.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
* */
|
||||
|
||||
#ifndef __BLI_MATH_SOLVERS_H__
|
||||
#define __BLI_MATH_SOLVERS_H__
|
||||
|
||||
/** \file BLI_math_solvers.h
|
||||
* \ingroup bli
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "BLI_compiler_attrs.h"
|
||||
#include "BLI_math_inline.h"
|
||||
|
||||
#ifdef BLI_MATH_GCC_WARN_PRAGMA
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wredundant-decls"
|
||||
#endif
|
||||
|
||||
/********************************** Eigen Solvers *********************************/
|
||||
|
||||
bool BLI_eigen_solve_selfadjoint_m3(const float m3[3][3], float r_eigen_values[3], float r_eigen_vectors[3][3]);
|
||||
|
||||
|
||||
/**************************** Inline Definitions ******************************/
|
||||
#if 0 /* None so far. */
|
||||
# if BLI_MATH_DO_INLINE
|
||||
# include "intern/math_geom_inline.c"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef BLI_MATH_GCC_WARN_PRAGMA
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __BLI_MATH_SOLVERS_H__ */
|
||||
|
|
@ -30,6 +30,7 @@ set(INC
|
|||
../../../intern/guardedalloc
|
||||
../../../intern/atomic
|
||||
../../../extern/wcwidth
|
||||
../../../extern/Eigen3
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
|
@ -83,6 +84,7 @@ set(SRC
|
|||
intern/math_interp.c
|
||||
intern/math_matrix.c
|
||||
intern/math_rotation.c
|
||||
intern/math_solvers.c
|
||||
intern/math_vector.c
|
||||
intern/math_vector_inline.c
|
||||
intern/noise.c
|
||||
|
@ -162,6 +164,7 @@ set(SRC
|
|||
BLI_math_interp.h
|
||||
BLI_math_matrix.h
|
||||
BLI_math_rotation.h
|
||||
BLI_math_solvers.h
|
||||
BLI_math_vector.h
|
||||
BLI_memarena.h
|
||||
BLI_mempool.h
|
||||
|
|
|
@ -34,6 +34,7 @@ cflags=''
|
|||
incs = [
|
||||
'.',
|
||||
'#/extern/wcwidth',
|
||||
'#/extern/Eigen3',
|
||||
'#/intern/guardedalloc',
|
||||
'#/intern/atomic',
|
||||
'../makesdna',
|
||||
|
|
|
@ -0,0 +1,61 @@
|
|||
/*
|
||||
* ***** 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 by Blender Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* The Original Code is: all of this file.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
* */
|
||||
|
||||
/** \file blender/blenlib/intern/math_solvers.c
|
||||
* \ingroup bli
|
||||
*/
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLI_strict_flags.h"
|
||||
|
||||
#include "eigen3_capi.h"
|
||||
|
||||
/********************************** Eigen Solvers *********************************/
|
||||
|
||||
/**
|
||||
* \brief Compute the eigen values and/or vectors of given 3D symmetric (aka adjoint) matrix.
|
||||
*
|
||||
* \param m3 the 3D symmetric matrix.
|
||||
* \return r_eigen_values the computed eigen values (NULL if not needed).
|
||||
* \return r_eigen_vectors the computed eigen vectors (NULL if not needed).
|
||||
*/
|
||||
bool BLI_eigen_solve_selfadjoint_m3(const float m3[3][3], float r_eigen_values[3], float r_eigen_vectors[3][3])
|
||||
{
|
||||
#ifndef NDEBUG
|
||||
/* We must assert given matrix is self-adjoint (i.e. symmetric) */
|
||||
if ((m3[0][1] != m3[1][0]) ||
|
||||
(m3[0][2] != m3[2][0]) ||
|
||||
(m3[1][2] != m3[2][1]))
|
||||
{
|
||||
BLI_assert(0);
|
||||
}
|
||||
#endif
|
||||
|
||||
return EG3_self_adjoint_eigen_solve(3, (const float *)m3, r_eigen_values, (float *)r_eigen_vectors);
|
||||
}
|
Loading…
Reference in New Issue