[Teem-commit] SF.net SVN: teem:[5503] teem/trunk/src/nrrd

[<kin...@us...>]

Revision: 5503
          http://teem.svn.sourceforge.net/teem/?rev=5503&view=rev
Author:   kindlmann
Date:     2012-09-14 01:58:34 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
(not an API change since this didnt exist in the previous release) renaming nrrdMeasureCV -> nrrdMeasureCoV, and removing cv as an nrrdMeasure airEnum synonym for it; not its cov.  Also de-emphasized sd for standard deviation, using stdv instead.  No change in how both sd and stdv parse to nrrdMeasureSD

Modified Paths:
--------------
    teem/trunk/src/nrrd/enumsNrrd.c
    teem/trunk/src/nrrd/measure.c
    teem/trunk/src/nrrd/nrrdEnums.h

Modified: teem/trunk/src/nrrd/enumsNrrd.c
===================================================================
--- teem/trunk/src/nrrd/enumsNrrd.c	2012-09-12 21:35:59 UTC (rev 5502)
+++ teem/trunk/src/nrrd/enumsNrrd.c	2012-09-14 01:58:34 UTC (rev 5503)
@@ -851,8 +851,8 @@
   "RMS",
   "Linf",
   "variance",
-  "SD",
-  "CV",
+  "stdv",
+  "CoV",
   "skew",
   "line-slope",
   "line-intercept",
@@ -919,7 +919,7 @@
   "Linf",
   "variance", "var",
   "SD", "stdv",
-  "CV", "cov",
+  "cov",
   "skew", "skewness",
   "slope", "line-slope",
   "intc", "intercept", "line-intc", "line-intercept",
@@ -953,7 +953,7 @@
   nrrdMeasureLinf,
   nrrdMeasureVariance, nrrdMeasureVariance,
   nrrdMeasureSD, nrrdMeasureSD,
-  nrrdMeasureCV, nrrdMeasureCV,
+  nrrdMeasureCoV,
   nrrdMeasureSkew, nrrdMeasureSkew,
   nrrdMeasureLineSlope, nrrdMeasureLineSlope,
   nrrdMeasureLineIntercept, nrrdMeasureLineIntercept,

Modified: teem/trunk/src/nrrd/measure.c
===================================================================
--- teem/trunk/src/nrrd/measure.c	2012-09-12 21:35:59 UTC (rev 5502)
+++ teem/trunk/src/nrrd/measure.c	2012-09-14 01:58:34 UTC (rev 5503)
@@ -492,9 +492,9 @@
 }
 
 void
-_nrrdMeasureCV(void *ans, int ansType,
-               const void *line, int lineType, size_t len, 
-               double axmin, double axmax) {
+_nrrdMeasureCoV(void *ans, int ansType,
+                const void *line, int lineType, size_t len, 
+                double axmin, double axmax) {
   double val, S, M, (*lup)(const void*, size_t), diff, stdv;
   size_t ii, count;
 
@@ -1008,7 +1008,7 @@
   _nrrdMeasureLinf,
   _nrrdMeasureVariance,
   _nrrdMeasureSD,
-  _nrrdMeasureCV,
+  _nrrdMeasureCoV,
   _nrrdMeasureSkew,
   _nrrdMeasureLineSlope,
   _nrrdMeasureLineIntercept,
@@ -1054,7 +1054,7 @@
   case nrrdMeasureLinf:
   case nrrdMeasureVariance:
   case nrrdMeasureSD:
-  case nrrdMeasureCV:
+  case nrrdMeasureCoV:
   case nrrdMeasureSkew:
   case nrrdMeasureLineSlope:
   case nrrdMeasureLineIntercept:

Modified: teem/trunk/src/nrrd/nrrdEnums.h
===================================================================
--- teem/trunk/src/nrrd/nrrdEnums.h	2012-09-12 21:35:59 UTC (rev 5502)
+++ teem/trunk/src/nrrd/nrrdEnums.h	2012-09-14 01:58:34 UTC (rev 5503)
@@ -537,7 +537,7 @@
   nrrdMeasureLinf,           /* 12 */
   nrrdMeasureVariance,       /* 13 */
   nrrdMeasureSD,             /* 14: standard deviation */
-  nrrdMeasureCV,             /* 15: coefficient of variation */
+  nrrdMeasureCoV,            /* 15: coefficient of variation */
   nrrdMeasureSkew,           /* 16: skew */
   nrrdMeasureLineSlope,      /* 17: slope of line of best fit */
   nrrdMeasureLineIntercept,  /* 18: y-intercept of line of best fit */
@@ -562,14 +562,14 @@
 #define NRRD_MEASURE_DESC \
    "Possibilities include:\n " \
    "\b\bo \"min\", \"max\", \"mean\", \"median\", \"mode\", \"variance\", " \
-     "\"skew\"\n (self-explanatory)\n " \
+     "\"skew\": (self-explanatory)\n " \
    "\b\bo \"intc\", \"slope\", \"error\": " \
      "intercept, slope, and error from line fitting\n " \
-   "\b\bo \"sd\": standard deviation\n " \
-   "\b\bo \"cv\": coefficient of variation\n " \
+   "\b\bo \"stdv\": standard deviation\n " \
+   "\b\bo \"cov\": coefficient of variation\n " \
    "\b\bo \"product\", \"sum\": product or sum of all values\n " \
    "\b\bo \"L1\", \"L2\", \"NL2\", \"RMS\", \"Linf\": different norms\n " \
-   "\b\bo \"histo-min\",  \"histo-max\", \"histo-mean\", " \
+   "\b\bo \"histo-min\", \"histo-max\", \"histo-mean\"," \
      "\"histo-median\", \"histo-mode\", \"histo-product\", \"histo-l2\", " \
      "\"histo-sum\", \"histo-variance\", \"histo-sd\": same measures, " \
      "but for situations " \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.