Wrote alldai.h/cpp unit tests

diff --git a/ChangeLog b/ChangeLog
index 629440c..231352f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -145,7 +145,7 @@ git HEAD
 * Compressed Makefile
 * Added unit tests for var, smallset, varset, graph, bipgraph,
   weightedgraph, enum, util, exceptions, properties, index, prob, 
-  factor, factorgraph, clustergraph, regiongraph, daialg
+  factor, factorgraph, clustergraph, regiongraph, daialg, alldai
 * Added unit testing framework
 * Added initialization of TRWBP weights by sampling spanning trees
 * Cleaned up MR code:

diff --git a/Makefile b/Makefile
index 56ba4bc..07ed794 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ examples : examples/example$(EE) examples/example_bipgraph$(EE) examples/example
 
 matlabs : matlab/dai$(ME) matlab/dai_readfg$(ME) matlab/dai_writefg$(ME) matlab/dai_potstrength$(ME)
 
-unittests : tests/unit/var$(EE) tests/unit/smallset$(EE) tests/unit/varset$(EE) tests/unit/graph$(EE) tests/unit/bipgraph$(EE) tests/unit/weightedgraph$(EE) tests/unit/enum$(EE) tests/unit/enum$(EE) tests/unit/util$(EE) tests/unit/exceptions$(EE) tests/unit/properties$(EE) tests/unit/index$(EE) tests/unit/prob$(EE) tests/unit/factor$(EE) tests/unit/factorgraph$(EE) tests/unit/clustergraph$(EE) tests/unit/regiongraph$(EE) tests/unit/daialg$(EE)
+unittests : tests/unit/var$(EE) tests/unit/smallset$(EE) tests/unit/varset$(EE) tests/unit/graph$(EE) tests/unit/bipgraph$(EE) tests/unit/weightedgraph$(EE) tests/unit/enum$(EE) tests/unit/enum$(EE) tests/unit/util$(EE) tests/unit/exceptions$(EE) tests/unit/properties$(EE) tests/unit/index$(EE) tests/unit/prob$(EE) tests/unit/factor$(EE) tests/unit/factorgraph$(EE) tests/unit/clustergraph$(EE) tests/unit/regiongraph$(EE) tests/unit/daialg$(EE) tests/unit/alldai$(EE)
        echo Running unit tests...
        tests/unit/var$(EE)
        tests/unit/smallset$(EE)
@@ -143,6 +143,7 @@ unittests : tests/unit/var$(EE) tests/unit/smallset$(EE) tests/unit/varset$(EE)
        tests/unit/clustergraph$(EE)
        tests/unit/regiongraph$(EE)
        tests/unit/daialg$(EE)
+       tests/unit/alldai$(EE)
 
 tests : tests/testdai$(EE) tests/testem/testem$(EE) tests/testbbp$(EE) $(unittests)
 
