SWZ: misc code cleanup
parent
1868cd7943
commit
e4de5c21a8
|
@ -11,62 +11,14 @@
|
|||
|
||||
int constant_seed;
|
||||
|
||||
/*
|
||||
int
|
||||
swz_printf(char *msg, ...)
|
||||
{
|
||||
int ret;
|
||||
va_list ap;
|
||||
va_start(ap, msg);
|
||||
|
||||
#if defined(MATLAB_MEX_FILE)
|
||||
ret = mexPrintf(msg, ap);
|
||||
#elif defined(OCTAVE_MEX_FILE)
|
||||
mexPrintf(msg, ap);
|
||||
ret = 1;
|
||||
#else
|
||||
ret = vprintf(msg, ap);
|
||||
#endif
|
||||
|
||||
va_end(ap);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int
|
||||
swz_fprintf_stdout(char *msg, ...)
|
||||
{
|
||||
int ret;
|
||||
va_list ap;
|
||||
va_start(ap, msg);
|
||||
|
||||
#if defined(MATLAB_MEX_FILE)
|
||||
ret = mexPrintf(msg, ap);
|
||||
mexEvalString("pause(.001);");
|
||||
// mexEvalString("drawnow;");
|
||||
#elif defined(OCTAVE_MEX_FILE)
|
||||
mexPrintf(msg, ap);
|
||||
ret = 1;
|
||||
#else
|
||||
ret = vprintf(msg, ap);
|
||||
#endif
|
||||
|
||||
va_end(ap);
|
||||
return ret;
|
||||
}
|
||||
*/
|
||||
void
|
||||
swz_fprintf_err(char *str, ...)
|
||||
{
|
||||
char *whole_str=(char*)NULL;
|
||||
char *msg_truncated = ".....MSG TRUNCATED\n";
|
||||
int num_args = 0;
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, str);
|
||||
|
||||
#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
|
||||
mexPrintf(str, ap);
|
||||
/* mexEvalString("drawnow;");*/
|
||||
#else
|
||||
vfprintf(stderr, str, ap);
|
||||
#endif
|
||||
|
|
|
@ -2,28 +2,18 @@
|
|||
#define _MEXMOD
|
||||
void swz_exit(int status);
|
||||
void swz_fprintf_err(const char * str, ...);
|
||||
/*int swz_fprintf_stdout(char *msg, ...);*/
|
||||
/*int swz_printf(char *msg, ...);*/
|
||||
extern int constant_seed;
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
|
||||
/*#include "matrix.h"*/
|
||||
|
||||
|
||||
#include <dynmex.h>
|
||||
#include <dynblas.h>
|
||||
#include <dynlapack.h>
|
||||
|
||||
/* //#undef printf ansi-c*/
|
||||
/* //#define printf swz_printf ansi-c*/
|
||||
/*#define fflush(stdout) mexEvalString("drawnow;");*/
|
||||
|
||||
#undef printf
|
||||
|
||||
#define printf mexPrintf
|
||||
|
||||
#define swz_fprintf_stdout mexPrintf
|
||||
|
||||
|
||||
#define swzMalloc mxMalloc
|
||||
#define swzCalloc mxCalloc
|
||||
#define swzRealloc mxRealloc
|
||||
|
@ -31,9 +21,13 @@ extern int constant_seed;
|
|||
|
||||
|
||||
#else
|
||||
|
||||
|
||||
#define swz_fprintf_stdout printf
|
||||
#define swzMalloc malloc
|
||||
#define swzCalloc calloc
|
||||
#define swzRealloc realloc
|
||||
#define swzFree free
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -160,7 +160,7 @@ static int dw_PrintInt(FILE* f, void* element, char *format)
|
|||
{
|
||||
if(f==stdout)
|
||||
{
|
||||
swz_fprintf_stdout(format ? format : "%d ",*((int*)element));
|
||||
printf(format ? format : "%d ",*((int*)element));
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
|
@ -171,7 +171,7 @@ static int dw_PrintDouble(FILE* f, void* element, char *format)
|
|||
{
|
||||
if(f==stdout)
|
||||
{
|
||||
swz_fprintf_stdout(format ? format : "%lf ",*((double*)element));
|
||||
printf(format ? format : "%lf ",*((double*)element));
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
|
@ -182,7 +182,7 @@ static int dw_PrintFloat(FILE* f, void* element, char *format)
|
|||
{
|
||||
if(f==stdout)
|
||||
{
|
||||
swz_fprintf_stdout(format ? format : "%f ",*((float*)element));
|
||||
printf(format ? format : "%f ",*((float*)element));
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
|
@ -193,7 +193,7 @@ static int dw_PrintChar(FILE* f, void* element, char *format)
|
|||
{
|
||||
if(f==stdout)
|
||||
{
|
||||
swz_fprintf_stdout(format ? format : "%c ",*((char*)element));
|
||||
printf(format ? format : "%c ",*((char*)element));
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
|
@ -204,7 +204,7 @@ static int dw_PrintString(FILE* f, void* element, char *format)
|
|||
{
|
||||
if(f==stdout)
|
||||
{
|
||||
swz_fprintf_stdout(format ? format : "%s\t",(char*)element);
|
||||
printf(format ? format : "%s\t",(char*)element);
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue