Changeset 288 for mpdm

Timestamp:

03/05/09 14:04:30 (16 years ago)

Author:

smidl

Message:

experiments

Location:

mpdm

Files:

• CMakeLists.txt (modified) (1 diff)
• merg_2a.cpp (modified) (4 diffs)
• merg_giw.cpp (modified) (1 diff)

mpdm/CMakeLists.txt

@@ -1 +1 @@
 # Make sure the compiler can find include files from our Bdm library.
 include_directories (${BDM_SOURCE_DIR}/bdm)
-
-# Make sure the linker can find the Hello library once it is built.
 link_directories (${BDM_BINARY_DIR}/bdm)
 
-## Save all needed libraries in variable BdmLibs
-#SET(BdmLibs bdm itpp_debug)
-
-IF(WIN32)
-        SET(AddLib libacml_dll)
-ENDIF(WIN32)
-
-# Define macro for testing a file
-MACRO(TEST FN)
-        add_executable (${FN} ${FN}.cpp)
-        target_link_libraries (${FN} debug itpp_debug)
-        target_link_libraries (${FN} optimized itpp)
-        target_link_libraries (${FN} bdm ${AddLib})
-ENDMACRO(TEST)
-
-# Add executable called "helloDemo" that is built from the source files
-# "demo.cxx" and "demo_b.cxx".  The extensions are automatically found.
-TEST(merg_pred)
-TEST(merg_giw)
-TEST(merger_iter_cond)
-TEST(merg_2a)
+EXEC(merg_pred)
+EXEC(merg_giw)
+EXEC(merger_iter_cond)
+EXEC(merg_2a)

mpdm/merg_2a.cpp

@@ -10 +10 @@
 using std::endl;
 
-/*! The purpose of this experiment is to test merging fragmental pdfs between two participants sharing the same parameter, a. However, this parameter has a different role in each model.
+/*! \file
+Experiment for distributed identification using log-normal merging
+
+The purpose of this experiment is to test merging fragmental pdfs between two participants sharing the same parameter, a. However, this parameter has a different role in each model.
 
 Lets assume that:
- u -> |a,r| -> y -> |a,r| -> z
+\dot
+digraph compart{
+
+  edge [fontname="FreeSans",fontsize=10,labelfontname="FreeSans",labelfontsize=10];
+  node [fontname="FreeSans",fontsize=10,shape=record];
+
+rankdir=LR;
+
+ U [label="u",height=0.2,width=0.4,color="white", fillcolor="white", style="filled" fontcolor="black"];
+ AR1 [label="a,b,r",height=0.2,width=0.4,color="black", fillcolor="white", style="filled" fontcolor="black"]
+ U -> AR1 [color="midnightblue",style="solid"]; 
+ AR2 [label="a,c,r",height=0.2,width=0.4,color="black", fillcolor="white", style="filled" fontcolor="black"]
+ AR1 -> AR2 [color="midnightblue",style="solid",label="y"]; 
+ Z [label="z",height=0.2,width=0.4,color="white", fillcolor="white", style="filled" fontcolor="black"];
+ AR2 -> Z [color="midnightblue",style="solid"]; 
+
+ 
+}
+\enddot 
 */
 
@@ -39 +60 @@
         mat V0 = 0.001*eye ( 3 ); V0 ( 0,0 ) = 1; //
 
-        ARX P1;
-        P1.set_statistics(2, V0, -1 );
-        ARX P2;
-         P2.set_statistics(2, V0, -1 );
+        ARX P1; P1.set_rv(concat(ab,r));
+        P1.set_statistics(1, V0, -1 );
+        ARX P2; P2.set_rv(concat(ac,r));
+         P2.set_statistics(1, V0, -1 );
 
         //Test estimation
@@ -64 +85 @@
 
         //Proposal
-        enorm<ldmat> g0; 
+        enorm<ldmat> g0; g0.set_rv(ab); 
         g0.set_parameters ( "1 1 ",mat ( "1 0; 0 1" ) );
-        egamma g1; 
+        egamma g1;g1.set_rv(r); 
         g1.set_parameters ( "2  ", "2" );
-        enorm<ldmat> g2; 
+        enorm<ldmat> g2; g2.set_rv(c); 
         g2.set_parameters ( "1 ",mat ( "1" ) );
 
         Array<const epdf*> A ( 3 ); A ( 0 ) = &g0; A ( 1 ) =&g1; A(2) = &g2; 
-        eprod G0 ( A );
+        eprod G0; G0.set_parameters ( A );
 
         vec rgru(2);
@@ -107 +128 @@
                 L.logit(Li_P2m, P2._e()->mean());
                 L.logit(Li_Mm, M.mean());
-                L.logit(Li_Th, concat(thy,vec_2(ct,rt)));
+                L.logit(Li_Th, concat(thy,vec_2(ct,rt*rt)));
                 L.step ( );
 

mpdm/merg_giw.cpp

@@ -68 +68 @@
 
         Array<const epdf*> A ( 3 ); A ( 0 ) = &g0; A ( 1 ) =&g1; A ( 2 ) = &g2;
-        eprod G0 ( A );
+        eprod G0; G0.set_parameters ( A );
 
         for ( t=0; t<ndat; t++ ) {