@@ -290,8 +291,8 @@ clean :
        -rm matlab/*$(ME)
        -rm examples/example$(EE) examples/example_bipgraph$(EE) examples/example_varset$(EE) examples/example_permute$(EE) examples/example_sprinkler$(EE) examples/example_sprinkler_gibbs$(EE) examples/example_sprinkler_em$(EE)
        -rm tests/testdai$(EE) tests/testem/testem$(EE) tests/testbbp$(EE)
-       -rm tests/unit/var$(EE) tests/unit/smallset$(EE) tests/unit/varset$(EE) tests/unit/graph$(EE) tests/unit/bipgraph$(EE) tests/unit/weightedgraph$(EE) tests/unit/enum$(EE) tests/unit/util$(EE) tests/unit/exceptions$(EE) tests/unit/properties$(EE) tests/unit/index$(EE) tests/unit/prob$(EE) tests/unit/factor$(EE) tests/unit/factorgraph$(EE) tests/unit/clustergraph$(EE) tests/unit/regiongraph$(EE) tests/unit/daialg$(EE)
-       -rm factorgraph_test.fg
+       -rm tests/unit/var$(EE) tests/unit/smallset$(EE) tests/unit/varset$(EE) tests/unit/graph$(EE) tests/unit/bipgraph$(EE) tests/unit/weightedgraph$(EE) tests/unit/enum$(EE) tests/unit/util$(EE) tests/unit/exceptions$(EE) tests/unit/properties$(EE) tests/unit/index$(EE) tests/unit/prob$(EE) tests/unit/factor$(EE) tests/unit/factorgraph$(EE) tests/unit/clustergraph$(EE) tests/unit/regiongraph$(EE) tests/unit/daialg$(EE) tests/unit/alldai$(EE)
+       -rm factorgraph_test.fg alldai_test.aliases
        -rm utils/fg2dot$(EE) utils/createfg$(EE) utils/fginfo$(EE)
        -rm -R doc
        -rm -R lib
@@ -338,7 +339,9 @@ clean :
        -del tests\unit\clustergraph$(EE)
        -del tests\unit\regiongraph$(EE)
        -del tests\unit\daialg$(EE)
+       -del tests\unit\alldai$(EE)
        -del factorgraph_test.fg
+       -del alldai_test.aliases
        -del $(LIB)\libdai$(LE)
        -rmdir lib
 endif

diff --git a/tests/unit/alldai.cpp b/tests/unit/alldai.cpp
new file mode 100644 (file)
index 0000000..eddd07d
--- /dev/null
+++ b/tests/unit/alldai.cpp
@@ -0,0 +1,137 @@
+/*  This file is part of libDAI - http://www.libdai.org/
+ *
+ *  libDAI is licensed under the terms of the GNU General Public License version
+ *  2, or (at your option) any later version. libDAI is distributed without any
+ *  warranty. See the file COPYING for more details.
+ *
+ *  Copyright (C) 2010  Joris Mooij      [joris dot mooij at libdai dot org]
+ */
+
+
+#define BOOST_TEST_DYN_LINK
+
+
+#include <dai/alldai.h>
+#include <strstream>
+#include <fstream>
+
+
+using namespace dai;
+
+
+const double tol = 1e-8;
+
+
+#define BOOST_TEST_MODULE DAIAlgTest
+
+
+#include <boost/test/unit_test.hpp>
+
+
+BOOST_AUTO_TEST_CASE( newInfAlgTest ) {
+    Var v0( 0, 2 );
+    Var v1( 1, 2 );
+    Var v2( 2, 2 );
+    Var v3( 3, 2 );
+    VarSet v01( v0, v1 );
+    VarSet v02( v0, v2 );
+    VarSet v03( v0, v3 );
+    VarSet v12( v1, v2 );
+    VarSet v13( v1, v3 );
+    VarSet v23( v2, v3 );
+    std::vector<Factor> facs;
+    facs.push_back( createFactorIsing( v0, v1, 1.0 ) );
+    facs.push_back( createFactorIsing( v1, v2, 1.0 ) );
+    facs.push_back( createFactorIsing( v2, v3, 1.0 ) );
+    facs.push_back( createFactorIsing( v3, v0, 1.0 ) );
+    facs.push_back( createFactorIsing( v0, -1.0 ) );
+    facs.push_back( createFactorIsing( v1, -1.0 ) );
+    facs.push_back( createFactorIsing( v2, -1.0 ) );
+    facs.push_back( createFactorIsing( v3, 1.0 ) );
+    Factor joint = facs[0] * facs[1] * facs[2] * facs[3] * facs[4] * facs[5] * facs[6] * facs[7];
+    FactorGraph fg( facs );
+    VarSet vs = v01;
+
+    InfAlg* ia = newInfAlg( "EXACT", fg, PropertySet()("verbose",(size_t)0) );
+    ia->init();
+    ia->run();
+    BOOST_CHECK( dist( ia->belief( v01 ), joint.marginal( vs ), DISTTV ) < tol );
+    BOOST_CHECK( dist( calcMarginal( *ia, vs, true ), joint.marginal( vs ), DISTTV ) < tol );
+    delete ia;
+
+    ia = newInfAlgFromString( "EXACT[verbose=0]", fg );
+    ia->init();
+    ia->run();
+    BOOST_CHECK( dist( ia->belief( v01 ), joint.marginal( vs ), DISTTV ) < tol );
+    BOOST_CHECK( dist( calcMarginal( *ia, vs, true ), joint.marginal( vs ), DISTTV ) < tol );
+    delete ia;
+
+    std::map<std::string, std::string> aliases;
+    aliases["alias"] = "EXACT[verbose=1]";
+    ia = newInfAlgFromString( "alias[verbose=0]", fg, aliases );
+    ia->init();
+    ia->run();
+    BOOST_CHECK( dist( ia->belief( v01 ), joint.marginal( vs ), DISTTV ) < tol );
+    BOOST_CHECK( dist( calcMarginal( *ia, vs, true ), joint.marginal( vs ), DISTTV ) < tol );
+    delete ia;
+}
+
+
+BOOST_AUTO_TEST_CASE( parseTest ) {
+    std::pair<std::string, PropertySet> nameProps = parseNameProperties( "name" );
+    BOOST_CHECK_EQUAL( nameProps.first, "name" );
+    BOOST_CHECK_EQUAL( nameProps.second.size(), 0 );
+
+    nameProps = parseNameProperties( "name[]" );
+    BOOST_CHECK_EQUAL( nameProps.first, "name" );
+    BOOST_CHECK_EQUAL( nameProps.second.size(), 0 );
+
+    nameProps = parseNameProperties( "name[key1=value,key2=0.5]" );
+    BOOST_CHECK_EQUAL( nameProps.first, "name" );
+    BOOST_CHECK_EQUAL( nameProps.second.size(), 2 );
+    BOOST_CHECK( nameProps.second.hasKey( "key1" ) );
+    BOOST_CHECK( nameProps.second.hasKey( "key2" ) );
+    BOOST_CHECK_EQUAL( nameProps.second.getAs<std::string>("key1"), "value" );
+    BOOST_CHECK_EQUAL( nameProps.second.getAs<std::string>("key2"), "0.5" );
+
+    std::map<std::string, std::string> aliases;
+    aliases["alias"] = "name[key1=other]";
+
+    nameProps = parseNameProperties( "alias", aliases );
+    BOOST_CHECK_EQUAL( nameProps.first, "name" );
+    BOOST_CHECK_EQUAL( nameProps.second.size(), 1 );
+    BOOST_CHECK( nameProps.second.hasKey( "key1" ) );
+    BOOST_CHECK_EQUAL( nameProps.second.getAs<std::string>("key1"), "other" );
+
+    nameProps = parseNameProperties( "alias[]", aliases );
+    BOOST_CHECK_EQUAL( nameProps.first, "name" );
+    BOOST_CHECK_EQUAL( nameProps.second.size(), 1 );
+    BOOST_CHECK( nameProps.second.hasKey( "key1" ) );
+    BOOST_CHECK_EQUAL( nameProps.second.getAs<std::string>("key1"), "other" );
+
+    nameProps = parseNameProperties( "alias[key1=value,key2=0.5]", aliases );
+    BOOST_CHECK_EQUAL( nameProps.first, "name" );
+    BOOST_CHECK_EQUAL( nameProps.second.size(), 2 );
+    BOOST_CHECK( nameProps.second.hasKey( "key1" ) );
+    BOOST_CHECK( nameProps.second.hasKey( "key2" ) );
+    BOOST_CHECK_EQUAL( nameProps.second.getAs<std::string>("key1"), "value" );
+    BOOST_CHECK_EQUAL( nameProps.second.getAs<std::string>("key2"), "0.5" );
+}
+
+
+BOOST_AUTO_TEST_CASE( readAliasFileTest ) {
+    std::ofstream outfile;
+    std::string filename( "alldai_test.aliases" );
+    outfile.open( filename.c_str() );
+    if( outfile.is_open() ) {
+        outfile << "alias:\tname[key1=other]" << std::endl;
+        outfile.close();
+    } else
+        DAI_THROWE(CANNOT_WRITE_FILE,"Cannot write to file " + std::string(filename));
+
+    std::map<std::string, std::string> aliases;
+    aliases["alias"] = "name[key1=other]";
+
+    std::map<std::string, std::string> aliases2 = readAliasesFile( filename );
+    BOOST_CHECK( aliases == aliases2 );
+}

