Changeset 454

Timestamp:

07/30/09 16:44:27 (16 years ago)

Author:

smidl

Message:

configurations for epdf tests & minor fixes

Location:

library/tests

Files:

• egiw.cfg (modified) (2 diffs)
• emix_test.cpp (modified) (1 diff)
• enorm.cfg (modified) (6 diffs)
• enorm_test.cpp (modified) (1 diff)
• mepdf.cfg (modified) (1 diff)
• mgamma.cfg (modified) (1 diff)

library/tests/egiw.cfg

@@ -4 +4 @@
   epdf = {
     class = "egiw";
-    V = ( "matrix", 2, 2, [ 12.2, 11.0, 11.0, 10.0 ] );
+    V = ( "matrix", 2, 2, [ 13.1, 11.0, 11.0, 10.0 ] );
     nu = 10;
     dimx = 1.0;
@@ -12 +12 @@
     };
   };
-  mean = [ 1.1, 0.02 ];
+  mean = [ 1.1, 0.1 ];
   lognc = 11.45368;
-  variance = [ 0.002, 8e-05 ];
+  variance = [ 0.01, 8e-05 ];
   support = ( "matrix", 2, 2, [ -2.0, 4.0, 0.01, 2.0 ] );
   nbins = [ 100, 200 ];

library/tests/emix_test.cpp

@@ -34 +34 @@
         enorm<ldmat> E1; E1.set_rv ( xy );
                 
-        it_file iti("xxx");
-        mat R; vec mu;
-        iti >> Name("R") >>R;
-        iti >> Name("mu") >>mu;
-
-        cout << mu << R <<endl;
-        E1.set_parameters( mu, R);//"1.00054 1.0455" , mat ( "0.740142 -0.259015; -0.259015 1.0302" ));
+        E1.set_parameters( "1.00054 1.0455" , mat ( "0.740142 -0.259015; -0.259015 1.0302" ));
         enorm<ldmat> E2;E2.set_rv ( xy );
         E2.set_parameters( "-1.2 -0.1" , mat ( "1 0.4; 0.4 0.5" ));

library/tests/enorm.cfg

@@ -17 +17 @@
   integral = 1.0;
   R = ( "matrix", 2, 2, [ 1.0, -0.5, -0.5, 2.0 ] );
+  marginal_rv =     {
+      class = "RV";
+      names = ( "x" );
+    };
+
 },
 {
@@ -33 +38 @@
   variance = [ 5.0, 5.2 ];
   support = ( "matrix", 2, 2, [ -10.0, 10.0, -10.0, 10.0 ] );
+  R = ( "matrix", 2, 2, [ 5.0, -0.05, -0.05, 5.2 ] );
   nbins = [ 200, 200 ];
   integral = 1.0;
@@ -51 +57 @@
   lognc = 2.11768;
   variance = [ 1 ];
+  R = 1.0;
 },
 {
@@ -66 +73 @@
   mean = 7.0;
   variance = [ 1 ];
+  R = 1.0;
 },
 {
@@ -85 +93 @@
   class = "epdf_harness";
   epdf = {
-    class = "enorm<ldmat>";
+    class = "enorm<chmat>";
     mu = ( "matrix", 1, 2, [ 0.0, 2.0 ] );
     R = ( "matrix", 2, 2, [ 2.0, 0.0, 0.0, 0.5 ] );
@@ -96 +104 @@
   mean = [ 0.0, 2.0 ];
   variance = [ 2.0, 0.5 ];
+  R = ( "matrix", 2, 2, [ 2.0, 0.0, 0.0, 0.5 ] );
 } );
 

library/tests/enorm_test.cpp

@@ -45 +45 @@
     ParticularUI<enorm<fsqmat> >("enorm<fsqmat>"));
 
+ template<>
+const ParticularUI<enorm<chmat> > &ParticularUI<enorm<chmat> >::factory(
+    ParticularUI<enorm<chmat> >("enorm<chmat>"));
+
 TEST(test_enorm) {
     RV::clear_all();

library/tests/mepdf.cfg

@@ -16 +16 @@
   };
   cond = [ 1.5, 1.7 ];
-  mean = [ 1.0763, -0.949144 ];
-  R = ( "matrix", 2, 2, [ 0.970164, -0.483967, -0.483967, 2.0415 ] );
+  mean = [ 1.1, -1.0 ];
+  R = ( "matrix", 2, 2, [ 1.0, -0.5, -0.5, 2.0 ] );
 } );
 

library/tests/mgamma.cfg

@@ -19 +19 @@
   cond = [ 1.5, 1.7 ];
   mean = [ 1.5, 1.7 ];
-  R = ( "matrix", 2, 2, [ 2.43206, -0.0487123, -0.0487123, 2.30866 ] );
+  R = ( "matrix", 2, 2, [ 2.25, 0.0, 0.0, 2.89 ] );
 } );