Various files have moved from lib/gis to lib/gmath:

 Update gisdefs.h and gmath.h accordingly
 Update clients accordingly
 Generalise eigen(), remove local version from i.smap


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35274 15284696-431f-4ddb-bdfa-cd5b030d7da7

imagery/i.gensigset/invert.c

@@ -1,4 +1,5 @@
 #include <grass/gis.h>
+#include <grass/gmath.h>
 
 int invert(
 	      /* inverts a matrix of arbitrary size input as a 2D array. */

imagery/i.gensigset/subcluster.c

@@ -3,6 +3,7 @@
 #include <grass/gis.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
+#include <grass/gmath.h>
 #include "local_proto.h"
 
 #define ZERO 1e-10

imagery/i.smap/bouman.h

@@ -53,9 +53,6 @@ void free_img(unsigned char **);
 /* Subroutine in solve.c */
 double solve(double (*)(double), double, double, double, int *);
 
-/* Subroutine in eigen.c */
-int eigen(double **, double *, int);
-
 /* Subroutine in invert.c */
 int invert(double **, int);
 

imagery/i.smap/eigen.c

@@ -1,33 +0,0 @@
-#include <grass/gis.h>
-
-int eigen(
-	     /* Computes eigenvalues (and eigen vectors if desired) for      *
-	      *  symmetric matices.                                          */
-	     double **M,	/* Input matrix */
-	     double *lambda,	/* Output eigenvalues */
-	     int n		/* Input matrix dimension */
-    )
-{
-    int i, j;
-    double **a, *e;
-
-    a = G_alloc_matrix(n, n);
-    e = G_alloc_vector(n);
-
-    for (i = 0; i < n; i++)
-	for (j = 0; j < n; j++)
-	    a[i][j] = M[i][j];
-
-    G_tred2(a, n, lambda, e);
-    G_tqli(lambda, e, n, a);
-
-    /* Returns eigenvectors */
-    /*      for(i=0; i<n; i++) 
-       for(j=0; j<n; j++) 
-       M[i][j] = a[i][j]; */
-
-    G_free_matrix(a);
-    G_free_vector(e);
-
-    return 0;
-}

imagery/i.smap/invert.c

@@ -1,5 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
+#include <grass/gmath.h>
 
 int invert(
 	      /* inverts a matrix of arbitrary size input as a 2D array. */

imagery/i.smap/model.c

@@ -1,6 +1,7 @@
 #include <grass/gis.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
+#include <grass/gmath.h>
 #include "bouman.h"
 #include "region.h"
 
@@ -42,7 +43,7 @@ void extract_init(struct SigSet *S)
 		}
 
 	    /* Test for positive definite matrix */
-	    eigen(SubS->Rinv, lambda, nbands);
+	    eigen(SubS->Rinv, NULL, lambda, nbands);
 	    for (b1 = 0; b1 < nbands; b1++) {
 		if (lambda[b1] <= 0.0)
 		    G_warning(_("Nonpositive eigenvalues for class %d subclass %d"),

include/gisdefs.h

@@ -393,16 +393,6 @@ void G_initialize_done(int *);
 void G_init_counter(struct Counter *, int);
 int G_counter_next(struct Counter *);
 
-/* dalloc.c */
-double *G_alloc_vector(size_t);
-double **G_alloc_matrix(int, int);
-float *G_alloc_fvector(size_t);
-float **G_alloc_fmatrix(int, int);
-void G_free_vector(double *);
-void G_free_matrix(double **);
-void G_free_fvector(float *);
-void G_free_fmatrix(float **);
-
 /* date.c */
 const char *G_date(void);
 
@@ -430,10 +420,6 @@ double G_distance_point_to_line_segment(double, double, double, double,
 /* done_msg.c */
 void G_done_msg(const char *, ...) __attribute__ ((format(printf, 1, 2)));
 
-/* eigen_tools.c */
-int G_tqli(double[], double[], int, double **);
-void G_tred2(double **, int, double[], double[]);
-
 /* endian.c */
 int G_is_little_endian(void);
 
@@ -651,12 +637,6 @@ int G_command_history(struct History *);
 const char *G_home(void);
 const char *G__home(void);
 
-/* ialloc.c */
-int *G_alloc_ivector(size_t);
-int **G_alloc_imatrix(int, int);
-void G_free_ivector(int *);
-void G_free_imatrix(int **);
-
 /* index.c */
 char *G_index(const char *, int);
 char *G_rindex(const char *, int);
@@ -740,10 +720,6 @@ char **G__ls(const char *, int *);
 void G_ls(const char *, FILE *);
 void G_ls_format(char **, int, int, FILE *);
 
-/* lu.c */
-int G_ludcmp(double **, int, int *, double *);
-void G_lubksb(double **, int, int *, double[]);
-
 /* mach_name.c */
 const char *G__machine_name(void);
 
@@ -1097,11 +1073,6 @@ void G_str_to_lower(char *);
 int G_str_to_sql(char *);
 char *G_squeeze(char *);
 
-/* svd.c */
-int G_svdcmp(double **, int, int, double *, double **);
-int G_svbksb(double **, double[], double **, int, int, double[], double[]);
-int G_svelim(double *, int);
-
 /* system.c */
 int G_system(const char *);
 

include/gmath.h

@@ -68,4 +68,33 @@ int transpose(double[MX][MX], long);
 int mult(double *v1[2], int size1, double *v2[2], int size2, double *v3[2],
 	 int size3);
 
+/* dalloc.c */
+double *G_alloc_vector(size_t);
+double **G_alloc_matrix(int, int);
+float *G_alloc_fvector(size_t);
+float **G_alloc_fmatrix(int, int);
+void G_free_vector(double *);
+void G_free_matrix(double **);
+void G_free_fvector(float *);
+void G_free_fmatrix(float **);
+
+/* eigen_tools.c */
+int G_tqli(double[], double[], int, double **);
+void G_tred2(double **, int, double[], double[]);
+
+/* ialloc.c */
+int *G_alloc_ivector(size_t);
+int **G_alloc_imatrix(int, int);
+void G_free_ivector(int *);
+void G_free_imatrix(int **);
+
+/* lu.c */
+int G_ludcmp(double **, int, int *, double *);
+void G_lubksb(double **, int, int *, double[]);
+
+/* svd.c */
+int G_svdcmp(double **, int, int, double *, double **);
+int G_svbksb(double **, double[], double **, int, int, double[], double[]);
+int G_svelim(double *, int);
+
 #endif /* GMATH_H_ */

lib/gmath/eigen.c

@@ -43,9 +43,10 @@ int eigen(double **M,		/* Input matrix */
     G_tqli(lambda, e, n, a);
 
     /* Returns eigenvectors */
-    for (i = 0; i < n; i++)
-	for (j = 0; j < n; j++)
-	    Vectors[i][j] = a[i][j];
+    if (Vectors)
+	for (i = 0; i < n; i++)
+	    for (j = 0; j < n; j++)
+		Vectors[i][j] = a[i][j];
 
     G_free_matrix(a);
     G_free_vector(e);

lib/gmath/lu.c

@@ -1,5 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
+#include <grass/gmath.h>
 
 
 #define TINY 1.0e-20;

lib/gmath/svd.c

@@ -1,5 +1,6 @@
-#include <grass/gis.h>
 #include <math.h>
+#include <grass/gis.h>
+#include <grass/gmath.h>
 
 static double at, bt, ct;
 

lib/rst/interp_float/matrix.c

@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <grass/gis.h>
 #include <grass/interpf.h>
+#include <grass/gmath.h>
 
 int IL_matrix_create(struct interp_params *params, struct triple *points,	/* points for interpolation */
 		     int n_points,	/* number of points */

lib/rst/interp_float/ressegm2d.c

@@ -23,6 +23,7 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/interpf.h>
+#include <grass/gmath.h>
 
 static int input_data(struct interp_params *,
 		      int, int, struct fcell_triple *, int, int, int, int,

lib/rst/interp_float/segmen2d.c

@@ -8,8 +8,8 @@
 #include <math.h>
 #include <grass/gis.h>
 #include <grass/glocale.h>
-
 #include <grass/interpf.h>
+#include <grass/gmath.h>
 
 static double smallest_segment(struct multtree *, int);
 

raster/r.param.scale/process.c

@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 #include <grass/glocale.h>
+#include <grass/gmath.h>
 #include "param.h"
 #include "nrutil.h"
 

raster/r.resamp.rst/main.c

@@ -42,6 +42,7 @@
 #include "surf.h"
 #include <grass/interpf.h>
 #include <grass/glocale.h>
+#include <grass/gmath.h>
 
 static double /* pargr */ ns_res, ew_res, inp_ew_res, inp_ns_res;
 static int inp_rows, inp_cols;

vector/lidar/lidarlib/PolimiFunct.h

@@ -20,12 +20,12 @@
 #ifndef _POLIMIFUNCT_H_
 #define _POLIMIFUNCT_H_
 
+#include <grass/config.h>
 #include <grass/gis.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>
-#include <grass/config.h>
-
+#include <grass/gmath.h>
 
 /*----------------------------------------------------------------------------------------------------------*/
 /*CONSTANS DECLARATION */

vector/v.surf.rst/main.c

@@ -44,6 +44,7 @@
 #include <grass/qtree.h>
 #include "surf.h"
 #include <grass/dataquad.h>
+#include <grass/gmath.h>
 
 
 #define SCIK1 1			/*100000 */