X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fctsupport.h;h=d52c0830be799ba27329a63b9c2d890b6886a392;hp=460af416de8c3d04a4b1ac7ec187a40598a32fc1;hb=9f29c8b32c972db1178d6f8551d5cd57ceb67083;hpb=f7d2b7144f32a7bd157b7689022e62944b82fcc1

diff --git a/include/ctsupport.h b/include/ctsupport.h
index 460af41..d52c083 100644
--- 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.16 2000/12/21 03:40:58 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>
-#include <algorithm>
+#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,6 +71,7 @@
 
 /*----------------------------------------------------------------------*/
 
+#define ERR_TRACE -1
 #define ERR_WARNING	0
 #define ERR_SEVERE	1
 #define ERR_FATAL	2
@@ -147,7 +155,7 @@ char *str_upper(char *str);
 
 /* syserror.cpp */
 void sys_error(int severity, const char *msg, ...);
-void sys_verror(int severity, const char *msg, va_list arg);
+void sys_verror (std::string& strOutput, int severity, const char *msg, va_list arg);
 void sys_error_level(int severity);
 
 // Math Section
@@ -183,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)
-{ 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<class T>
 inline T clamp (T value, T lowerBounds, T upperBounds)
 { return (value >= upperBounds ? upperBounds : (value <= lowerBounds ? lowerBounds : value )); }
@@ -236,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);
+void vectorNumericStatistics (std::vector<double> vec, const int nPoints, double& min, double& max, double& mean, double& mode, double& median, double& stddev);
 
 
 /*----------------------------------------------------------------------*/