r460: no message

[ctsim.git] / include / ctsupport.h

diff --git a/include/ctsupport.h b/include/ctsupport.h
index 9a9ca835303e465999a1d1f3534f141c18cdb1e6..d52c0830be799ba27329a63b9c2d890b6886a392 100644 (file)
--- a/include/ctsupport.h
+++ b/include/ctsupport.h
@@ -7,9 +7,9 @@
 **     Date Started:   Dec. 83
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsupport.h,v 1.18 2000/12/29 15:45:06 kevin Exp $
+**  $Id: ctsupport.h,v 1.23 2001/01/28 19:10:18 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -44,8 +44,15 @@
 #include <cstdlib>
 #include <cstring>
 #include <cstdarg>
-#include <vector>\r
-#include <algorithm>\r
+#include <string>
+#include <vector>
+#include <algorithm>
+
+#if defined(MSVC) || HAVE_SSTREAM
+#include <sstream>
+#else
+#include <sstream_subst>
+#endif
 
 #define TRUE   1
 #define FALSE  0
@@ -64,7 +71,7 @@
 
 /*----------------------------------------------------------------------*/
 
-#define ERR_TRACE -1\r
+#define ERR_TRACE -1
 #define ERR_WARNING    0
 #define ERR_SEVERE     1
 #define ERR_FATAL      2
@@ -184,12 +191,26 @@ template<class T>
 inline T nearest (double x)
 { return (x > 0 ? static_cast<T>(x+0.5) : static_cast<T>(x-0.5)); }
 
-inline int imax (int a, int b)\r
-{ return (a >= b ? a : b); }\r
-\r
-inline double dmax (double a, double b)\r
-{ return (a >= b ? a : b); }\r
-\r
+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<class T>
 inline T clamp (T value, T lowerBounds, T upperBounds)
 { return (value >= upperBounds ? upperBounds : (value <= lowerBounds ? lowerBounds : value )); }
@@ -237,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<double> vec, const int nPoints, double& min, double& max, double& mean, double& mode, double& median, double& stddev);\r
+void vectorNumericStatistics (std::vector<double> vec, const int nPoints, double& min, double& max, double& mean, double& mode, double& median, double& stddev);
 
 
 /*----------------------------------------------------------------------*/