Przeglądaj źródła

signature file precision enhanced

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@31802 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 17 lat temu
rodzic
commit
7bc94df43c

+ 2 - 2
imagery/i.cluster/print1.c

@@ -13,11 +13,11 @@ int print_band_means (FILE *fd, struct Cluster *C)
 	C->nbands, C->nbands == 1 ? "" : "s");
     fprintf (fd, _(" means  "));
     for (band = 0; band < C->nbands; band++)
-	fprintf (fd," %6.2f",C->band_sum[band]/C->npoints);
+	fprintf (fd," %g",C->band_sum[band]/C->npoints);
     fprintf (fd,"\n");
     fprintf (fd, _(" stddev "));
     for (band = 0; band < C->nbands; band++)
-	fprintf (fd, " %6.2f",
+	fprintf (fd, " %g",
 	    I_stddev(C->band_sum[band], C->band_sum2[band], C->npoints));
     fprintf (fd, "\n\n");
 

+ 2 - 2
imagery/i.cluster/print2.c

@@ -24,12 +24,12 @@ int print_class_means (FILE *fd, struct Cluster *C)
 	fprintf (fd, _("  means "));
 	if (n > 0)
 	    for (band = 0; band < C->nbands; band++)
-		fprintf (fd, " %6.2f", C->sum[band][c]/n);
+		fprintf (fd, " %g", C->sum[band][c]/n);
 	fprintf (fd, "\n");
 	fprintf (fd, _("  stddev"));
 	if (n > 1)
 	    for (band = 0; band < C->nbands; band++)
-		fprintf (fd, " %6.2f",
+		fprintf (fd, " %g",
 		    I_stddev(C->sum[band][c], C->sum2[band][c], n));
 	fprintf (fd, "\n");
     }

+ 1 - 1
imagery/i.cluster/print3.c

@@ -19,7 +19,7 @@ int print_seed_means (FILE *fd, struct Cluster *C)
     {
 	fprintf (fd, _("class %-3d "), c+1);
 	for (band = 0; band < C->nbands; band++)
-	    fprintf (fd, " %6.2f", C->mean[band][c]);
+	    fprintf (fd, " %g", C->mean[band][c]);
 	fprintf (fd, "\n");
     }
     fprintf (fd, "\n");

+ 3 - 3
lib/imagery/sig.c

@@ -134,16 +134,16 @@ int I_write_signatures (
 	fprintf (fd, "#%s\n", s->desc);
 	fprintf (fd, "%d\n", s->npoints);
 	for (i=0; i < S->nbands; i++)
-	    fprintf(fd, "%f ", s->mean[i]);
+	    fprintf(fd, "%g ", s->mean[i]);
 	fprintf (fd, "\n");
 	for (i=0; i < S->nbands; i++)
 	{
 	    for (n=0; n <= i; n++)
-		fprintf (fd, "%f ", s->var[i][n]);
+		fprintf (fd, "%g ", s->var[i][n]);
 	    fprintf (fd, "\n");
 	}
 	if (s->have_color)
-	    fprintf (fd, "%f %f %f\n", s->r, s->g, s->b);
+	    fprintf (fd, "%g %g %g\n", s->r, s->g, s->b);
     }
     return 1;
 }