[GRASS-SVN] r43815 - grass/trunk/raster/r.univar
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Oct 7 06:47:17 EDT 2010
Author: mmetz
Date: 2010-10-07 10:47:17 +0000 (Thu, 07 Oct 2010)
New Revision: 43815
Modified:
grass/trunk/raster/r.univar/r.univar_main.c
grass/trunk/raster/r.univar/r3.univar_main.c
grass/trunk/raster/r.univar/stats.c
Log:
format comments, add author
Modified: grass/trunk/raster/r.univar/r.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r.univar_main.c 2010-10-07 10:45:22 UTC (rev 43814)
+++ grass/trunk/raster/r.univar/r.univar_main.c 2010-10-07 10:47:17 UTC (rev 43815)
@@ -6,6 +6,7 @@
* Copyright (C) 2004-2006 by the GRASS Development Team
* Author(s): Hamish Bowman, University of Otago, New Zealand
* Extended stats: Martin Landa
+ * Zonal stats: Markus Metz
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
@@ -125,8 +126,8 @@
if (strcmp(zone_info.sep, "comma") == 0)
zone_info.sep = ",";
- zone_info.min = 0.0 / 0.0; /*set to nan as default */
- zone_info.max = 0.0 / 0.0; /*set to nan as default */
+ zone_info.min = 0.0 / 0.0; /* set to nan as default */
+ zone_info.max = 0.0 / 0.0; /* set to nan as default */
zone_info.n_zones = 0;
fdz = -1;
Modified: grass/trunk/raster/r.univar/r3.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r3.univar_main.c 2010-10-07 10:45:22 UTC (rev 43814)
+++ grass/trunk/raster/r.univar/r3.univar_main.c 2010-10-07 10:47:17 UTC (rev 43815)
@@ -8,6 +8,7 @@
* Based on r.univar from Hamish Bowman, University of Otago, New Zealand
* and Martin Landa
* heapsort code from http://de.wikipedia.org/wiki/Heapsort
+ * Zonal stats: Markus Metz
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
@@ -110,10 +111,10 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- /*Set the defaults */
+ /* Set the defaults */
G3d_initDefaults();
- /*get the current region */
+ /* get the current region */
G3d_getWindow(®ion);
cols = region.cols;
@@ -138,10 +139,10 @@
if (strcmp(zone_info.sep, "comma") == 0)
zone_info.sep = ",";
- dmin = 0.0 / 0.0; /*set to nan as default */
- dmax = 0.0 / 0.0; /*set to nan as default */
- zone_info.min = 0.0 / 0.0; /*set to nan as default */
- zone_info.max = 0.0 / 0.0; /*set to nan as default */
+ dmin = 0.0 / 0.0; /* set to nan as default */
+ dmax = 0.0 / 0.0; /* set to nan as default */
+ zone_info.min = 0.0 / 0.0; /* set to nan as default */
+ zone_info.max = 0.0 / 0.0; /* set to nan as default */
zone_info.n_zones = 0;
/* open 3D zoning raster with default region */
@@ -185,7 +186,7 @@
use_zone = 1;
}
- /*Open 3D input raster with default region */
+ /* Open 3D input raster with default region */
infile = param.inputfile->answer;
if (NULL == G_find_grid3(infile, ""))
@@ -211,7 +212,7 @@
}
}
- for (z = 0; z < depths; z++) { /*From the bottom to the top */
+ for (z = 0; z < depths; z++) { /* From the bottom to the top */
if (!(param.shell_style->answer))
G_percent(z, depths - 1, 10);
for (y = 0; y < rows; y++) {
Modified: grass/trunk/raster/r.univar/stats.c
===================================================================
--- grass/trunk/raster/r.univar/stats.c 2010-10-07 10:45:22 UTC (rev 43814)
+++ grass/trunk/raster/r.univar/stats.c 2010-10-07 10:47:17 UTC (rev 43815)
@@ -113,7 +113,7 @@
char sum_str[100];
double mean, variance, stdev, var_coef;
- /*for extendet stats */
+ /* for extendet stats */
double quartile_25 = 0.0, quartile_75 = 0.0, *quartile_perc;
double median = 0.0;
unsigned int i;
@@ -349,7 +349,7 @@
char sum_str[100];
double mean, variance, stdev, var_coef;
- /*for extendet stats */
+ /* for extendet stats */
double quartile_25 = 0.0, quartile_75 = 0.0, *quartile_perc;
double median = 0.0;
int qpos_25, qpos_75, *qpos_perc;
More information about the grass-commit
mailing list