Changeset 937 for applications/bdmtoolbox

Timestamp:

05/12/10 23:02:03 (14 years ago)

Author:

smidl

Message:

matlab class extension for pdf

Location:

applications/bdmtoolbox/mex

Files:

• RV.m (modified) (1 diff)
• epdf_covariance.cpp (modified) (1 diff)
• epdf_evallog_mat.cpp (modified) (1 diff)
• epdf_marginal.cpp (modified) (1 diff)
• epdf_sample_mat.cpp (modified) (1 diff)
• epdf_variance.cpp (modified) (1 diff)
• mexPdf.h (modified) (3 diffs)
• mex_classes (added)
• mex_classes/mexBM.m (added)
• mex_classes/mexEpdf.m (added)
• mex_classes/mexLaplace.m (added)

applications/bdmtoolbox/mex/RV.m

@@ -2 +2 @@
 % create RV from cell of names, vector of sizes and vector of time delayes
 
+if nargin<1
+    names='';
+end
 r.class='RV';
 if isstr(names)

applications/bdmtoolbox/mex/epdf_covariance.cpp

@@ -12 +12 @@
 #ifdef MEX
 #include <mex/mex_parser.h>
+#include "mexPdf.h"
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {

applications/bdmtoolbox/mex/epdf_evallog_mat.cpp

@@ -12 +12 @@
 #ifdef MEX
 #include <mex/mex_parser.h>
+#include "mexPdf.h"
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {

applications/bdmtoolbox/mex/epdf_marginal.cpp

@@ -12 +12 @@
 #ifdef MEX
 #include <mex/mex_parser.h>
+#include "mexPdf.h"
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {

applications/bdmtoolbox/mex/epdf_sample_mat.cpp

@@ -12 +12 @@
 #ifdef MEX
 #include <mex/mex_parser.h>
+#include "mexPdf.h"
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {

applications/bdmtoolbox/mex/epdf_variance.cpp

@@ -12 +12 @@
 #ifdef MEX
 #include <mex/mex_parser.h>
+#include "mexPdf.h"
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {

applications/bdmtoolbox/mex/mexPdf.h

@@ -9 +9 @@
                 } 
                 void validate() {
-                        mexCallMATLAB(1, &data, 0, 0, "validate");
-                        dim = mexCallMATLAB(1, &data, 0, 0, "dimension");
+                        mexCallMATLAB(0, 0, 1, &data,  "validate");
+                        mxArray *tmp;
+                        mexCallMATLAB(1, &tmp, 1, &data, "dimension");
+                        dim = mxArray2double(tmp);
                 }
                 vec mean() const {
@@ -24 +26 @@
                 double evallog(const vec &dt) const {
                         mxArray *tmp;
-                        mexCallMATLAB(1, &tmp, 1, (mxArray **) &data, "evallog");
+                        mxArray *in[2];
+                        in[0]=data;
+                        in[1]=mxCreateDoubleMatrix(dimension(),1,mxREAL);
+                        vec2mxArray(dt,in[1]);
+                        mexCallMATLAB(1, &tmp, 2, in, "evallog");
                         return mxArray2double(tmp);
                 }
@@ -34 +40 @@
 };
 UIREGISTER(mexEpdf);
+