X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fctsupport.h;h=dbf7dec7529c0b7a07e1db8a010428d46d5876d8;hb=e98a8a9d72a7b919debbbc9d1b0f237fe71c0fb3;hp=c933488a4b92c3071f92cc83ddfe15c8f559ecc2;hpb=aa41f74ce0ec15bc7952ed9da629dbe294429a61;p=ctsim.git

diff --git a/include/ctsupport.h b/include/ctsupport.h
index c933488..dbf7dec 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.14 2000/12/17 23:09:46 kevin Exp $
+**  $Id: ctsupport.h,v 1.24 2001/02/02 00:46:38 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -44,6 +44,15 @@
 #include <cstdlib>
 #include <cstring>
 #include <cstdarg>
+#include <string>
+#include <vector>
+#include <algorithm>
+
+#if defined(MSVC) || HAVE_SSTREAM
+#include <sstream>
+#else
+#include <sstream_subst>
+#endif
 
 #define TRUE	1
 #define FALSE	0
@@ -62,6 +71,7 @@
 
 /*----------------------------------------------------------------------*/
 
+#define ERR_TRACE -1
 #define ERR_WARNING	0
 #define ERR_SEVERE	1
 #define ERR_FATAL	2
@@ -145,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
@@ -181,12 +191,30 @@ 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); }
-
+template<class T>
+inline T maxValue (T x, T y)
+{ return (x > y ? x : y); }
+
+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 )); }
@@ -234,6 +262,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);
 
 
 /*----------------------------------------------------------------------*/