Mercurial > forge

diff extra/NaN/src/linear_model_matlab.c @ 6585:ae521dec5b54 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
partial support of lcc-win compiler
author schloegl
date Thu, 14 Jan 2010 17:50:16 +0000
parents 1170c9d6d1c4
children c101c486d80a
line wrap: on
line diff
--- a/extra/NaN/src/linear_model_matlab.c	Thu Jan 14 15:37:31 2010 +0000
+++ b/extra/NaN/src/linear_model_matlab.c	Thu Jan 14 17:50:16 2010 +0000
@@ -31,10 +31,10 @@
 
 #include "mex.h"
 
-#ifdef MX_API_VER
-#if MX_API_VER < 0x07030000
-typedef int mwIndex;
-#endif
+#ifdef tmwtypes_h
+  #if (MX_API_VER<=0x07020000)
+    typedef int mwSize;
+  #endif 
 #endif 
 
 #define Malloc(type,n) (type *)malloc((n)*sizeof(type))
@@ -61,14 +61,14 @@
 
 	rhs = (mxArray **)mxMalloc(sizeof(mxArray *)*NUM_OF_RETURN_FIELD);
 
-	// Parameters
-	// for now, only solver_type is needed
+	/* Parameters */
+	/* for now, only solver_type is needed */
 	rhs[out_id] = mxCreateDoubleMatrix(1, 1, mxREAL);
 	ptr = mxGetPr(rhs[out_id]);
 	ptr[0] = model_->param.solver_type;
 	out_id++;
 
-	// nr_class
+	/* nr_class */
 	rhs[out_id] = mxCreateDoubleMatrix(1, 1, mxREAL);
 	ptr = mxGetPr(rhs[out_id]);
 	ptr[0] = model_->nr_class;
@@ -79,13 +79,13 @@
 	else
 		nr_w=model_->nr_class;
 
-	// nr_feature
+	/* nr_feature */
 	rhs[out_id] = mxCreateDoubleMatrix(1, 1, mxREAL);
 	ptr = mxGetPr(rhs[out_id]);
 	ptr[0] = model_->nr_feature;
 	out_id++;
 
-	// bias
+	/* bias */
 	rhs[out_id] = mxCreateDoubleMatrix(1, 1, mxREAL);
 	ptr = mxGetPr(rhs[out_id]);
 	ptr[0] = model_->bias;
@@ -97,7 +97,7 @@
 		n=model_->nr_feature;
 
 	w_size = n;
-	// Label
+	/* Label */
 	if(model_->label)
 	{
 		rhs[out_id] = mxCreateDoubleMatrix(model_->nr_class, 1, mxREAL);
@@ -109,7 +109,7 @@
 		rhs[out_id] = mxCreateDoubleMatrix(0, 0, mxREAL);
 	out_id++;
 
-	// w
+	/* w */
 	rhs[out_id] = mxCreateDoubleMatrix(nr_w, w_size, mxREAL);
 	ptr = mxGetPr(rhs[out_id]);
 	for(i = 0; i < w_size*nr_w; i++)
@@ -150,12 +150,12 @@
 	model_->w=NULL;
 	model_->label=NULL;
 
-	// Parameters
+	/* Parameters */
 	ptr = mxGetPr(rhs[id]);
 	model_->param.solver_type = (int)ptr[0];
 	id++;
 
-	// nr_class
+	/* nr_class */
 	ptr = mxGetPr(rhs[id]);
 	model_->nr_class = (int)ptr[0];
 	id++;
@@ -165,12 +165,12 @@
 	else
 		nr_w=model_->nr_class;
 
-	// nr_feature
+	/* nr_feature */
 	ptr = mxGetPr(rhs[id]);
 	model_->nr_feature = (int)ptr[0];
 	id++;
 
-	// bias
+	/* bias */
 	ptr = mxGetPr(rhs[id]);
 	model_->bias = (int)ptr[0];
 	id++;