diff --git a/tests/unit/daialg.cpp b/tests/unit/daialg.cpp
index 1b060a8..5b0aeda 100644 (file)
--- a/tests/unit/daialg.cpp
+++ b/tests/unit/daialg.cpp
@@ -51,6 +51,8 @@ BOOST_AUTO_TEST_CASE( calcMarginalTest ) {
     Factor joint = facs[0] * facs[1] * facs[2] * facs[3] * facs[4] * facs[5] * facs[6] * facs[7];
     FactorGraph fg( facs );
     ExactInf ei( fg, PropertySet()("verbose",(size_t)0) );
+    ei.init();
+    ei.run();
     VarSet vs;
 
     vs = v0;        BOOST_CHECK( dist( calcMarginal( ei, vs, false ), joint.marginal( vs ), DISTTV ) < tol );
@@ -94,6 +96,8 @@ BOOST_AUTO_TEST_CASE( calcPairBeliefsTest ) {
     Factor joint = facs[0] * facs[1] * facs[2] * facs[3] * facs[4] * facs[5] * facs[6] * facs[7];
     FactorGraph fg( facs );
     ExactInf ei( fg, PropertySet()("verbose",(size_t)0) );
+    ei.init();
+    ei.run();
     VarSet vs;
 
     std::vector<Factor> pb = calcPairBeliefs( ei, v01 | v23, false, false );