[GRASS-SVN] r54181 - grass-addons/grass6/imagery/i.spec.unmix
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Dec 4 09:47:16 PST 2012
Author: neteler
Date: 2012-12-04 09:47:15 -0800 (Tue, 04 Dec 2012)
New Revision: 54181
Modified:
grass-addons/grass6/imagery/i.spec.unmix/la_extra.h
grass-addons/grass6/imagery/i.spec.unmix/main.c
grass-addons/grass6/imagery/i.spec.unmix/open.c
grass-addons/grass6/imagery/i.spec.unmix/spec_angle.c
Log:
attempts to make code compilable
Modified: grass-addons/grass6/imagery/i.spec.unmix/la_extra.h
===================================================================
--- grass-addons/grass6/imagery/i.spec.unmix/la_extra.h 2012-12-04 17:37:01 UTC (rev 54180)
+++ grass-addons/grass6/imagery/i.spec.unmix/la_extra.h 2012-12-04 17:47:15 UTC (rev 54181)
@@ -11,10 +11,10 @@
int G_matrix_read2(FILE * fp, mat_struct * out);
void G_matrix_print2(mat_struct * mt, const char *name);
vec_struct *G_matvect_get_column2(mat_struct * mt, int col);
+vec_struct *G_vector_product(vec_struct *, vec_struct *);
-
VEC *G_vec_get(int size);
VEC *G_vec_get2(int size, VEC * vector);
void G_vec_print(VEC * vector, const char *name);
Modified: grass-addons/grass6/imagery/i.spec.unmix/main.c
===================================================================
--- grass-addons/grass6/imagery/i.spec.unmix/main.c 2012-12-04 17:37:01 UTC (rev 54180)
+++ grass-addons/grass6/imagery/i.spec.unmix/main.c 2012-12-04 17:47:15 UTC (rev 54181)
@@ -29,6 +29,7 @@
#include "global.h"
#include "la_extra.h"
+#include "open.h"
#define GAMMA 10 /* last row value in Matrix and last b vector element
Modified: grass-addons/grass6/imagery/i.spec.unmix/open.c
===================================================================
--- grass-addons/grass6/imagery/i.spec.unmix/open.c 2012-12-04 17:37:01 UTC (rev 54180)
+++ grass-addons/grass6/imagery/i.spec.unmix/open.c 2012-12-04 17:47:15 UTC (rev 54181)
@@ -14,8 +14,8 @@
#include <grass/gmath.h>
#include <grass/glocale.h>
#include "global.h"
+#include "la_extra.h"
-
int open_files(char *matrixfile,
char *img_grp,
char *iter_name, char *error_name, mat_struct * A)
Modified: grass-addons/grass6/imagery/i.spec.unmix/spec_angle.c
===================================================================
--- grass-addons/grass6/imagery/i.spec.unmix/spec_angle.c 2012-12-04 17:37:01 UTC (rev 54180)
+++ grass-addons/grass6/imagery/i.spec.unmix/spec_angle.c 2012-12-04 17:47:15 UTC (rev 54181)
@@ -9,6 +9,7 @@
#include <math.h>
#include <grass/gmath.h>
#include "global.h"
+#include "la_extra.h"
/* input mat_struct A, vec_struct Avector1, Avector2
@@ -38,7 +39,7 @@
/* multiply one A column with second */
// vtmp1 = G_vector_init (0, 0, RVEC);
- vtmp1 = G_vector_product(Avector1, Avector2, vtmp1);
+ vtmp1 = G_vector_product(Avector1, Avector2);
norm1 = G_vector_norm1(vtmp1); /* calculate 1-norm */
norm2 = G_vector_norm_euclid(Avector1); /* calculate 2-norm (Euclidean) */
norm3 = G_vector_norm_euclid(Avector2); /* calculate 2-norm (Euclidean) */
More information about the grass-commit
mailing list