r4228: Interpolation fixes

[ctsim.git] / include / ctsupport.h

diff --git a/include/ctsupport.h b/include/ctsupport.h
index b4063e30a56eccb2f26f47b2c38d318e5059ff28..4b42791df6b770ad0d93d3fc95c88dae17563c44 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.21 2001/01/02 07:47:36 kevin Exp $
+**  $Id: ctsupport.h,v 1.26 2003/03/23 18:37:42 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -43,19 +43,23 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <cstdarg>\r
+#include <cstdarg>
 #include <string>
-#include <vector>\r
-#include <algorithm>\r
+#include <vector>
+#include <algorithm>
 
-#if defined(MSVC) || HAVE_SSTREAM\r
+#if defined(MSVC) || HAVE_SSTREAM
 #include <sstream>
-#else\r
+#else
 #include <sstream_subst>
-#endif\r
+#endif
 
+#ifndef TRUE
 #define TRUE   1
+#endif
+#ifndef FALSE
 #define FALSE  0
+#endif
 #define OK     TRUE
 
 /*----------------------------------------------------------------------*/
@@ -71,7 +75,7 @@
 
 /*----------------------------------------------------------------------*/
 
-#define ERR_TRACE -1\r
+#define ERR_TRACE -1
 #define ERR_WARNING    0
 #define ERR_SEVERE     1
 #define ERR_FATAL      2
@@ -157,6 +161,7 @@ char *str_upper(char *str);
 void sys_error(int severity, const char *msg, ...);
 void sys_verror (std::string& strOutput, int severity, const char *msg, va_list arg);
 void sys_error_level(int severity);
+extern unsigned long int g_lSysErrorMaxCount;
 
 // Math Section
 
@@ -190,27 +195,31 @@ convertRadiansToDegrees (double x)
 template<class T>
 inline T nearest (double x)
 { return (x > 0 ? static_cast<T>(x+0.5) : static_cast<T>(x-0.5)); }
-\r
-inline bool isEven (int n)\r
-{ return (n % 2) == 0; }\r
-\r
-inline bool isOdd (int n)\r
-{ return (n % 2) != 0; }\r
-\r
-#if 0\r
-inline bool isEven (long n)\r
-{ return (n % 2) == 0; }\r
-\r
-inline bool isOdd (long n)\r
-{ return (n % 2) != 0; }\r
-#endif\r
-\r
-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
+
+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 )); }
@@ -258,7 +267,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);
 
 
 /*----------------------------------------------------------------------*/
@@ -295,8 +304,8 @@ unsigned int cio_kb_waitc(const char *astr, int beep);
 // ASCII Section
 
 #define BACKSPACE  8
-#define LF     0x0A
-#define CR     0x0D
+// #define LF  0x0A
+// #define CR  0x0D
 #define BELL   0x07
 
 #define SQUOTE    '\''