prepare modifications for mex

matlab/swz/c-code/Makefile

@@ -203,6 +203,11 @@ INCLUDE_DIR := -I$(MATRIX_DIR) -I$(ERROR_DIR) -I$(ARRAY_DIR) -I$(ASCII_DIR) -I$(
 VPATH := $(VPATH) $(MATRIX_DIR) $(ERROR_DIR) $(ARRAY_DIR) $(ASCII_DIR) $(STAT_DIR) $(SPHERICAL_DIR) $(SORT_DIR) $(SWITCH_DIR) $(VAR_DIR)
 OBJS := $(OBJS) bmatrix.o swzmatrix.o dw_error.o dw_rand.o dw_matrix_rand.o dw_array.o dw_matrix_array.o dw_matrix_sort.o dw_ascii.o dw_parse_cmd.o
 
+# MEX
+INCLUDE_DIR := -I$(WORK_DIR)/mex $(INCLUDE_DIR)
+VPATH := $(VPATH) $(WORK_DIR)/mex
+OBJS := $(OBJS) modify_for_mex.o
+
 # TAO FILES
 OBJS := $(OBJS)
 
@@ -250,6 +255,6 @@ $(OUT_DIR)/sbvar_probabilities: $(OBJS_PROBA)
 #
 #################################################################################
 clean:
-	rm -f $(OUT_DIR)/*.o *.o
+	rm -f $(OUT_DIR)/*.o *.o ; rm -f ../bin/*
 #
 #################################################################################

matlab/swz/c-code/mex/modify_for_mex.c

+#include <stdlib.h>
+#include "mex.h"
+
+void
+swz_exit(int status)
+{
+#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
+  mexErrMsgTxt("Error in mexfile.\n");
+#else
+  exit(status);
+#endif
+}

matlab/swz/c-code/mex/modify_for_mex.h

+#ifndef _MEXMOD
+#define _MEXMOD
+void swz_exit(int status);
+#endif
+
+#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
+#define printf mexPrintf
+#define exit swz_exit
+#endif

matlab/swz/c-code/sbvar/switching/switch.c

@@ -9,6 +9,8 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "modify_for_mex.h"
+
 /*******************************************************************************/
 /**************************** TMarkovStateVariable *****************************/
 /*******************************************************************************/

matlab/swz/c-code/sbvar/switching/switch_opt.c

@@ -5,6 +5,8 @@
 #include <string.h>
 #include <math.h>
 
+#include "modify_for_mex.h"
+
 //====== Static Global Variables ======
 static TStateModel *Model=(TStateModel*)NULL;
 static PRECISION *buffer=(PRECISION*)NULL;

matlab/swz/c-code/sbvar/switching/switchio.c

@@ -9,6 +9,8 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include "modify_for_mex.h"
+
 static void ReadError(char *idformat, char *trailer, int error);
 static int SetFilePosition(FILE *f_in, char *format, char *str);
 static int ReadInteger(FILE *f_in, char *idformat, char *trailer, int *i);

matlab/swz/c-code/sbvar/var/PrintDraws.c

@@ -14,6 +14,8 @@
 #include <math.h>
 #include <time.h>
 
+#include "modify_for_mex.h"
+
 int main(int nargs, char **args)
 {
   TStateModel *model;

matlab/swz/c-code/sbvar/var/VARbase.c

@@ -17,6 +17,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "modify_for_mex.h"
+
 //=== Private counter for improper normal distribution ===
 static int _VAR_IMPROPER_DISTRIBUTION_COUNTER = 0;
 int Reset_VAR_Improper_Distribution_Counter(void)

matlab/swz/c-code/sbvar/var/VARio.c

@@ -8,6 +8,8 @@
 #include <string.h>
 #include <math.h>
 
+#include "modify_for_mex.h"
+
 static int strlen_int(int n)
 {
   int i, j;

matlab/swz/c-code/sbvar/var/VARio_matlab.c

@@ -8,6 +8,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "modify_for_mex.h"
+
 static int ReadError_VARio_matlab(char *id)
 {
   char *errmsg, *fmt="Error after line identifier ""%s""";

matlab/swz/c-code/sbvar/var/command_line_VAR.c

@@ -9,6 +9,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "modify_for_mex.h"
+
 /*
   Allocates memory for filename.  Assumes that fmt is of the form
 

matlab/swz/c-code/sbvar/var/create_init_file.c

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "modify_for_mex.h"
 
 /*
    Creates a standard initialization file from the matlab and specification file.  

matlab/swz/c-code/sbvar/var/estimate.c

@@ -19,6 +19,8 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include "modify_for_mex.h"
+
 #define FIND_POSTERIOR_MODE  1
 #define FIND_LIKELIHOOD_MODE 2
 

matlab/swz/c-code/sbvar/var/mhm_VAR.c

@@ -12,6 +12,8 @@
 #include <time.h>
 #include <string.h>
 
+#include "modify_for_mex.h"
+
   // Compute psudo-inverse of mhm->variance
 static void PsudoInverse(TMatrix X, TMatrix Y)
 {

matlab/swz/c-code/sbvar/var/mhm_VAR_main_1.c

@@ -14,6 +14,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+#include "modify_for_mex.h"
+
 static void ReadError_MHMio(char *id)
 {
   char *errmsg, *fmt="Error after line identifier ""%s""";

matlab/swz/c-code/sbvar/var/mhm_VAR_main_2.c

@@ -21,6 +21,8 @@
 #include <string.h>
 #include <time.h>
 
+#include "modify_for_mex.h"
+
 /*
    Returns ln(exp(a) + exp(b)) computed to avoid overflow.  If
    a = ln(c) and b = ln(d), as is usually the case, then the

matlab/swz/c-code/sbvar/var/probabilities.c

@@ -7,6 +7,8 @@
 
 #include <stdlib.h>
 
+#include "modify_for_mex.h"
+
 /*
    Attempt to set up model from command line.  Command line options are the 
    following

matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c

@@ -12,6 +12,8 @@
 #endif
 #include <stdarg.h>
 
+#include "modify_for_mex.h"
+
 //================================== Macros ===================================//
 #define dw_ElementSizeA(a)                (dw_SpecsA(a)->size)
 #define dw_GetOffsetA(a)                  (dw_SpecsA(a)->offset)

matlab/swz/c-code/utilities/DWCcode/arrays/dw_matrix_array.c

@@ -5,6 +5,8 @@
 
 #include <stdlib.h>
 
+#include "modify_for_mex.h"
+
 TElementSpecification dw_VectorSpecs =
   { 
     dw_ARRAY_POINTER,

matlab/swz/c-code/utilities/DWCcode/ascii/dw_ascii.c

@@ -7,6 +7,8 @@
 #include <ctype.h>
 #include <stdarg.h>
 
+#include "modify_for_mex.h"
+
 /*
    Attempts to open filename for reading.  Returns pointer to file upon success 
    and prints error message and exits upon failure.  The file must exist.