projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r322: *** empty log message ***
[ctsim.git]
/
include
/
ctsupport.h
diff --git
a/include/ctsupport.h
b/include/ctsupport.h
index 617554362cfffb3e78f9b65d7f7430a9cc3a988a..81479c964dbc56bacde5ce0e4645f845ecfb11e9 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ctsupport.h,v 1.1
2 2000/12/16 03:29
:02 kevin Exp $
+** $Id: ctsupport.h,v 1.1
9 2000/12/29 20:04
:02 kevin Exp $
**
**
** This program is free software; you can redistribute it and/or modify
**
**
** This program is free software; you can redistribute it and/or modify
@@
-34,7
+34,7
@@
#endif
#ifdef MSVC
#endif
#ifdef MSVC
-#
define snprintf _snprintf
+#
include "msvc_compat.h"
#endif
#define STR_MAX_LEN 255
#endif
#define STR_MAX_LEN 255
@@
-43,7
+43,10
@@
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <cstdio>
#include <cstdlib>
#include <cstring>
-#include <cstdarg>
+#include <cstdarg>
\r
+#include <string>
+#include <vector>
\r
+#include <algorithm>
\r
#define TRUE 1
#define FALSE 0
#define TRUE 1
#define FALSE 0
@@
-62,6
+65,7
@@
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
+#define ERR_TRACE -1
\r
#define ERR_WARNING 0
#define ERR_SEVERE 1
#define ERR_FATAL 2
#define ERR_WARNING 0
#define ERR_SEVERE 1
#define ERR_FATAL 2
@@
-82,7
+86,7
@@
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
-#if
ndef O_BINARY
+#if
!defined(O_BINARY) && !defined(MSVC)
#define O_BINARY (0)
#endif
#define O_BINARY (0)
#endif
@@
-145,7
+149,7
@@
char *str_upper(char *str);
/* syserror.cpp */
void sys_error(int severity, const char *msg, ...);
/* 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
void sys_error_level(int severity);
// Math Section
@@
-234,6
+238,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);
// 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
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/