Changeset 4162 for trunk/psLib/src/dataManip/psStats.c
- Timestamp:
- Jun 8, 2005, 1:40:46 PM (21 years ago)
- File:
-
- 1 edited
-
trunk/psLib/src/dataManip/psStats.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/dataManip/psStats.c
r4138 r4162 14 14 * stats->binsize 15 15 * 16 * @version $Revision: 1.13 1$ $Name: not supported by cvs2svn $17 * @date $Date: 2005-06-0 7 23:11:54$16 * @version $Revision: 1.132 $ $Name: not supported by cvs2svn $ 17 * @date $Date: 2005-06-08 23:40:45 $ 18 18 * 19 19 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 878 878 } else { 879 879 countFloat = (psF32)countInt; 880 stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));880 stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); 881 881 } 882 882 } … … 992 992 // data ranges are used correctly. 993 993 if (errors != NULL) { 994 stats->sampleStdev = (1.0 / PS_SQRT_F32(errorDivisor));994 stats->sampleStdev = (1.0 / sqrtf(errorDivisor)); 995 995 } else { 996 996 countFloat = (psF32)countInt; 997 stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));997 stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); 998 998 999 999 } … … 1627 1627 } 1628 1628 } 1629 myStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));1629 myStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); 1630 1630 1631 1631 p_psNormalizeVectorRangeF32(robustHistogramVector, 0.0, 1.0); … … 1657 1657 "WARNING: failed fit a 1D polynomial.\n"); 1658 1658 } 1659 psF32 polyFitSigma = PS_SQRT_F32(-0.5 / tmpPoly->coeff[2]);1659 psF32 polyFitSigma = sqrtf(-0.5 / tmpPoly->coeff[2]); 1660 1660 psF32 polyFitMean = tmpPoly->coeff[1] * PS_SQR(polyFitSigma); 1661 1661 // psF32 polyFitNorm = exp(tmpPoly->coedd[0] + PS_SQR(polyFitMean) / (2.0 * PS_SQR(polyFitSigma)));
Note:
See TracChangeset
for help on using the changeset viewer.
