X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fctsupport.h;h=d843a085b9cb899eb3936e42c1711f7c2d9fb723;hp=b4063e30a56eccb2f26f47b2c38d318e5059ff28;hb=c00c639073653fac7463a88f2b000f263236550d;hpb=23b7ef994fc5d95fcca6d4ae69abbd5971101262 diff --git a/include/ctsupport.h b/include/ctsupport.h index b4063e3..d843a08 100644 --- a/include/ctsupport.h +++ b/include/ctsupport.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsupport.h,v 1.21 2001/01/02 07:47:36 kevin Exp $ +** $Id: ctsupport.h,v 1.22 2001/01/02 16:02:12 kevin Exp $ ** ** ** This program is free software; you can redistribute it and/or modify @@ -43,16 +43,16 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include -#if defined(MSVC) || HAVE_SSTREAM +#if defined(MSVC) || HAVE_SSTREAM #include -#else +#else #include -#endif +#endif #define TRUE 1 #define FALSE 0 @@ -71,7 +71,7 @@ /*----------------------------------------------------------------------*/ -#define ERR_TRACE -1 +#define ERR_TRACE -1 #define ERR_WARNING 0 #define ERR_SEVERE 1 #define ERR_FATAL 2 @@ -190,27 +190,27 @@ convertRadiansToDegrees (double x) template inline T nearest (double x) { return (x > 0 ? static_cast(x+0.5) : static_cast(x-0.5)); } - -inline bool isEven (int n) -{ return (n % 2) == 0; } - -inline bool isOdd (int n) -{ return (n % 2) != 0; } - -#if 0 -inline bool isEven (long n) -{ return (n % 2) == 0; } - -inline bool isOdd (long n) -{ return (n % 2) != 0; } -#endif - -inline int imax (int a, int b) -{ return (a >= b ? a : b); } - -inline double dmax (double a, double b) -{ return (a >= b ? a : b); } - + +inline bool isEven (int n) +{ return (n % 2) == 0; } + +inline bool isOdd (int n) +{ return (n % 2) != 0; } + +#if 0 +inline bool isEven (long n) +{ return (n % 2) == 0; } + +inline bool isOdd (long n) +{ return (n % 2) != 0; } +#endif + +inline int imax (int a, int b) +{ return (a >= b ? a : b); } + +inline double dmax (double a, double b) +{ return (a >= b ? a : b); } + template inline T clamp (T value, T lowerBounds, T upperBounds) { return (value >= upperBounds ? upperBounds : (value <= lowerBounds ? lowerBounds : value )); } @@ -258,7 +258,7 @@ void scale2d (double x[], double y[], int pts, double xfact, double yfact); // mathfuncs.cpp double normalizeAngle (double theta); double integrateSimpson (const double xmin, const double xmax, const double *y, const int np); -void vectorNumericStatistics (std::vector vec, const int nPoints, double& min, double& max, double& mean, double& mode, double& median, double& stddev); +void vectorNumericStatistics (std::vector vec, const int nPoints, double& min, double& max, double& mean, double& mode, double& median, double& stddev); /*----------------------------------------------------------------------*/