[GRASS-SVN] r42043 - grass/trunk/lib/gmath
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Apr 27 05:59:47 EDT 2010
Author: huhabla
Date: 2010-04-27 05:59:46 -0400 (Tue, 27 Apr 2010)
New Revision: 42043
Modified:
grass/trunk/lib/gmath/ATLAS_wrapper_blas_level_1.c
grass/trunk/lib/gmath/TODO
grass/trunk/lib/gmath/blas_level_2.c
grass/trunk/lib/gmath/blas_level_3.c
grass/trunk/lib/gmath/ccmath_grass_wrapper.c
grass/trunk/lib/gmath/gauss.c
grass/trunk/lib/gmath/gmathlib.dox
grass/trunk/lib/gmath/ialloc.c
grass/trunk/lib/gmath/solvers_classic_iter.c
grass/trunk/lib/gmath/solvers_direct.c
grass/trunk/lib/gmath/sparse_matrix.c
Log:
Enhanced documentaion of the gmath doxygen file. Fixed several doxygen documentation issues.
Modified: grass/trunk/lib/gmath/ATLAS_wrapper_blas_level_1.c
===================================================================
--- grass/trunk/lib/gmath/ATLAS_wrapper_blas_level_1.c 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/ATLAS_wrapper_blas_level_1.c 2010-04-27 09:59:46 UTC (rev 42043)
@@ -165,6 +165,7 @@
* grass implementatiom
*
* \param x (double *)
+ * \param a (double)
* \param rows (int)
* \return (void)
*
@@ -348,6 +349,7 @@
* grass implementatiom
*
* \param x (float *)
+ * \param a (float)
* \param rows (int)
* \return (float)
*
Modified: grass/trunk/lib/gmath/TODO
===================================================================
--- grass/trunk/lib/gmath/TODO 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/TODO 2010-04-27 09:59:46 UTC (rev 42043)
@@ -5,6 +5,9 @@
* Replace the lu-solver in lu.c with the one from the ccmath library
and patch alll modules using lu.c
* Implement a robust parallelizable LU solver with pivoting
+* Move the band matrix cholesky decomposition solver from the lidar library
+ (TcholBand.c) into the gmath library and make it available for other numerical
+ programs (Integration in the common solver structure)
TODO
Modified: grass/trunk/lib/gmath/blas_level_2.c
===================================================================
--- grass/trunk/lib/gmath/blas_level_2.c 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/blas_level_2.c 2010-04-27 09:59:46 UTC (rev 42043)
@@ -39,6 +39,7 @@
* \param Asp (G_math_spvector **)
* \param x (double) *)
* \param y (double * )
+ * \param rows (int)
* \return (void)
*
* */
@@ -387,7 +388,7 @@
}
/*!
- * \fn int G_math_d_A_T(float **A, int rows)
+ * \fn int G_math_f_A_T(float **A, int rows)
*
* \brief Compute the transposition of matrix A.
* Matrix A will be overwritten.
Modified: grass/trunk/lib/gmath/blas_level_3.c
===================================================================
--- grass/trunk/lib/gmath/blas_level_3.c 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/blas_level_3.c 2010-04-27 09:59:46 UTC (rev 42043)
@@ -205,7 +205,7 @@
*
* \param A (float **)
* \param B (float **)
- * \param D (float **)
+ * \param C (float **)
* \param rows_A (int)
* \param cols_A (int)
* \param rows_B (int)
Modified: grass/trunk/lib/gmath/ccmath_grass_wrapper.c
===================================================================
--- grass/trunk/lib/gmath/ccmath_grass_wrapper.c 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/ccmath_grass_wrapper.c 2010-04-27 09:59:46 UTC (rev 42043)
@@ -4,6 +4,8 @@
#include <grass/ccmath_grass.h>
#endif
/**
+ * Documentation and ccmath library version 2.2.1 by Daniel A. Atkinson
+ *
Chapter 1
LINEAR ALGEBRA
@@ -228,7 +230,7 @@
\brief Invert (in place) a symmetric real matrix, V -> Inv(V).
The input matrix V is symmetric (V[i,j] = V[j,i]).
- \param v = array containing a symmetric input matrix. This is converted to the inverse matrix.
+ \param a = array containing a symmetric input matrix. This is converted to the inverse matrix.
\param n = dimension of the system (dim(v)=n*n)
\return: 0 -> normal exit 1 -> input matrix not positive definite
*/
Modified: grass/trunk/lib/gmath/gauss.c
===================================================================
--- grass/trunk/lib/gmath/gauss.c 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/gauss.c 2010-04-27 09:59:46 UTC (rev 42043)
@@ -3,7 +3,7 @@
/*!
- * \fn double G_math_rand_gauss (int seed)
+ * \fn double G_math_rand_gauss(const int seed, const double sigma)
*
* \brief Gaussian random number generator
*
Modified: grass/trunk/lib/gmath/gmathlib.dox
===================================================================
--- grass/trunk/lib/gmath/gmathlib.dox 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/gmathlib.dox 2010-04-27 09:59:46 UTC (rev 42043)
@@ -1,16 +1,444 @@
/*! \page gmathlib GRASS Numerical math interface
-<!-- doxygenized from "GRASS 5 Programmer's Manual"
+<!-- doxygenized from "GRASS 5 Programmer's Manual"
by M. Neteler 8/2005
-->
-\section gmathintro Numerical math interface with optional support of LAPACK/BLAS
+\section gmathintro The GRASS numerical math interface
<P>
+Authors: probably CERL, David D. Gray, Brad Douglas, Soeren Gebbert and many others
+<P>
+
+The gmath library provides many common mathematical functions to be used in GRASS modules:
+<ul>
+ <li>Linear algebra functions of type blas level 1, 2 and 3 </li>
+ <li>Iterative and direct linear algebra solver for sparse, band and dense matrices </li>
+ <li>Eigenvalue and single value decomposition methods </li>
+ <li>Memory allocation methods for vectors and matrices </li>
+ <li>Fast fourier transformation and many more </li>
+</ul>
+The GRASS numerical math interface also makes use of 3d party libraries to
+implement linear algebra and fast Fourier transformation functions,
+like fftw-library, BLAS/LAPACK, ccmath and ATLAS. Parts of the ccmath library are
+integrated in GRASS in lib/external.
+
+There are several tests and benchmarks available for blas level 1, 2 and 3 as well
+as for ccmath and linear equation solver in the lib/gmath/test directory. These
+tests and benchmarks are not compiled by default. In case GRASS has been compiled,
+just change in the test directory and type make. A binary named test.gmath.lib
+will be available after starting GRASS.
+
+To run all tests just type:
+\verbatim
+test.gmath.lib -a
+\endverbatim
+To run a benchmark to solve a matrix size of 2000x2000 using the Krylov-Subspace iterative solver type:
+\verbatim
+test.gmath.lib solverbench=krylov rows=2000
+\endverbatim
+
+Several GRASS modules implement there own numerical functions.
+The goal is to collect all these functions in the GRASS numerical math interface,
+to standardize them and to modify all modules to make use of the gmath interface.
+
+\subsection memalloc Memory allocation functions
+
+GMATH provides several functions for vector and matrix memory allocation of different
+types. These functions should be used to allocate vectors and matrices which are
+used by gmath linear algebra functions.
+
+<P>
+Matrix and vector allocation for real types
+<P>
+double *G_alloc_vector(size_t)<br>
+double **G_alloc_matrix(int, int)<br>
+float *G_alloc_fvector(size_t)<br>
+float **G_alloc_fmatrix(int, int)<br>
+void G_free_vector(double *)<br>
+void G_free_matrix(double **)<br>
+void G_free_fvector(float *)<br>
+void G_free_fmatrix(float **)<br>
+
+<P>
+Matrix and vector allocation for integer types
+<P>
+int *G_alloc_ivector(size_t)<br>
+int **G_alloc_imatrix(int, int)<br>
+void G_free_ivector(int *)<br>
+void G_free_imatrix(int **)<br>
+
+\subsection commonmath Common mathematical functions
+
+<P>
+Fast Fourier Transformation
+<P>
+int fft(int, double *[2], int, int, int)<br>
+int fft2(int, double (*)[2], int, int, int)<br>
+
+<P>
+Several mathematical functions mostly used by Imagery modules
+<P>
+double G_math_rand_gauss(int, double)<br>
+long G_math_max_pow2 (long n)<br>
+long G_math_min_pow2 (long n)<br>
+float G_math_rand(int)<br>
+int del2g(double *[2], int, double)<br>
+int getg(double, double *[2], int)<br>
+int G_math_egvorder(double *, double **, long)<br>
+int G_math_complex_mult (double *v1[2], int size1, double *v2[2], int size2, double *v3[2], int size3)<br>
+int G_math_findzc(double conv[], int size, double zc[], double thresh, int num_orients);
+
+<P>
+Obsolete LU decomposition lend from numerical recipes
+<P>
+int G_ludcmp(double **, int, int *, double *);
+void G_lubksb(double **a, int n, int *indx, double b[]);
+
+\subsection gmathblas Blas like level 1,2 and 3 functions
+
+<P>
+Author: Soeren Gebbert
+<P>
+
+The gmath library provides its own implementation of blas level 1, 2 and 3
+functions for vector - vector, vector - matrix and matrix - matrix operations.
+OpenMP is internally used to parallelize the vector and matrix operations. Most of the
+function can be called from inside a OpenMP parallel region.
+Additionally a wrapper for the ATLAS blas level 1 functions is available. The wrapping
+functions can also be used, when the ATLAS library is not available. In this case
+the GRASS blas level 1 implementation is called automatically instead.
+
+\subsubsection blas_level_1 Level 1 vector - vector GRASS implementation with OpenMP thread support
+<P>
+Double precision blas level 1 functions
+<P>
+void G_math_d_x_dot_y(double *, double *, double *, int )<br>
+void G_math_d_asum_norm(double *, double *, int )<br>
+void G_math_d_euclid_norm(double *, double *, int )<br>
+void G_math_d_max_norm(double *, double *, int )<br>
+void G_math_d_ax_by(double *, double *, double *, double , double , int )<br>
+void G_math_d_copy(double *, double *, int )<br><br>
+<P>
+Single precision blas level 1 functions
+<P>
+void G_math_f_x_dot_y(float *, float *, float *, int )<br>
+void G_math_f_asum_norm(float *, float *, int )<br>
+void G_math_f_euclid_norm(float *, float *, int )<br>
+void G_math_f_max_norm(float *, float *, int )<br>
+void G_math_f_ax_by(float *, float *, float *, float , float , int )<br>
+void G_math_f_copy(float *, float *, int )<br><br>
+<P>
+Integer blas level 1 functions
+<P>
+void G_math_i_x_dot_y(int *, int *, double *, int )<br>
+void G_math_i_asum_norm(int *, double *, int )<br>
+void G_math_i_euclid_norm(int *, double *,int )<br>
+void G_math_i_max_norm(int *, int *, int )<br>
+void G_math_i_ax_by(int *, int *, int *, int , int , int )<br>
+void G_math_i_copy(int *, int *, int )<br><br>
+
+<P>
+ATLAS blas level 1 wrapper
+<P>
+double G_math_ddot(double *, double *, int )<br>
+float G_math_sdot(float *, float *, int )<br>
+float G_math_sdsdot(float *, float *, float , int )<br>
+double G_math_dnrm2(double *, int )<br>
+double G_math_dasum(double *, int )<br>
+double G_math_idamax(double *, int )<br>
+float G_math_snrm2(float *, int )<br>
+float G_math_sasum(float *, int )<br>
+float G_math_isamax(float *, int )<br>
+void G_math_dscal(double *, double , int )<br>
+void G_math_sscal(float *, float , int )<br>
+void G_math_dcopy(double *, double *, int )<br>
+void G_math_scopy(float *, float *, int )<br>
+void G_math_daxpy(double *, double *, double , int )<br>
+void G_math_saxpy(float *, float *, float , int )<br>
+
+\subsubsection blas_level_2 Level 2 matrix - vector GRASS implementation with OpenMP thread support
+
+void G_math_Ax_sparse(G_math_spvector **, double *, double *, int )<br>
+void G_math_d_Ax(double **, double *, double *, int , int )<br>
+void G_math_f_Ax(float **, float *, float *, int , int )<br>
+void G_math_d_x_dyad_y(double *, double *, double **, int, int )<br>
+void G_math_f_x_dyad_y(float *, float *, float **, int, int )<br>
+void G_math_d_aAx_by(double **, double *, double *, double , double , double *, int , int )<br>
+void G_math_f_aAx_by(float **, float *, float *, float , float , float *, int , int )<br>
+int G_math_d_A_T(double **A, int rows)<br>
+int G_math_f_A_T(float **A, int rows)<br>
+
+\subsubsection blas_level_3 Blas level 3 matrix - matrix GRASS implementation with OpenMP thread support
+
+void G_math_d_aA_B(double **, double **, double , double **, int , int )<br>
+void G_math_f_aA_B(float **, float **, float , float **, int , int )<br>
+void G_math_d_AB(double **, double **, double **, int , int , int )<br>
+void G_math_f_AB(float **, float **, float **, int , int , int )<br>
+
+
+\subsection gmathccmath Ccmath library function wrapper
+
+<P>
+Author: Daniel A. Atkinson: ccmath library and documentation<br>
+ Wrapper Soeren Gebbert
+<P>
+
+GRASS make use of several functions from the ccmath library. The ccmath library is
+located in the lib/external directory. The library was designed and developed by
+Daniel A. Atkinson and is licensed under the terms of the LGPL. Ccmath provides
+many common mathematical functions. Currently GRASS uses only the linear algebra
+part of the library. These functions are available via wrapping functions.<br><br>
+
+The wrapper integrates the ccmath library functions into the gmath
+structure. Hence only gmath memory allocation function should be used to create
+vector and matrix structures used by ccmath.
+
+This is the documentation of the linear algebra part of the the ccmath library used by GRASS.
+It was written by Daniel A. Atkinson and provides a detailed description of the available
+linear algebra functions.
+\verbatim
+ LINEAR ALGEBRA
+
+ Summary
+
+ The matrix algebra library contains functions that
+ perform the standard computations of linear algebra.
+ General areas covered are:
+
+ o Solution of Linear Systems
+ o Matrix Inversion
+ o Eigensystem Analysis
+ o Matrix Utility Operations
+ o Singular Value Decomposition
+
+ The operations covered here are fundamental to many
+ areas of mathematics and statistics. Thus, functions
+ in this library segment are called by other library
+ functions. Both real and complex valued matrices
+ are covered by functions in the first four of these
+ categories.
+
+
+ Notes on Contents
+
+ Functions in this library segment provide the basic operations of
+ numerical linear algebra and some useful utility functions for operations on
+ vectors and matrices. The following list describes the functions available for
+ operations with real-valued matrices.
+
+
+ o Solving and Inverting Linear Systems:
+
+ solv --------- solve a general system of real linear equations.
+ solvps ------- solve a real symmetric linear system.
+ solvru ------- solve a real right upper triangular linear system.
+ solvtd ------- solve a tridiagonal real linear system.
+
+ minv --------- invert a general real square matrix.
+ psinv -------- invert a real symmetric matrix.
+ ruinv -------- invert a right upper triangular matrix.
+
+
+ The solution of a general linear system and efficient algorithms for
+ solving special systems with symmetric and tridiagonal matrices are provided
+ by these functions. The general solution function employs a LU factorization
+ with partial pivoting and it is very robust. It will work efficiently on any
+ problem that is not ill-conditioned. The symmetric matrix solution is based
+ on a modified Cholesky factorization. It is best used on positive definite
+ matrices that do not require pivoting for numeric stability. Tridiagonal
+ solvers require order-N operations (N = dimension). Thus, they are highly
+ recommended for this important class of sparse systems. Two matrix inversion
+ routines are provided. The general inversion function is again LU based. It
+ is suitable for use on any stable (ie. well-conditioned) problem. The
+ Cholesky based symmetric matrix inversion is efficient and safe for use on
+ matrices known to be positive definite, such as the variance matrices
+ encountered in statistical computations. Both the solver and the inverse
+ functions are designed to enhance data locality. They are very effective
+ on modern microprocessors.
+
+
+ o Eigensystem Analysis:
+
+ eigen ------ extract all eigen values and vectors of a real
+ symmetric matrix.
+ eigval ----- extract the eigen values of a real symmetric matrix.
+ evmax ------ compute the eigen value of maximum absolute magnitude
+ and its corresponding vector for a symmetric matrix.
+
+
+ Eigensystem functions operate on real symmetric matrices. Two forms of
+ the general eigen routine are provided because the computation of eigen values
+ only is much faster when vectors are not required. The basic algorithms use
+ a Householder reduction to tridiagonal form followed by QR iterations with
+ shifts to enhance convergence. This has become the accepted standard for
+ symmetric eigensystem computation. The evmax function uses an efficient
+ iterative power method algorithm to extract the eigen value of maximum
+ absolute size and the corresponding eigenvector.
+
+
+ o Singular Value Decomposition:
+
+ svdval ----- compute the singular values of a m by n real matrix.
+ sv2val ----- compute the singular values of a real matrix
+ efficiently for m >> n.
+ svduv ------ compute the singular values and the transformation
+ matrices u and v for a real m by n matrix.
+ sv2uv ------ compute the singular values and transformation
+ matrices efficiently for m >> n.
+ svdu1v ----- compute the singular values and transformation
+ matrices u1 and v, where u1 overloads the input
+ with the first n column vectors of u.
+ sv2u1v ----- compute the singular values and the transformation
+ matrices u1 and v efficiently for m >> n.
+
+
+ Singular value decomposition is extremely useful when dealing with linear
+ systems that may be singular. Singular values with values near zero are flags
+ of a potential rank deficiency in the system matrix. They can be used to
+ identify the presence of an ill-conditioned problem and, in some cases, to
+ deal with the potential instability. They are applied to the linear least
+ squares problem in this library. Singular values also define some important
+ matrix norm parameters such as the 2-norm and the condition value. A complete
+ decomposition provides both singular values and an orthogonal decomposition of
+ vector spaces related to the matrix identifying the range and null-space.
+ Fortunately, a highly stable algorithm based on Householder reduction to
+ bidiagonal form and QR rotations can be used to implement the decomposition.
+ The library provides two forms with one more efficient when the dimensions
+ satisfy m > (3/2)n.
+
+ General Technical Comments
+
+ Efficient computation with matrices on modern processors must be
+ adapted to the storage scheme employed for matrix elements. The functions
+ of this library segment do not employ the multidimensional array intrinsic
+ of the C language. Access to elements employs the simple row-major scheme
+ described here.
+
+ Matrices are modeled by the library functions as arrays with elements
+ stored in row order. Thus, the element in the jth row and kth column of
+ the n by n matrix M, stored in the array mat[], is addressed by
+
+ M[j,k] = mat[n*j+k] , with 0 =< j,k <= n-1 .
+
+ (Remember that C employs zero as the starting index.) The storage order has
+ important implications for data locality.
+
+ The algorithms employed here all have excellent numerical stability, and
+ the default double precision arithmetic of C enhances this. Thus, any
+ problems encountered in using the matrix algebra functions will almost
+ certainly be due to an ill-conditioned matrix. (The Hilbert matrices,
+
+ H[i,j] = 1/(1+i+j) for i,j < n
+
+ form a good example of such ill-conditioned systems.) We remind the reader
+ that the appropriate response to such ill-conditioning is to seek an
+ alternative approach to the problem. The option of increasing precision has
+ already been exploited. Modification of the linear algebra algorithm code is
+ not normally effective in an ill-conditioned problem.
+\endverbatim
+
+<P>
+Ccmath functions available via wrapping:
+<P>
+
+int G_math_solv(double **,double *,int)<br>
+int G_math_solvps(double **,double *,int)<br>
+void G_math_solvtd(double *,double *,double *,double *,int)<br>
+int G_math_solvru(double **,double *,int)<br>
+int G_math_minv(double **,int)<br>
+int G_math_psinv(double **,int)<br>
+int G_math_ruinv(double **,int)<br>
+void G_math_eigval(double **,double *,int)<br>
+void G_math_eigen(double **,double *,int)<br>
+double G_math_evmax(double **,double *,int)<br>
+int G_math_svdval(double *,double **,int,int)<br>
+int G_math_sv2val(double *,double **,int,int)<br>
+int G_math_svduv(double *,double **,double **, int,double **,int)<br>
+int G_math_sv2uv(double *,double **,double **,int,double **,int)<br>
+int G_math_svdu1v(double *,double **,int,double **,int)<br>
+
+\subsection gmathsolver Linear equation solver
+
+<P>
+Author: Soeren Gebbert and other
+<P>
+
+Besides the ccmath linear equation solver GRASS provides a set of additional
+direct and iterative linear equation solver for sparse, band and dense matrices. A special sparse
+matrix structure was implemented to allow the solution of huge sparse linear
+equation systems.
+
+As iterative linear equation solver are classic (Gauss-Seidel/SOR, Jacobi) and
+Krylov-Subspace (CG and BiCGStab) solver available. All iterative solver support
+sparse and dense matrices. The Krylov-Subspace solver are parallelized with OpenMP.
+
+As direct solver are LU-decomposition and Gauss-elimination without pivoting and a bandwidth
+optimized Cholesky decomposition available. Direct solver only support dense and
+band(Cholesky only) matrices.
+
+<P>
+The row vector of the sparse matrix
+<P>
+\verbatim
+typedef struct
+{
+ double *values; //The non null values of the row
+ unsigned int cols; //Number of entries
+ unsigned int *index;//the index number
+} G_math_spvector;
+\endverbatim
+
+<P>
+Sparse matrix and sparse vector functions
+<P>
+G_math_spvector *G_math_alloc_spvector(int )<br>
+G_math_spvector **G_math_alloc_spmatrix(int )<br>
+void G_math_free_spmatrix(G_math_spvector ** , int )<br>
+void G_math_free_spvector(G_math_spvector * )<br>
+int G_math_add_spvector(G_math_spvector **, G_math_spvector * , int )<br>
+
+<P>
+Direct linear equation solver
+<P>
+int G_math_solver_gauss(double **, double *, double *, int )<br>
+int G_math_solver_lu(double **, double *, double *, int )<br>
+int G_math_solver_cholesky(double **, double *, double *, int , int )<br>
+
+<P>
+Classic iterative linear equation solver for dense and sparse matrices
+<P>
+int G_math_solver_jacobi(double **, double *, double *, int , int , double , double )<br>
+int G_math_solver_gs(double **, double *, double *, int , int , double , double )<br>
+int G_math_solver_sparse_jacobi(G_math_spvector **, double *, double *, int , int , double , double )<br>
+int G_math_solver_sparse_gs(G_math_spvector **, double *, double *, int , int , double , double )<br>
+
+<P>
+Krylov-Subspace iterative linear equation solver for dense and sparse matrices
+<P>
+int G_math_solver_pcg(double **, double *, double *, int , int , double , int )<br>
+int G_math_solver_cg(double **, double *, double *, int , int , double )<br>
+int G_math_solver_bicgstab(double **, double *, double *, int , int , double )<br>
+int G_math_solver_sparse_pcg(G_math_spvector **, double *, double *, int , int , double , int )<br>
+int G_math_solver_sparse_cg(G_math_spvector **, double *, double *, int , int , double )<br>
+int G_math_solver_sparse_bicgstab(G_math_spvector **, double *, double *, int , int , double )<br>
+
+<P>
+LU, Gauss and Cholesky decomposition and substitution functions
+<P>
+void G_math_gauss_elimination(double **, double *, int )<br>
+void G_math_lu_decomposition(double **, double *, int )<br>
+int G_math_cholesky_decomposition(double **, int , int )<br>
+void G_math_backward_substitution(double **, double *, double *, int )<br>
+void G_math_forward_substitution(double **, double *, double *, int )<br>
+
+\subsection gmathlapack Optional support of LAPACK/BLAS
+
+<P>
Author: David D. Gray<br>
Additions: Brad Douglas
<P>
-(under development)
+(under development)
<BR>
<P>
This chapter provides an explanation of how numerical algebra routines from
@@ -29,7 +457,7 @@
<P>
-\section Implementation Implementation
+\subsubsection Implementation Implementation
<P>
The function name convention is as follows:
@@ -41,17 +469,17 @@
</LI>
<LI>G_matvect_*() : corresponding to Level2 BLAS (vector-matrix) and
</LI>
-<LI>G_vector_*() : corresponding to Level1 BLAS (vector-vector)
+<LI>G_vector_*() : corresponding to Level1 BLAS (vector-vector)
</LI>
</OL>
<P>
-\section matrix_matrix_functions matrix -matrix functions
+\subsubsection matrix_matrix_functions matrix -matrix functions
<P>
mat_struct *G_matrix_init (int rows, int cols, int ldim)<br>
- Initialise a matrix structure Initialise a matrix structure. Set
+ Initialise a matrix structure Initialise a matrix structure. Set
the number of rows with
the first parameter and columns with the second. The third parameter, lead
dimension (>= no. of rows) needs attention by the programmer as it is
@@ -68,7 +496,7 @@
<P>
(1,1) (2,1) (3,1) and unused are (1,2) (2,2) ... and so on, ie. it is column major.
-So although the programmer uses the normal parameter sequence of (row, col)
+So although the programmer uses the normal parameter sequence of (row, col)
the entries traverse the data column by column instead of row by row. Each
block in the workspace must be large enough (here 4) to hold a whole column
(3) , and trailing spaces are unused. The number of rows (ie. size of a
@@ -85,15 +513,15 @@
<P>
mat_struct *G_matrix_set (mat_struct *A, int rows, int cols, int ldim)<br>
- Set parameters for a matrix structureSet parameters for a matrix
+ Set parameters for a matrix structureSet parameters for a matrix
structure that is allocated but not yet initialised fully.
<P>
<B>Note:</B>
<BR>
<P>
-G_matrix_set() is an alternative to G_matrix_init() . G_matrix_init()
- initialises and returns a pointer to a dynamically allocated matrix
+G_matrix_set() is an alternative to G_matrix_init() . G_matrix_init()
+ initialises and returns a pointer to a dynamically allocated matrix
structure (ie. in the process heap) . G_matrix_set() sets the parameters for
an already created matrix structure. In both cases the data workspace still
has to be allocated dynamically.
@@ -129,7 +557,7 @@
<P>
mat_struct *G_matrix_product (mat_struct *mt1, mat_struct *mt2)<br>
Multiply two matricesMultiply two matrices and return the result.
- The receiving structure should not be initialised, as the matrix is created
+ The receiving structure should not be initialised, as the matrix is created
by the routine.
<P>
@@ -150,12 +578,12 @@
<P>
mat_struct *G_matrix_transpose (mat_struct *mt)<br>
- Transpose a matrix. Transpose a matrix by creating a new one and
+ Transpose a matrix. Transpose a matrix by creating a new one and
populating with transposed element s.
<P>
void G_matrix_print (mat_struct *mt)<br>
- Print out a matrix. Print out a representation of the matrix to
+ Print out a matrix. Print out a representation of the matrix to
standard output.
<P>
@@ -167,7 +595,7 @@
<BR>
<P>
Links to LAPACK function dgesv_() and similar to perform the core routine.
- (By default solves for a general non-symmetric matrix .)
+ (By default solves for a general non-symmetric matrix .)
<P>
mtype is a flag to indicate what kind of matrix (real/complex, Hermitian,
@@ -248,14 +676,14 @@
the underlying structure unless you specify DO_COMPACT comp_flag:
<P>
-0 Eliminate unnecessary rows (cols) in matrix
+0 Eliminate unnecessary rows (cols) in matrix
<BR>
-1 ... or not
+1 ... or not
<P>
double G_vector_norm_euclid (vec_struct *vc) Calculates euclidean
norm Calculates the euclidean norm of a row or column vector, using BLAS
- routine dnrm2_()
+ routine dnrm2_()
<P>
double G_vector_norm_maxval (vec_struct *vc, int vflag) Calculates
@@ -293,18 +721,18 @@
<P>
\verbatim
-#define G_vector_free(x) G_matrix_free( (x) )
+#define G_vector_free(x) G_matrix_free( (x) )
\endverbatim
<P>
-* Ax calculations can be done with G_matrix_multiply()
+* Ax calculations can be done with G_matrix_multiply()
<P>
* Vector print can be done by G_matrix_print() .
<P>
\verbatim
-#define G_vector_print(x) G_matrix_print( (x) )
+#define G_vector_print(x) G_matrix_print( (x) )
\endverbatim
<P>
@@ -324,7 +752,7 @@
#include <grass/gmath.h>
int
-main (int argc, char *argv[])
+main (int argc, char *argv[])
{
mat_struct *matrix;
double val;
@@ -340,7 +768,7 @@
/* print it */
G_message ( "Value: %g", val);
-
+
/* Free the memory */
G_matrix_free (matrix);
@@ -349,7 +777,7 @@
\endverbatim
<P>
-See \ref Compiling_and_Installing_GRASS_Modules for a complete
+See \ref Compiling_and_Installing_GRASS_Modules for a complete
discussion of Makefiles.
*/
Modified: grass/trunk/lib/gmath/ialloc.c
===================================================================
--- grass/trunk/lib/gmath/ialloc.c 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/ialloc.c 2010-04-27 09:59:46 UTC (rev 42043)
@@ -69,7 +69,7 @@
}
/**
- * \fn int G_free_vector (int *v)
+ * \fn void G_free_ivector(int *v)
*
* \brief Vector memory deallocation.
*
Modified: grass/trunk/lib/gmath/solvers_classic_iter.c
===================================================================
--- grass/trunk/lib/gmath/solvers_classic_iter.c 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/solvers_classic_iter.c 2010-04-27 09:59:46 UTC (rev 42043)
@@ -177,7 +177,7 @@
* solver will abort the calculation and writes the current result into the vector x.
* The parameter <i>err</i> defines the error break criteria for the solver.
*
- * \param Asp G_math_spvector ** -- the sparse matrix
+ * \param A double ** -- the dense matrix
* \param x double * -- the vector of unknowns
* \param b double * -- the right side vector
* \param rows int -- number of rows
@@ -234,7 +234,7 @@
* solver will abort the calculation and writes the current result into the vector x.
* The parameter <i>err</i> defines the error break criteria for the solver.
*
- * \param Asp G_math_spvector ** -- the sparse matrix
+ * \param A double ** -- the dense matrix
* \param x double * -- the vector of unknowns
* \param b double * -- the right side vector
* \param rows int -- number of rows
Modified: grass/trunk/lib/gmath/solvers_direct.c
===================================================================
--- grass/trunk/lib/gmath/solvers_direct.c 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/solvers_direct.c 2010-04-27 09:59:46 UTC (rev 42043)
@@ -37,7 +37,7 @@
* \param A double **
* \param x double *
* \param b double *
- * \int rows int
+ * \param rows int
* \return int -- 1 success
* */
int G_math_solver_gauss(double **A, double *x, double *b, int rows)
@@ -61,7 +61,7 @@
* \param A double **
* \param x double *
* \param b double *
- * \int rows int
+ * \param rows int
* \return int -- 1 success
* */
int G_math_solver_lu(double **A, double *x, double *b, int rows)
@@ -120,7 +120,8 @@
* \param A double **
* \param x double *
* \param b double *
- * \int rows int
+ * \param bandwith int -- the bandwith of the band matrix, if unsure set to rows
+ * \param rows int
* \return int -- 1 success
* */
int G_math_solver_cholesky(double **A, double *x, double *b, int bandwith,
Modified: grass/trunk/lib/gmath/sparse_matrix.c
===================================================================
--- grass/trunk/lib/gmath/sparse_matrix.c 2010-04-27 08:46:56 UTC (rev 42042)
+++ grass/trunk/lib/gmath/sparse_matrix.c 2010-04-27 09:59:46 UTC (rev 42043)
@@ -26,7 +26,7 @@
*
* Return 1 for success and -1 for failure
*
- * \param spmatrix G_math_spvector **
+ * \param Asp G_math_spvector **
* \param spvector G_math_spvector *
* \param row int
* \return int 1 success, -1 failure
@@ -113,21 +113,21 @@
/*!
* \brief Release the memory of the sparse matrix
*
- * \param spvector G_math_spvector **
+ * \param Asp G_math_spvector **
* \param rows int
* \return void
*
* */
-void G_math_free_spmatrix(G_math_spvector ** spmatrix, int rows)
+void G_math_free_spmatrix(G_math_spvector ** Asp, int rows)
{
int i;
- if (spmatrix) {
+ if (Asp) {
for (i = 0; i < rows; i++)
- G_math_free_spvector(spmatrix[i]);
+ G_math_free_spvector(Asp[i]);
- G_free(spmatrix);
- spmatrix = NULL;
+ G_free(Asp);
+ Asp = NULL;
}
return;
More information about the grass-commit
mailing list