[GRASS-SVN] r54205 - in grass-addons/grass7/imagery/i.spec.unmix: . sample test
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Dec 5 06:25:58 PST 2012
Author: neteler
Date: 2012-12-05 06:25:57 -0800 (Wed, 05 Dec 2012)
New Revision: 54205
Added:
grass-addons/grass7/imagery/i.spec.unmix/README.txt
grass-addons/grass7/imagery/i.spec.unmix/mixed_pixels_spectrum.fig
grass-addons/grass7/imagery/i.spec.unmix/mixed_pixels_spectrum.png
grass-addons/grass7/imagery/i.spec.unmix/sample/
grass-addons/grass7/imagery/i.spec.unmix/sample/bdg_farben.col
grass-addons/grass7/imagery/i.spec.unmix/sample/diff_farben.col
grass-addons/grass7/imagery/i.spec.unmix/sample/diplom96.dat
grass-addons/grass7/imagery/i.spec.unmix/sample/diplom97.dat
grass-addons/grass7/imagery/i.spec.unmix/sample/noshadow.sh
grass-addons/grass7/imagery/i.spec.unmix/sample/run.sh
grass-addons/grass7/imagery/i.spec.unmix/sample/spectrum.dat
grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass.dat
grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass20.dat
grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass25.dat
grass-addons/grass7/imagery/i.spec.unmix/sample/xgobi_3d.png
grass-addons/grass7/imagery/i.spec.unmix/sample/xgobi_supersession.png
grass-addons/grass7/imagery/i.spec.unmix/test/Makefile
Removed:
grass-addons/grass7/imagery/i.spec.unmix/README
grass-addons/grass7/imagery/i.spec.unmix/bdg_farben.col
grass-addons/grass7/imagery/i.spec.unmix/color.sh
grass-addons/grass7/imagery/i.spec.unmix/diff_farben.col
grass-addons/grass7/imagery/i.spec.unmix/diplom96.dat
grass-addons/grass7/imagery/i.spec.unmix/diplom97.dat
grass-addons/grass7/imagery/i.spec.unmix/docu.lg
grass-addons/grass7/imagery/i.spec.unmix/kappa.1
grass-addons/grass7/imagery/i.spec.unmix/kappa.2
grass-addons/grass7/imagery/i.spec.unmix/kappa.3
grass-addons/grass7/imagery/i.spec.unmix/kappa.4
grass-addons/grass7/imagery/i.spec.unmix/makedocu.sh
grass-addons/grass7/imagery/i.spec.unmix/noshadow.sh
grass-addons/grass7/imagery/i.spec.unmix/region.unmix.txt
grass-addons/grass7/imagery/i.spec.unmix/run.sh
grass-addons/grass7/imagery/i.spec.unmix/spectrum.dat
grass-addons/grass7/imagery/i.spec.unmix/test/Gmakefile
grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass.dat
grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass20.dat
grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass25.dat
grass-addons/grass7/imagery/i.spec.unmix/unused/
Modified:
grass-addons/grass7/imagery/i.spec.unmix/
grass-addons/grass7/imagery/i.spec.unmix/Makefile
grass-addons/grass7/imagery/i.spec.unmix/histogram.c
grass-addons/grass7/imagery/i.spec.unmix/i.spec.unmix.html
grass-addons/grass7/imagery/i.spec.unmix/la_extra.c
grass-addons/grass7/imagery/i.spec.unmix/la_extra.h
grass-addons/grass7/imagery/i.spec.unmix/open.c
grass-addons/grass7/imagery/i.spec.unmix/open.h
grass-addons/grass7/imagery/i.spec.unmix/test/gmath_test.c
Log:
cleanup; +screenshots
Property changes on: grass-addons/grass7/imagery/i.spec.unmix
___________________________________________________________________
Added: svn:ignore
+ OBJ.*
*.tmp.html
Modified: grass-addons/grass7/imagery/i.spec.unmix/Makefile
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/Makefile 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/Makefile 2012-12-05 14:25:57 UTC (rev 54205)
@@ -2,10 +2,9 @@
PGM = i.spec.unmix
+LIBES = $(GISLIB) $(GMATHLIB) $(IMAGERYLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(GMATHDEP) $(IMAGERYDEP) $(RASTERDEP)
-LIBES = $(GISLIB) $(GMATHLIB) $(IMAGERYLIB) $(RASTERLIB)
-DEPENDENCIES= $(GISDEP) $(GMATHDEP) $(IMAGERYDEP) $(RASTERDEP)
-
include $(MODULE_TOPDIR)/include/Make/Module.make
default: cmd
Deleted: grass-addons/grass7/imagery/i.spec.unmix/README
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/README 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/README 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,6 +0,0 @@
-horizontal vector x vertical vector = a number
-vertical vector x horizontal vector = matrix
-matrix x vertical vector = vertical vector
-horizontal vector x matrix = horizontal vector
-matrix A x matrix B = matrix C
-matrix B x matrix A = matrix D
Copied: grass-addons/grass7/imagery/i.spec.unmix/README.txt (from rev 54194, grass-addons/grass7/imagery/i.spec.unmix/README)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/README.txt (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/README.txt 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,8 @@
+Hints for matrix algebra:
+
+- horizontal vector x vertical vector = a number
+- vertical vector x horizontal vector = matrix
+- matrix x vertical vector = vertical vector
+- horizontal vector x matrix = horizontal vector
+- matrix A x matrix B = matrix C
+- matrix B x matrix A = matrix D
Deleted: grass-addons/grass7/imagery/i.spec.unmix/bdg_farben.col
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/bdg_farben.col 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/bdg_farben.col 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,12 +0,0 @@
-0 0 0 0
-10% 0 51 0
-20% 0 100 0
-30% 0 170 0
-40% 0 170 0
-50% 140 200 0
-60% 160 220 0
-70% 50 230 50
-80% 30 255 80
-90% 150 255 150
-100% 0 255 0
-end
Deleted: grass-addons/grass7/imagery/i.spec.unmix/color.sh
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/color.sh 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/color.sh 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,5 +0,0 @@
-r.colors map=$1 col=rules 2>&1 > /dev/null << EOF
-0 0 0 0
-100 0 255 0
-end
-EOF
Deleted: grass-addons/grass7/imagery/i.spec.unmix/diff_farben.col
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/diff_farben.col 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/diff_farben.col 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,12 +0,0 @@
-0 0 0 0
-1% 0 0 0
-20% 0 100 0
-30% 0 170 0
-40% 100 200 0
-50% 250 250 0
-60% 240 220 0
-70% 255 220 0
-80% 255 180 0
-90% 255 130 0
-100% 255 0 0
-end
\ No newline at end of file
Deleted: grass-addons/grass7/imagery/i.spec.unmix/diplom96.dat
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/diplom96.dat 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/diplom96.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,12 +0,0 @@
-# Kanäle: r g b i1 i2 i3
-# Spektren zeilenweise eingeben!
-#
-# 0: Vegetation
-# 1: unbedeckter Boden
-# 2: ? im (Norden) Wald bei Bodenburg
-#
-# Zeilen, Spalten
-Matrix: 3 by 6
-row0: 0 4 0 83 20 0
-row1: 13 24 26 51 53 48
-row2: 5 5 11 41 32 21
Deleted: grass-addons/grass7/imagery/i.spec.unmix/diplom97.dat
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/diplom97.dat 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/diplom97.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,22 +0,0 @@
-# Kanäle: r g b i1 i2 i3
-# Spektren zeilenweise eingeben!
-#
-#3570637.5 5766432.58928571
-#3571837.5 5764210.76785714
-#3570962.5 5763711.48214286
-#3573662.5 5763287.08928571
-#3573112.5 5766058.125
-#
-# 0: Wasser ?
-# 1: Vegetation volles Wachstum
-# 2: Vegetation auflaufend
-# 3: unbedeckter Boden
-# 4: Boden/Vegetation?
-#
-# Zeilen, Spalten
-Matrix: 5 by 6
-row0: 0 0 0 14 7 0
-row1: 1 4 2 81 21 7
-row2: 1 5 4 52 35 8
-row3: 14 20 27 54 56 49
-row4: 2 3 5 33 40 22
Deleted: grass-addons/grass7/imagery/i.spec.unmix/docu.lg
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/docu.lg 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/docu.lg 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,17 +0,0 @@
-\subsection*{global.h}
-%< global.h
-
-\subsection*{open.c}
-%< open.c
-
-\subsection*{hist.c}
-%< hist.c
-
-\subsection*{histogram.c}
-%< histogram.c
-
-\subsection*{spec\underline{~}angle.c}
-%< spec_angle.c
-
-\subsection*{main.c}
-%< main.c
Modified: grass-addons/grass7/imagery/i.spec.unmix/histogram.c
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/histogram.c 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/histogram.c 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,5 +1,4 @@
#include <grass/gis.h>
-
#include <grass/raster.h>
int do_histogram(char *name, char *mapset)
Modified: grass-addons/grass7/imagery/i.spec.unmix/i.spec.unmix.html
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/i.spec.unmix.html 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/i.spec.unmix.html 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,80 +1,72 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>GRASS GIS manual: i.spec.unmix</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="grassdocs.css" type="text/css">
-</head>
-<body bgcolor="white">
+<h2>DESCRIPTION</h2>
-<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+<em>i.spec.unmix</em> is used to perform Spectral Unmixing.
-<h2>NAME</h2>
-<em><b>i.spec.unmix</b></em> - Perfroms Spectral mixture analysis of satellite/aerial images
-<h2>KEYWORDS</h2>
-imagery, spectral unmixing
-<h2>SYNOPSIS</h2>
-<b>i.spec.unmix</b><br>
-<b>i.spec.unmix help</b><br>
-<b>i.spec.unmix</b> <b>group</b>=<em>name</em> <b>matrix</b>=<em>string</em> [<b>result</b>=<em>string</em>] <b>error</b>=<em>name</em> <b>iter</b>=<em>name</em> [--<b>overwrite</b>] [--<b>verbose</b>] [--<b>quiet</b>]
+<!-- TODO: migrate text from Neteler et al 2005 to this manual -->
-<h3>Flags:</h3>
-<DL>
-<DT><b>--overwrite</b></DT>
-<DD>Allow output files to overwrite existing files</DD>
-<DT><b>--verbose</b></DT>
-<DD>Verbose module output</DD>
-<DT><b>--quiet</b></DT>
-<DD>Quiet module output</DD>
-</DL>
+<p>
+<center>
+<img src="mixed_pixels_spectrum.png" alt="Mixed pixels">Concept of mixed pixels (Landsat example)
+</center>
-<h3>Parameters:</h3>
-<DL>
-<DT><b>group</b>=<em>name</em></DT>
-<DD>Name of input imagery group</DD>
+<h2>EXAMPLES</h2>
-<DT><b>matrix</b>=<em>string</em></DT>
-<DD>Open Matrix file</DD>
-<DD>Matrix file containing spectral signatures</DD>
+<!-- see sample/run.sh, update to NC sample data set -->
-<DT><b>result</b>=<em>string</em></DT>
-<DD>Name of raster map prefix to hold spectral unmixing results</DD>
+<div class="code"><pre>
+g.region rast=lsat7_2002_10 -p
-<DT><b>error</b>=<em>name</em></DT>
-<DD>Name of raster map to hold unmixing error</DD>
+# Find pure endmembers, they are supposed to be in the corners of
+# the PCA feature space (or use spectral measurement data)
-<DT><b>iter</b>=<em>name</em></DT>
-<DD>Raster map to hold number of iterations</DD>
+i.pca -n input="lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70" out=pca_lsat7_2002
+d.correlate layer1=pca_lsat7_2002.1 layer2=pca_lsat7_2002.2
-</DL>
-<h2>DESCRIPTION</h2>
+# TODO: problem: how to obtain the unprojected coordinates for the corner pixels?
+# (in 1998 the xgobi software did this nicely, check today's ggobi)
-<p><em>i.spec.unmix</em> is used to Spectral Unmixing.
-<h2>EXAMPLES</h2>
+i.group group=lsat7_2002 subgroup=lsat7_2002 \
+ input=lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70
-<div class="code"><pre>
-TODO
+i.spec.unmix group=lsat7_2002 matrix=sample/spectrum.dat result=lsat7_2002_unmix \
+ error=lsat7_2002_unmix_err iter=lsat7_2002_unmix_iterations
+
+# todo: reclass to 0..100%
</pre></div>
<h2>REFERENCES</h2>
-Neteler, M. (1999): Spectral Mixture Analysis von Satellitendaten zur Bestimmung von Bodenbedeckungsgraden im Hinblick auf die Erosionsmodellierung. M.Sc. thesis, University of Hannover.
+<ul>
+<li> Neteler, M. (1999): Spectral Mixture Analysis von Satellitendaten zur
+Bestimmung von Bodenbedeckungsgraden im Hinblick auf die
+Erosionsmodellierung. M.Sc. thesis, University of Hannover.</li>
+<li> Neteler, M., D. Grasso, I. Michelazzi, L. Miori, S. Merler, and
+C. Furlanello. New image processing tools for GRASS. In Proc.
+Free/Libre and Open Source Software for Geoinformatics:
+GIS-GRASS Users Conference 2004, Sept. 12-14, Bangkok, Thailand,
+2004. http://gisws.media.osaka-cu.ac.jp/grass04/viewabstract.php?id=37 (PDF)</li>
+<li> Neteler, M., D. Grasso, I. Michelazzi, L. Miori, S. Merler,
+and C. Furlanello, 2005. An integrated toolbox for image registration,
+fusion and classification. International Journal of Geoinformatics.
+Special Issue on FOSS/GRASS 2004 and GIS-IDEAS 2004, 1(1), pp. 51-61,
+March 2005.</li>
-Neteler, M., D. Grasso, I. Michelazzi, L. Miori, S. Merler, and C. Furlanello. New image processing tools for GRASS. In Proc. Free/Libre and Open Source Software for Geoinformatics: GIS-GRASS Users Conference 2004, Sept. 12-14, Bangkok, Thailand, 2004. http://gisws.media.osaka-cu.ac.jp/grass04/viewabstract.php?id=37 (PDF)
+<h2>SEE ALSO</h2>
-Neteler, M., D. Grasso, I. Michelazzi, L. Miori, S. Merler, and C. Furlanello, 2005. An integrated toolbox for image registration, fusion and classification. International Journal of Geoinformatics. Special Issue on FOSS/GRASS 2004 and GIS-IDEAS 2004, 1(1), pp. 51-61, March 2005.
+i.spec.sam
-<h2>SEE ALSO</h2>
+http://www.research.att.com/~andreas/xgobi/
+http://www.public.iastate.edu/~dicook/xgobi-book/xgobi.html
+
+http://lib.stat.cmu.edu/general/XGobi/
+
<h2>AUTHOR</h2>
-Markus Neteler, University of Hannover.
+Markus Neteler, University of Hannover, 1999
+<p>
+Mohammed Rashad (rashadkm gmail.com) (update to GRASS 7)
<p>
<i>Last changed: $Date$</i>
-<HR>
-<P><a href="index.html">Main index</a> - <a href="imagery.html">imagery index</a> - <a href="full_index.html">Full index</a></P>
-<P>© 2003-2011 <a href="http://grass.osgeo.org">GRASS Development Team</a></p>
-</body>
-</html>
Deleted: grass-addons/grass7/imagery/i.spec.unmix/kappa.1
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/kappa.1 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/kappa.1 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,40 +0,0 @@
- ACCURACY ASSESSMENT
-LOCATION: geosum Fri Jan 29 17:07:20 1999
-MASK: wrede_maske in geosum, categories 1
-MAPS: MAP1 = Reclass of bdg_wrede in geosum (bdg_wrede.recl in geosum)
- MAP2 = Reclass of unmix97.1 in geosum (unmix971.recl in geosum)
-
-Error Matrix
-Panel #1 of 1
- MAP1
- cat# 13 38 63 88 Row Sum
- M 13 59856 104 0 0 59960
- A 38 4758 0 0 0 4758
- P 63 76177 81545 0 0 157722
- 2 88 53421 6876 0 0 60297
-Col Sum 194212 88525 0 0 282737
-
-
-Cats % Commission % Ommission Estimated Kappa
-13 99.826551 30.819929 0.994460
-38 0.000000 0.000000 -0.455816
-63 NA NA NA
-88 NA NA NA
-
-Kappa Kappa Variance
-0.071564 0.000000
-
-Obs Correct Total Obs % Observed Correct
-59856 282737 21.170204
-
-MAP1 Category Description
-13: (no description)
-38: (no description)
-63: (no description)
-88: (no description)
-
-MAP2 Category Description
-13: (no description)
-38: (no description)
-63: (no description)
-88: (no description)
Deleted: grass-addons/grass7/imagery/i.spec.unmix/kappa.2
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/kappa.2 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/kappa.2 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,40 +0,0 @@
- ACCURACY ASSESSMENT
-LOCATION: geosum Fri Jan 29 17:06:25 1999
-MASK: wrede_maske in geosum, categories 1
-MAPS: MAP1 = Reclass of bdg_wrede in geosum (bdg_wrede.recl in geosum)
- MAP2 = Reclass of unmix97.2 in geosum (unmix972.recl in geosum)
-
-Error Matrix
-Panel #1 of 1
- MAP1
- cat# 13 38 63 88 Row Sum
- M 13 53797 5965 198 0 59960
- A 38 3318 1145 295 0 4758
- P 63 5922 39483 112317 0 157722
- 2 88 13404 24993 17702 4198 60297
-Col Sum 76441 71586 130512 4198 282737
-
-
-Cats % Commission % Ommission Estimated Kappa
-13 89.721481 70.377154 0.859129
-38 24.064733 1.599475 -0.016794
-63 71.212006 86.058753 0.465303
-88 6.962204 100.000000 0.055600
-
-Kappa Kappa Variance
-0.419272 0.000017
-
-Obs Correct Total Obs % Observed Correct
-171457 282737 60.641869
-
-MAP1 Category Description
-13: (no description)
-38: (no description)
-63: (no description)
-88: (no description)
-
-MAP2 Category Description
-13: (no description)
-38: (no description)
-63: (no description)
-88: (no description)
Deleted: grass-addons/grass7/imagery/i.spec.unmix/kappa.3
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/kappa.3 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/kappa.3 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,89 +0,0 @@
- ACCURACY ASSESSMENT
-LOCATION: geosum Thu Jan 28 11:43:43 1999
-MASK: feldmaske in geosum, categories 1
-MAPS: MAP1 = Reclass of rfn95 in geosum (bodenbedeckungsgrad95 in geosum)
- MAP2 = Reclass of unmix.3 in geosum (unmix3.recl in geosum)
-
-Error Matrix
-Panel #1 of 2
- MAP1
- cat# -1 0 2 5 10 20 30 40 50
- M -1 0 0 0 0 0 0 570 5755 4
- A 0 0 0 0 0 0 1 197 3297 1
- P 2 0 0 0 0 0 0 0 226 0
- 2 5 0 0 0 0 2 6 58 3892 0
- 10 0 0 0 0 0 0 30 184 0
- 20 0 0 0 0 0 0 0 0 0
- 30 0 0 0 0 0 0 0 0 0
- 40 0 0 0 0 0 0 0 0 0
- 50 0 0 0 0 0 0 33 314 0
- 70 0 0 0 0 0 4 964 8291 5
- 90 0 0 0 0 0 0 44 118 0
- 100 0 0 0 0 2 35 588 2632 0
-Col Sum 0 0 0 0 4 46 2484 24709 10
-
-Panel #2 of 2
- MAP1
- cat# 70 90 100 Row Sum
- M -1 0 0 0 6329
- A 0 0 0 0 3496
- P 2 0 0 0 226
- 2 5 0 0 0 3958
- 10 0 0 0 214
- 20 0 0 0 0
- 30 0 0 0 0
- 40 0 0 0 0
- 50 0 0 0 347
- 70 0 0 0 9264
- 90 0 0 0 162
- 100 0 0 0 3257
-Col Sum 0 0 0 27253
-
-
-Cats % Commission % Ommission Estimated Kappa
--1 0.000000 NaN -999.000000
-0 NA NA NA
-2 NA NA NA
-5 NA NA NA
-10 0.000000 0.000000 -0.000147
-20 NA NA NA
-30 NA NA NA
-40 NA NA NA
-50 0.000000 0.000000 -0.000367
-70 NA NA NA
-90 NA NA NA
-100 NA NA NA
-
-Kappa Kappa Variance
--0.000006 0.000000
-
-Obs Correct Total Obs % Observed Correct
-0 27253 0.000000
-
-MAP1 Category Description
--1: no data
-0: % Bodenbedeckungsgrad
-2: % Bodenbedeckungsgrad
-5: % Bodenbedeckungsgrad
-10: % Bodenbedeckungsgrad
-20: (no description)
-30: (no description)
-40: (no description)
-50: % Bodenbedeckungsgrad
-70: % Bodenbedeckungsgrad
-90: % Bodenbedeckungsgrad
-100: % Bodenbedeckungsgrad
-
-MAP2 Category Description
--1: (no description)
-0: (no description)
-2: (no description)
-5: (no description)
-10: (no description)
-20: (no description)
-30: (no description)
-40: (no description)
-50: (no description)
-70: (no description)
-90: (no description)
-100: (no description)
Deleted: grass-addons/grass7/imagery/i.spec.unmix/kappa.4
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/kappa.4 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/kappa.4 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,40 +0,0 @@
- ACCURACY ASSESSMENT
-LOCATION: geosum Fri Jan 29 17:06:18 1999
-MASK: wrede_maske in geosum, categories 1
-MAPS: MAP1 = Reclass of bdg_wrede in geosum (bdg_wrede.recl in geosum)
- MAP2 = Reclass of unmix97.4 in geosum (unmix974.recl in geosum)
-
-Error Matrix
-Panel #1 of 1
- MAP1
- cat# 13 38 63 88 Row Sum
- M 13 7292 32193 20124 351 59960
- A 38 1224 1951 1534 49 4758
- P 63 153501 4052 169 0 157722
- 2 88 51002 8270 1025 0 60297
-Col Sum 213019 46466 22852 400 282737
-
-
-Cats % Commission % Ommission Estimated Kappa
-13 12.161441 3.423169 -2.562238
-38 41.004624 4.198769 0.294024
-63 0.107151 0.739541 -0.086765
-88 0.000000 0.000000 -0.001417
-
-Kappa Kappa Variance
--0.220489 -0.000001
-
-Obs Correct Total Obs % Observed Correct
-9412 282737 3.328889
-
-MAP1 Category Description
-13: (no description)
-38: (no description)
-63: (no description)
-88: (no description)
-
-MAP2 Category Description
-13: (no description)
-38: (no description)
-63: (no description)
-88: (no description)
Modified: grass-addons/grass7/imagery/i.spec.unmix/la_extra.c
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/la_extra.c 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/la_extra.c 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,14 +1,10 @@
+/* TODO: move to GMATHLIB? */
-
#include <stdio.h> /* needed here for ifdef/else */
#include <stdlib.h>
#include <string.h>
#include <math.h>
-
-/********
- ******** only compile this LAPACK/BLAS wrapper file if g2c.h is present!
- ********/
#include <grass/config.h>
#include <grass/gis.h>
@@ -207,8 +203,8 @@
if (out == NULL)
out = G_vec_get(vec1->dim);
+ //G_vec_print(vec2, "vec2");
-
if (out->dim != vec1->dim)
out = G_vec_resize(out, vec1->dim);
@@ -248,12 +244,10 @@
if (!out) {
G_fatal_error("mv_mltsss3(error)");
- exit(1);
out = G_vec_get2(A->rows, out);
}
if (out->dim != A->rows) {
G_fatal_error("mv_mlt3(error)");
- exit(1);
out = G_vec_resize(out, A->rows);
}
@@ -283,9 +277,6 @@
}
-
-
-
VEC *G_vec_resize(VEC * in, int size)
{
@@ -341,7 +332,7 @@
}
vector->dim = vector->max_dim = size;
-
+ //G_vec_print(vector, "vector");
return vector;
}
@@ -363,7 +354,7 @@
}
vector->dim = vector->max_dim = size;
-
+ //G_vec_print(vector, "vector");
return vector;
}
Modified: grass-addons/grass7/imagery/i.spec.unmix/la_extra.h
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/la_extra.h 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/la_extra.h 2012-12-05 14:25:57 UTC (rev 54205)
@@ -11,7 +11,6 @@
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);
@@ -19,7 +18,6 @@
void G_vec_print(VEC * vector, const char *name);
VEC *G_vec_resize(VEC * in, int size);
-
VEC *v_sub(VEC * vec1, VEC * vec2, VEC * out);
VEC *mv_mlt(mat_struct * A, VEC * b, VEC * out);
mat_struct *sm_mlt(double scalar, mat_struct * matrix, mat_struct * out);
Deleted: grass-addons/grass7/imagery/i.spec.unmix/makedocu.sh
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/makedocu.sh 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/makedocu.sh 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,4 +0,0 @@
-lgrind -e docu.lg > docu_ispecunmix.tex
-#latex docu_ispecunmix.tex
-rm -rf OBJ.linux statistics.txt *.aux *.log *.idx
-mv docu_ispecunmix.tex ../..
Added: grass-addons/grass7/imagery/i.spec.unmix/mixed_pixels_spectrum.fig
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/mixed_pixels_spectrum.fig (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/mixed_pixels_spectrum.fig 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,225 @@
+#FIG 3.2 Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4
+100.00
+Single
+-2
+1200 2
+6 1453 3340 1911 3737
+6 1453 3340 1911 3737
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 1453 3737 1453 3340
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 1453 3737 1911 3737
+-6
+3 2 0 1 0 7 0 0 -1 0.000 0 0 0 4
+ 1458 3620 1529 3574 1702 3523 1891 3503
+ 0.000 -1.000 -1.000 0.000
+-6
+6 1956 2774 2394 3152
+6 1956 2774 2394 3152
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 1956 3152 1956 2774
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 1956 3152 2394 3152
+-6
+3 2 0 1 0 7 0 0 -1 0.000 0 0 0 6
+ 1956 3108 2029 3070 2063 3099 2136 2856 2292 2861 2369 2963
+ 0.000 -1.000 -1.000 -1.000 -1.000 0.000
+-6
+6 2645 2248 3061 2607
+6 2645 2248 3061 2607
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2645 2607 2645 2248
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2645 2607 3061 2607
+-6
+3 2 0 1 0 7 0 0 -1 0.000 0 0 0 4
+ 2650 2436 2797 2543 2881 2589 3024 2607
+ 0.000 -1.000 -1.000 0.000
+-6
+6 4507 2247 4903 2591
+6 4507 2247 4903 2591
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 4507 2591 4507 2247
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 4507 2591 4903 2591
+-6
+3 2 0 1 0 7 0 0 -1 0.000 0 0 0 6
+ 4507 2533 4542 2515 4573 2538 4683 2331 4744 2353 4876 2485
+ 0.000 -1.000 -1.000 -1.000 -1.000 0.000
+-6
+6 2835 1395 4545 1845
+2 3 0 1 0 30 50 0 20 0.000 0 0 -1 0 0 5
+ 3685 1630 4281 1629 4010 1845 3430 1845 3685 1630
+2 3 0 1 0 30 50 0 20 0.000 0 0 -1 0 0 5
+ 3384 1434 3925 1435 3693 1623 3126 1623 3384 1434
+2 3 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+ 3930 1435 4524 1434 4290 1626 3699 1626 3930 1435
+2 3 0 1 0 5 50 0 20 0.000 0 0 -1 0 0 5
+ 3130 1625 3695 1625 3435 1845 2835 1845 3130 1625
+-6
+6 2835 1260 4545 1710
+2 3 0 1 0 4 50 0 20 0.000 0 0 -1 0 0 5
+ 3685 1456 4281 1455 4010 1671 3430 1671 3685 1456
+2 3 0 1 0 28 50 0 20 0.000 0 0 -1 0 0 5
+ 3384 1260 3925 1261 3693 1449 3126 1449 3384 1260
+2 3 0 1 0 31 50 0 20 0.000 0 0 -1 0 0 5
+ 3930 1261 4524 1260 4290 1452 3699 1452 3930 1261
+2 3 0 1 0 1 50 0 20 0.000 0 0 -1 0 0 5
+ 3130 1451 3695 1451 3435 1671 2835 1671 3130 1451
+-6
+6 2835 1080 4545 1530
+2 3 0 1 0 4 50 0 20 0.000 0 0 -1 0 0 5
+ 3685 1276 4281 1275 4010 1491 3430 1491 3685 1276
+2 3 0 1 0 2 50 0 20 0.000 0 0 -1 0 0 5
+ 3384 1080 3925 1081 3693 1269 3126 1269 3384 1080
+2 3 0 1 0 4 50 0 20 0.000 0 0 -1 0 0 5
+ 3930 1081 4524 1080 4290 1272 3699 1272 3930 1081
+2 3 0 1 0 25 50 0 20 0.000 0 0 -1 0 0 5
+ 3130 1271 3695 1271 3435 1491 2835 1491 3130 1271
+-6
+6 2835 900 4545 1350
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 3240 1215 3240 1125
+2 3 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+ 3685 1096 4281 1095 4010 1311 3430 1311 3685 1096
+2 3 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+ 3130 1091 3695 1091 3435 1311 2835 1311 3130 1091
+2 3 0 1 0 17 50 0 20 0.000 0 0 -1 0 0 5
+ 3384 900 3925 901 3693 1089 3126 1089 3384 900
+2 3 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+ 3930 901 4524 900 4290 1092 3699 1092 3930 901
+-6
+6 2745 720 4545 1170
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 3240 1035 3240 945
+2 3 0 1 0 4 50 0 20 0.000 0 0 -1 0 0 5
+ 3662 916 4258 915 3987 1131 3407 1131 3662 916
+2 3 0 1 0 2 50 0 20 0.000 0 0 -1 0 0 5
+ 3361 720 3902 721 3670 909 3103 909 3361 720
+2 3 0 1 0 2 50 0 20 0.000 0 0 -1 0 0 5
+ 3907 721 4501 720 4267 912 3676 912 3907 721
+2 3 0 1 0 3 50 0 20 0.000 0 0 -1 0 0 5
+ 3107 911 3672 911 3412 1131 2812 1131 3107 911
+4 0 0 0 0 4 6 0.0000 0 75 60 2745 990 1\001
+4 0 0 0 0 4 6 0.0000 0 75 60 2745 1170 2\001
+-6
+6 2835 540 4545 990
+2 3 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+ 3130 731 3695 731 3435 951 2835 951 3130 731
+2 3 0 1 0 17 50 0 20 0.000 0 0 -1 0 0 5
+ 3384 540 3925 541 3693 729 3126 729 3384 540
+2 3 0 1 0 9 50 0 20 0.000 0 0 -1 0 0 5
+ 3685 736 4281 735 4010 951 3430 951 3685 736
+2 3 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 5
+ 3930 541 4524 540 4290 732 3699 732 3930 541
+-6
+6 5040 900 5670 1215
+4 0 0 0 0 4 9 0.0000 0 105 555 5040 1035 Satellite\001
+4 0 0 0 0 4 9 0.0000 0 105 630 5040 1215 channels\001
+-6
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2949 4004 4254 2699
+2 3 0 1 0 2 50 0 20 0.000 0 0 -1 0 0 5
+ 2844 3434 4097 2931 4487 3164 3227 3726 2844 3434
+2 3 0 1 0 1 50 0 30 0.000 0 0 -1 0 0 10
+ 4493 3171 4748 3194 4883 3201 4088 3996 3863 3996 3525 3891
+ 4380 3486 4110 3329 4485 3164 4493 3171
+2 3 0 1 0 6 50 0 20 0.000 0 0 -1 0 0 9
+ 2423 3419 2491 3426 2671 3441 2843 3434 3241 3719 2956 4004
+ 1823 4004 2408 3419 2423 3419
+2 3 0 1 0 5 50 0 30 0.000 0 0 -1 0 0 5
+ 3533 3899 3870 4004 2543 3996 3233 3711 3533 3899
+2 3 0 1 0 4 50 0 24 0.000 0 0 -1 0 0 5
+ 4125 3336 4373 3486 3525 3884 3233 3719 4125 3336
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
+ 3 0 1.00 60.00 120.00
+ 2430 2947 3202 3450
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
+ 3 0 1.00 60.00 120.00
+ 3075 2437 3375 2977
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
+ 3 0 1.00 60.00 120.00
+ 1945 3544 2380 3709
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 3240 1755 3240 1665
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 3240 1575 3240 1485
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 3240 1395 3240 1305
+2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
+ 4476 2212 4942 2212 4942 2617 4476 2617 4476 2212
+2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
+ 1402 3315 1935 3315 1935 3780 1402 3780 1402 3315
+2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
+ 1905 2745 2430 2745 2430 3187 1905 3187 1905 2745
+2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
+ 2587 2220 3075 2220 3075 2647 2587 2647 2587 2220
+2 3 0 1 0 0 0 0 20 0.000 0 0 -1 0 0 8
+ 3550 2262 3799 2138 4048 2262 3923 2262 3923 2386 3675 2386
+ 3675 2262 3550 2262
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 0 2
+ 3 0 1.00 60.00 120.00
+ 4710 2625 4657 2925
+2 3 0 1 0 29 100 0 20 0.000 0 0 -1 0 0 5
+ 1824 4004 3129 2699 5379 2699 4074 4004 1824 4004
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2655 585 3240 855
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 1 2
+ 3 1 1.00 60.00 120.00
+ 3 1 1.00 60.00 120.00
+ 2942 4068 4082 4068
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 1 1 2
+ 3 1 1.00 60.00 120.00
+ 3 1 1.00 60.00 120.00
+ 4872 3288 4177 4003
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2148 689 2586 689
+2 2 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 5
+ 2099 270 2648 270 2648 855 2099 855 2099 270
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2274 687 2274 732
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2491 687 2491 732
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2555 687 2555 732
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2424 687 2424 732
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2356 687 2356 732
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2202 687 2202 732
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2150 689 2150 311
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 6
+ 2155 505 2235 425 2345 505 2415 475 2480 595 2561 648
+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
+ 2500 3322 4755 3322
+3 3 0 1 0 13 50 0 20 0.000 0 0 0 9
+ 3069 2887 3069 2842 3159 2797 3339 2797 3519 2842 3609 2932
+ 3474 3067 3294 3022 3069 2977
+ -1.000 -1.000 -1.000 -1.000 -1.000 -1.000 -1.000 -1.000
+ -1.000
+4 0 0 0 0 4 8 5.9341 0 75 75 2439 3770 a\001
+4 0 0 0 0 4 8 5.9341 0 75 75 3959 3191 c\001
+4 0 0 0 0 4 8 5.9341 0 105 45 3195 3905 f\001
+4 0 0 0 0 4 8 5.9341 0 105 75 3784 3642 d\001
+4 0 0 0 0 4 8 5.9341 0 105 75 4391 2884 g\001
+4 0 0 0 0 4 8 5.9341 0 105 75 3164 2936 b\001
+4 0 0 0 0 4 8 5.9341 0 75 75 4270 3654 e\001
+4 0 0 0 0 4 6 0.0000 0 75 60 2745 1350 3\001
+4 0 0 0 0 4 6 0.0000 0 75 60 2745 1530 4\001
+4 0 0 0 0 4 6 0.0000 0 75 60 2745 1710 5\001
+4 0 0 0 0 4 6 0.0000 0 75 60 2745 1890 6\001
+4 0 0 0 0 4 9 0.0000 0 105 765 945 2880 continuous\001
+4 0 0 0 0 4 9 0.0000 0 135 630 5040 3240 complete\001
+4 0 0 0 0 4 9 0.0000 0 135 945 5040 3420 ground signal\001
+4 0 0 0 0 4 8 0.0000 0 90 270 3427 4208 30m\001
+4 0 0 0 0 4 8 0.8378 0 90 270 4534 3839 30m\001
+4 0 0 0 0 4 6 0.0000 0 75 540 2150 818 1 2 3 4 5 6\001
+4 0 0 0 0 4 9 0.0000 0 135 1005 945 3060 Object spectra\001
+4 0 0 0 0 4 9 0.0000 0 135 1080 945 675 mixed spectrum\001
+4 0 0 0 0 4 9 0.0000 0 105 540 945 495 discrete\001
Added: grass-addons/grass7/imagery/i.spec.unmix/mixed_pixels_spectrum.png
===================================================================
(Binary files differ)
Property changes on: grass-addons/grass7/imagery/i.spec.unmix/mixed_pixels_spectrum.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Deleted: grass-addons/grass7/imagery/i.spec.unmix/noshadow.sh
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/noshadow.sh 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/noshadow.sh 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,8 +0,0 @@
- r.mapcalc unmix1_noshade = "(unmix.1/(unmix.1-unmix.3)) + unmix.1"
- r.mapcalc unmix2_noshade = "(unmix.2/(unmix.2-unmix.3)) + unmix.2"
-cat unmix_reclass25.dat |r.reclass i=unmix1_noshade o=unmix1_noshade.recl
-cat unmix_reclass25.dat |r.reclass i=unmix2_noshade o=unmix2_noshade.recl
-cat unmix_reclass25.dat |r.reclass i=bodenbedeckungsgrad95 o=bdgrad95.recl
-r.kappa -mwz classification=unmix1_noshade.recl reference=bdgrad95.recl output=kappa.1
-r.kappa -mwz classification=unmix2_noshade.recl reference=bdgrad95.recl output=kappa.2
-textedit kappa.1&textedit kappa.2&
Modified: grass-addons/grass7/imagery/i.spec.unmix/open.c
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/open.c 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/open.c 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,4 +1,4 @@
-/* Spextral unmixing with Singular Value Decomposition */
+/* Spextral unmixing */
/* (c) 15. Jan. 1999 Markus Neteler, Hannover */
/* Cited references are from
@@ -210,7 +210,6 @@
}
-
/* open files for results */
result_cell = (CELL **) G_malloc(Ref.nfiles * sizeof(CELL *));
resultfd = (int *)G_malloc(Ref.nfiles * sizeof(int));
@@ -249,8 +248,6 @@
iter_cell = Rast_allocate_c_buf();
}
-
-
/* give back number of output files (= Ref.nfiles) */
return A;
}
Property changes on: grass-addons/grass7/imagery/i.spec.unmix/open.h
___________________________________________________________________
Added: svn:mime-type
+ text/x-chdr
Added: svn:eol-style
+ native
Deleted: grass-addons/grass7/imagery/i.spec.unmix/region.unmix.txt
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/region.unmix.txt 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/region.unmix.txt 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,10 +0,0 @@
-projection: 99 (Transverse Mercator)
-zone: 0
-north: 5767525
-south: 5763000
-east: 3574025
-west: 3569500
-nsres: 25
-ewres: 25
-rows: 181
-cols: 181
Deleted: grass-addons/grass7/imagery/i.spec.unmix/run.sh
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/run.sh 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/run.sh 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,17 +0,0 @@
-i.spec.unmix gr=96corr err=error97 iter=iter97 res=unmix97 mat=diplom97.dat
-cat unmix_reclass25.dat |r.reclass i=unmix97.1 o=unmix971.recl
-cat unmix_reclass25.dat |r.reclass i=unmix97.2 o=unmix972.recl
-cat unmix_reclass25.dat |r.reclass i=bdg_wrede o=bdg_wrede.recl
-
-cat unmix_reclass25.dat |r.reclass i=unmix97.3 o=unmix973.recl
-cat unmix_reclass25.dat |r.reclass i=unmix97.4 o=unmix974.recl
-cat unmix_reclass25.dat |r.reclass i=unmix97.5 o=unmix975.recl
-#cat unmix_reclass25.dat |r.reclass i=unmix.6 o=unmix6.recl
-
-r.kappa -mwz classification=unmix971.recl reference=bdg_wrede.recl output=kappa.1
-r.kappa -mwz classification=unmix972.recl reference=bdg_wrede.recl output=kappa.2
-#r.kappa -mwz classification=unmix3.recl reference=bodenbedeckungsgrad95 output=kappa.3
-#r.kappa -mwz classification=unmix4.recl reference=bodenbedeckungsgrad95 output=kappa.4
-#r.kappa -mwz classification=unmix5.recl reference=bodenbedeckungsgrad95 output=kappa.5
-#r.kappa -mwz classification=unmix6.recl reference=bodenbedeckungsgrad95 output=kappa.6
-textedit kappa.1&textedit kappa.2&
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/bdg_farben.col (from rev 54185, grass-addons/grass7/imagery/i.spec.unmix/bdg_farben.col)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/bdg_farben.col (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/bdg_farben.col 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,12 @@
+0 0 0 0
+10% 0 51 0
+20% 0 100 0
+30% 0 170 0
+40% 0 170 0
+50% 140 200 0
+60% 160 220 0
+70% 50 230 50
+80% 30 255 80
+90% 150 255 150
+100% 0 255 0
+end
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/diff_farben.col (from rev 54185, grass-addons/grass7/imagery/i.spec.unmix/diff_farben.col)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/diff_farben.col (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/diff_farben.col 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,12 @@
+0 0 0 0
+1% 0 0 0
+20% 0 100 0
+30% 0 170 0
+40% 100 200 0
+50% 250 250 0
+60% 240 220 0
+70% 255 220 0
+80% 255 180 0
+90% 255 130 0
+100% 255 0 0
+end
\ No newline at end of file
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/diplom96.dat (from rev 54185, grass-addons/grass7/imagery/i.spec.unmix/diplom96.dat)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/diplom96.dat (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/diplom96.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,12 @@
+# Channels: r g b i1 i2 i3
+# Enter spectra linewise!
+#
+# 0: Vegetation
+# 1: Bare soil
+# 2: unidentified spectrum
+#
+# Rows, Columns
+Matrix: 3 by 6
+row0: 0 4 0 83 20 0
+row1: 13 24 26 51 53 48
+row2: 5 5 11 41 32 21
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/diplom97.dat (from rev 54185, grass-addons/grass7/imagery/i.spec.unmix/diplom97.dat)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/diplom97.dat (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/diplom97.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,22 @@
+# Channels: r g b i1 i2 i3
+# Enter spectra linewise!
+#
+#3570637.5 5766432.58928571
+#3571837.5 5764210.76785714
+#3570962.5 5763711.48214286
+#3573662.5 5763287.08928571
+#3573112.5 5766058.125
+#
+# 0: Water ?
+# 1: Vegetation fully emerged
+# 2: Vegetation growing (young)
+# 3: Bare soil
+# 4: Soil/Vegetation?
+#
+# Rows, Columns
+Matrix: 5 by 6
+row0: 0 0 0 14 7 0
+row1: 1 4 2 81 21 7
+row2: 1 5 4 52 35 8
+row3: 14 20 27 54 56 49
+row4: 2 3 5 33 40 22
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/noshadow.sh (from rev 54186, grass-addons/grass7/imagery/i.spec.unmix/noshadow.sh)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/noshadow.sh (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/noshadow.sh 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,9 @@
+r.mapcalc unmix1_noshade = "(unmix.1/(unmix.1-unmix.3)) + unmix.1"
+r.mapcalc unmix2_noshade = "(unmix.2/(unmix.2-unmix.3)) + unmix.2"
+cat unmix_reclass25.dat |r.reclass i=unmix1_noshade o=unmix1_noshade.recl
+cat unmix_reclass25.dat |r.reclass i=unmix2_noshade o=unmix2_noshade.recl
+cat unmix_reclass25.dat |r.reclass i=degree_soilcover95 o=bdgrad95.recl
+r.kappa -mwz classification=unmix1_noshade.recl reference=bdgrad95.recl output=kappa.1
+r.kappa -mwz classification=unmix2_noshade.recl reference=bdgrad95.recl output=kappa.2
+textedit kappa.1 &
+textedit kappa.2 &
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/run.sh (from rev 54186, grass-addons/grass7/imagery/i.spec.unmix/run.sh)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/run.sh (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/run.sh 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,18 @@
+i.spec.unmix gr=96corr err=error97 iter=iter97 res=unmix97 mat=diplom97.dat
+cat unmix_reclass25.dat |r.reclass i=unmix97.1 o=unmix971.recl
+cat unmix_reclass25.dat |r.reclass i=unmix97.2 o=unmix972.recl
+cat unmix_reclass25.dat |r.reclass i=bdg_wrede o=bdg_wrede.recl
+
+cat unmix_reclass25.dat |r.reclass i=unmix97.3 o=unmix973.recl
+cat unmix_reclass25.dat |r.reclass i=unmix97.4 o=unmix974.recl
+cat unmix_reclass25.dat |r.reclass i=unmix97.5 o=unmix975.recl
+#cat unmix_reclass25.dat |r.reclass i=unmix.6 o=unmix6.recl
+
+r.kappa -mwz classification=unmix971.recl reference=bdg_wrede.recl output=kappa.1
+r.kappa -mwz classification=unmix972.recl reference=bdg_wrede.recl output=kappa.2
+#r.kappa -mwz classification=unmix3.recl reference=degree_soilcover95 output=kappa.3
+#r.kappa -mwz classification=unmix4.recl reference=degree_soilcover95 output=kappa.4
+#r.kappa -mwz classification=unmix5.recl reference=degree_soilcover95 output=kappa.5
+#r.kappa -mwz classification=unmix6.recl reference=degree_soilcover95 output=kappa.6
+textedit kappa.1 &
+textedit kappa.2 &
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/spectrum.dat (from rev 54185, grass-addons/grass7/imagery/i.spec.unmix/spectrum.dat)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/spectrum.dat (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/spectrum.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,12 @@
+# Channels: r g b i1 i2 i3
+# Enter spectra linewise!
+# 1. Sagebrush
+# 2. Saltbush
+# 3. Soil
+# 4. Dry grass
+#
+Matrix: 4 by 6
+row0: 8.87 13.14 11.71 35.85 28.26 10.54
+row1: 13.59 20.12 19.61 70.66 34.82 16.35
+row2: 28.26 34.82 38.27 40.1 38.27 23.7
+row3: 10.54 16.35 23.7 38.98 40.1 38.98
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass.dat (from rev 54185, grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass.dat)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass.dat (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,10 @@
+1 thru 10 = 10
+11 thru 20 = 20
+21 thru 30 = 30
+31 thru 40 = 40
+41 thru 50 = 50
+51 thru 60 = 60
+61 thru 70 = 70
+71 thru 80 = 80
+81 thru 90 = 90
+91 thru 100 = 100
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass20.dat (from rev 54185, grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass20.dat)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass20.dat (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass20.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,5 @@
+0 thru 20 = 10
+21 thru 40 = 30
+41 thru 60 = 50
+61 thru 80 = 70
+81 thru 100 = 90
Copied: grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass25.dat (from rev 54185, grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass25.dat)
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass25.dat (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/sample/unmix_reclass25.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,4 @@
+0 thru 25 = 13
+26 thru 50 = 38
+51 thru 75 = 63
+76 thru 100 = 88
Added: grass-addons/grass7/imagery/i.spec.unmix/sample/xgobi_3d.png
===================================================================
(Binary files differ)
Property changes on: grass-addons/grass7/imagery/i.spec.unmix/sample/xgobi_3d.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass-addons/grass7/imagery/i.spec.unmix/sample/xgobi_supersession.png
===================================================================
(Binary files differ)
Property changes on: grass-addons/grass7/imagery/i.spec.unmix/sample/xgobi_supersession.png
___________________________________________________________________
Added: svn:mime-type
+ image/gif
Deleted: grass-addons/grass7/imagery/i.spec.unmix/spectrum.dat
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/spectrum.dat 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/spectrum.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,12 +0,0 @@
-# Kanäle: r g b i1 i2 i3
-# Spektren zeilenweise eingeben!
-# 1. Sagebrush
-# 2. Saltbush
-# 3. Boden
-# 4. Trockengras
-#
-Matrix: 4 by 6
-row0: 8.87 13.14 11.71 35.85 28.26 10.54
-row1: 13.59 20.12 19.61 70.66 34.82 16.35
-row2: 28.26 34.82 38.27 40.1 38.27 23.7
-row3: 10.54 16.35 23.7 38.98 40.1 38.98
Deleted: grass-addons/grass7/imagery/i.spec.unmix/test/Gmakefile
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/test/Gmakefile 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/test/Gmakefile 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,18 +0,0 @@
-
-OFILES = \
- gmath_test.o
-
-
-PROGS = gmath_test
-G2C = -lg2c
-LA = -lblas -llapack
-
-all: $(PROGS)
-
-gmath_test: gmath_test.o
- $(CC) $(LDFLAGS) -o $@ $< $(LA) $(G2C) \
- $(GMATHLIB) $(GISLIB) $(MATHLIB) $(XDRLIB)
-
-
-$(GISLIB): #
-$(GMATHLIB): #
Added: grass-addons/grass7/imagery/i.spec.unmix/test/Makefile
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/test/Makefile (rev 0)
+++ grass-addons/grass7/imagery/i.spec.unmix/test/Makefile 2012-12-05 14:25:57 UTC (rev 54205)
@@ -0,0 +1,17 @@
+MODULE_TOPDIR = ../../..
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+LIBES = $(GISLIB) $(GMATHLIB)
+DEPENDENCIES = $(GISDEP) $(GMATHDEP)
+
+PGM = gmath_test
+
+default: $(ETC)/$(PGM)
+
+$(ETC)/$(PGM): gmath_test.c
+ $(CC) -c $<
+ $(CC) -o $(ETC)/$(PGM) $<
+
+clean:
+ \rm -f $(ETC)/$(PGM) gmath_test.o
Modified: grass-addons/grass7/imagery/i.spec.unmix/test/gmath_test.c
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/test/gmath_test.c 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/test/gmath_test.c 2012-12-05 14:25:57 UTC (rev 54205)
@@ -3,8 +3,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "gis.h"
-#include "la.h"
+#include <grass/gis.h>
+#include "../la_extra.h"
int main(int argc, char *argv[]) {
Property changes on: grass-addons/grass7/imagery/i.spec.unmix/test/gmath_test.c
___________________________________________________________________
Added: svn:mime-type
+ text/x-csrc
Added: svn:eol-style
+ native
Deleted: grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass.dat
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass.dat 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,10 +0,0 @@
-1 thru 10 = 10
-11 thru 20 = 20
-21 thru 30 = 30
-31 thru 40 = 40
-41 thru 50 = 50
-51 thru 60 = 60
-61 thru 70 = 70
-71 thru 80 = 80
-81 thru 90 = 90
-91 thru 100 = 100
Deleted: grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass20.dat
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass20.dat 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass20.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,5 +0,0 @@
-0 thru 20 = 10
-21 thru 40 = 30
-41 thru 60 = 50
-61 thru 80 = 70
-81 thru 100 = 90
Deleted: grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass25.dat
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass25.dat 2012-12-05 14:15:27 UTC (rev 54204)
+++ grass-addons/grass7/imagery/i.spec.unmix/unmix_reclass25.dat 2012-12-05 14:25:57 UTC (rev 54205)
@@ -1,4 +0,0 @@
-0 thru 25 = 13
-26 thru 50 = 38
-51 thru 75 = 63
-76 thru 100 = 88
More information about the grass-commit
mailing list