[GRASS-SVN] r44964 - grass/trunk/raster/r.kappa

[svn_grass at osgeo.org]

Author: mmetz
Date: 2011-01-11 10:34:06 -0800 (Tue, 11 Jan 2011)
New Revision: 44964

Modified:
   grass/trunk/raster/r.kappa/prt_mat.c
   grass/trunk/raster/r.kappa/stats.c
Log:
rows and cols for stats were swapped

Modified: grass/trunk/raster/r.kappa/prt_mat.c
===================================================================
--- grass/trunk/raster/r.kappa/prt_mat.c	2011-01-11 18:31:08 UTC (rev 44963)
+++ grass/trunk/raster/r.kappa/prt_mat.c	2011-01-11 18:34:06 UTC (rev 44964)
@@ -76,6 +76,7 @@
 	    for (k = 0; k < ncat; k++)
 		if (rlst[k] == Gstats[i].cats[1])
 		    break;
+	    /* matrix: reference in columns, classification in rows */
 	    matr[j * ncat + k] = Gstats[i].count;
 	}
 
@@ -132,7 +133,7 @@
 		}
 		fprintf(fd, "\n");
 	    }
-	    /* marginal summation of columes */
+	    /* column marginal summation */
 	    fprintf(fd, "Col Sum\t\t");
 	    for (cndx = first_col; cndx < last_col; cndx++) {
 		t_col = 0;

Modified: grass/trunk/raster/r.kappa/stats.c
===================================================================
--- grass/trunk/raster/r.kappa/stats.c	2011-01-11 18:31:08 UTC (rev 44963)
+++ grass/trunk/raster/r.kappa/stats.c	2011-01-11 18:34:06 UTC (rev 44964)
@@ -46,8 +46,8 @@
     argv[argc++] = "fs=:";
 
     sprintf(buf, "input=%s,%s",
-	    G_fully_qualified_name(maps[0], mmapset),
-	    G_fully_qualified_name(maps[1], rmapset));
+	    G_fully_qualified_name(maps[1], mmapset),
+	    G_fully_qualified_name(maps[0], rmapset));
     argv[argc++] = buf;
 
     argv[argc++] = SF_REDIRECT_FILE;