Changeset 943 for applications/bdmtoolbox

Timestamp:

05/16/10 23:13:02 (14 years ago)

Author:

smidl

Message:

syntax of epredictor

Location:

applications/bdmtoolbox

Files:

• mex/epdf_covariance.cpp (modified) (1 diff)
• mex/epdf_evallog_mat.cpp (modified) (1 diff)
• mex/epdf_marginal.cpp (modified) (1 diff)
• mex/epdf_mean.cpp (modified) (1 diff)
• mex/epdf_sample_mat.cpp (modified) (1 diff)
• mex/epdf_variance.cpp (modified) (1 diff)
• mex/mexPdf.h (deleted)
• mex/mex_classes/mexBM.m (modified) (1 diff)
• mex/mex_classes/mexEpdf.m (modified) (3 diffs)
• tutorial/userguide/epdfds_example.m (modified) (2 diffs)

applications/bdmtoolbox/mex/epdf_covariance.cpp

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

applications/bdmtoolbox/mex/epdf_mean.cpp

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

applications/bdmtoolbox/mex/mex_classes/mexBM.m

@@ -8 +8 @@
     methods
         function validate(p)
-            if size(p.mu)<1 & (size(p.b)<1)
-                error('incompatible mu and b');
-            end
+                    % checks if all paramateres match
         end
         function dims=dimensions(p)
             %please fill
-            [size_of_posterior size_of_data size_of_condition]
+            %dims = [size_of_posterior size_of_data size_of_condition]
+            dims = [0,0,0] %
         end
         function obj=bayes(obj,dt,cond)
             % transform old estimate into new estimate
         end
-        function p=posterior(obj)
+        function p=epredictor(obj,cond)
             % return posterior density
         end

applications/bdmtoolbox/mex/mex_classes/mexEpdf.m

@@ -1 +1 @@
 classdef mexEpdf
     properties
-            rv = RV; %empty description add some valid RV when needed
+            rv=RV; %empty description add some valid RV when needed
     end
     methods
@@ -19 +19 @@
             error('define how to evaluate log of this density at point x')
         end
+        
+        %%% default function %%%
+        
         function l=evallog_nn(p,x)
             % define how to evaluate non-normalized log of this density at point x
@@ -24 +27 @@
             evallog(p,x);
         end
-
+                  function r=get_rv(p)
+                        r=p.rv;
+          end
     end
 end

applications/bdmtoolbox/tutorial/userguide/epdfds_example.m

@@ -4 +4 @@
 U.high  = 1;
 U.low = -1;
-U.rv.class='RV';
-U.rv.names={'a'};
+U.rv = RV('a',1);
+
+f.class = 'mexEpdf';
+f.object = mexLaplace;
+f.object.mu =12;
+f.object.b = 1;
+f.object.rv = RV('b',1);
+
 
 DS.class='EpdfDS';
-DS.epdf =U;
+DS.epdf =f; %U
 
 experiment.ndat=10;
@@ -14 +20 @@
 M=simulator(DS,experiment);
 
-M.DS_dt_a
+M.DS_dt_b