Changeset 1342
- Timestamp:
- Jul 29, 2004, 1:34:28 PM (22 years ago)
- Location:
- trunk/psLib
- Files:
-
- 7 edited
-
src/dataManip/psFunctions.c (modified) (2 diffs)
-
src/dataManip/psFunctions.h (modified) (2 diffs)
-
src/math/psPolynomial.c (modified) (2 diffs)
-
src/math/psPolynomial.h (modified) (2 diffs)
-
src/math/psSpline.c (modified) (2 diffs)
-
src/math/psSpline.h (modified) (2 diffs)
-
test/dataManip/tst_psFunc01.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/dataManip/psFunctions.c
r1341 r1342 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2004-07-29 2 2:44:34 $9 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2004-07-29 23:34:24 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 80 80 float mean, 81 81 float sigma, 82 intnormal)82 bool normal) 83 83 { 84 84 float tmp = 1.0; 85 85 86 if (normal == 1) {86 if (normal == true) { 87 87 #ifdef DARWIN 88 88 tmp = 1.0 / (float)sqrt(2.0 * M_PI * (sigma * sigma)); -
trunk/psLib/src/dataManip/psFunctions.h
r1341 r1342 12 12 * @author George Gusciora, MHPCC 13 13 * 14 * @version $Revision: 1.1 0$ $Name: not supported by cvs2svn $15 * @date $Date: 2004-07-29 2 2:44:34 $14 * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2004-07-29 23:34:24 $ 16 16 * 17 17 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 34 34 float mean, ///< Mean for the Gaussian 35 35 float stddev, ///< Standard deviation for the Gaussian 36 intnormal ///< Indicates whether result should be normalized36 bool normal ///< Indicates whether result should be normalized 37 37 ); 38 38 -
trunk/psLib/src/math/psPolynomial.c
r1341 r1342 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2004-07-29 2 2:44:34 $9 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2004-07-29 23:34:24 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 80 80 float mean, 81 81 float sigma, 82 intnormal)82 bool normal) 83 83 { 84 84 float tmp = 1.0; 85 85 86 if (normal == 1) {86 if (normal == true) { 87 87 #ifdef DARWIN 88 88 tmp = 1.0 / (float)sqrt(2.0 * M_PI * (sigma * sigma)); -
trunk/psLib/src/math/psPolynomial.h
r1341 r1342 12 12 * @author George Gusciora, MHPCC 13 13 * 14 * @version $Revision: 1.1 0$ $Name: not supported by cvs2svn $15 * @date $Date: 2004-07-29 2 2:44:34 $14 * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2004-07-29 23:34:24 $ 16 16 * 17 17 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 34 34 float mean, ///< Mean for the Gaussian 35 35 float stddev, ///< Standard deviation for the Gaussian 36 intnormal ///< Indicates whether result should be normalized36 bool normal ///< Indicates whether result should be normalized 37 37 ); 38 38 -
trunk/psLib/src/math/psSpline.c
r1341 r1342 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.1 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2004-07-29 2 2:44:34 $9 * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2004-07-29 23:34:24 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 80 80 float mean, 81 81 float sigma, 82 intnormal)82 bool normal) 83 83 { 84 84 float tmp = 1.0; 85 85 86 if (normal == 1) {86 if (normal == true) { 87 87 #ifdef DARWIN 88 88 tmp = 1.0 / (float)sqrt(2.0 * M_PI * (sigma * sigma)); -
trunk/psLib/src/math/psSpline.h
r1341 r1342 12 12 * @author George Gusciora, MHPCC 13 13 * 14 * @version $Revision: 1.1 0$ $Name: not supported by cvs2svn $15 * @date $Date: 2004-07-29 2 2:44:34 $14 * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2004-07-29 23:34:24 $ 16 16 * 17 17 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 34 34 float mean, ///< Mean for the Gaussian 35 35 float stddev, ///< Standard deviation for the Gaussian 36 intnormal ///< Indicates whether result should be normalized36 bool normal ///< Indicates whether result should be normalized 37 37 ); 38 38 -
trunk/psLib/test/dataManip/tst_psFunc01.c
r1073 r1342 26 26 27 27 for (x = 0.0 ; x < (MY_MEAN * 2.0) ; x+= 1.0) { 28 printf("normal psGaussian(%f) is %f\n", x, psGaussian(x, MY_MEAN, MY_STDEV, 1));28 printf("normal psGaussian(%f) is %f\n", x, psGaussian(x, MY_MEAN, MY_STDEV, true)); 29 29 x = x + 1.0; 30 30 } 31 31 32 32 for (x = 0.0 ; x < (MY_MEAN * 2.0) ; x+= 1.0) { 33 printf("NON-normal psGaussian(%f) is %f\n", x, psGaussian(x, MY_MEAN, MY_STDEV, 0));33 printf("NON-normal psGaussian(%f) is %f\n", x, psGaussian(x, MY_MEAN, MY_STDEV, false)); 34 34 x = x + 1.0; 35 35 }
Note:
See TracChangeset
for help on using the changeset viewer.
