X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fctsupport.h;h=84eef25d596938d97f3a9fd29665468280966ec8;hp=617554362cfffb3e78f9b65d7f7430a9cc3a988a;hb=7ec2cd66921180a624813dff9f8bac76c6b268cc;hpb=484b9ac2ebf8f88dbe36bdc1d3a9c1b6a2b242eb

diff --git a/include/ctsupport.h b/include/ctsupport.h
index 6175543..84eef25 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.12 2000/12/16 03:29:02 kevin Exp $
+**  $Id: ctsupport.h,v 1.20 2001/01/01 10:14:34 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 #endif
 
 #ifdef MSVC
-#define snprintf _snprintf
+#include "msvc_compat.h"
 #endif
 
 #define STR_MAX_LEN 255
@@ -43,7 +43,10 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <cstdarg>
+#include <cstdarg>
+#include <string>
+#include <vector>
+#include <algorithm>
 
 #define TRUE	1
 #define FALSE	0
@@ -62,6 +65,7 @@
 
 /*----------------------------------------------------------------------*/
 
+#define ERR_TRACE -1
 #define ERR_WARNING	0
 #define ERR_SEVERE	1
 #define ERR_FATAL	2
@@ -82,7 +86,7 @@
 
 /*----------------------------------------------------------------------*/
 
-#ifndef O_BINARY
+#if !defined(O_BINARY) && !defined(MSVC)
 #define O_BINARY (0)
 #endif
 
@@ -145,7 +149,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
@@ -180,7 +184,21 @@ 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)); }
-
+
+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); }
 
@@ -234,6 +252,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);
 
 
 /*----------------------------------------------------------------------*/