Merge branch 'master' of git@git.tuebingen.mpg.de:libdai

[libdai.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index fe42f43..d33880f 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -49,7 +49,7 @@ class TestAI {
         double          time;
         bool            has_logZ;
 
-        TestAI( const FactorGraph &fg, const string &_name, const Properties &opts ) : obj(NULL), name(_name), err(), q(), logZ(0.0), maxdiff(0.0), time(0), has_logZ(true) {
+        TestAI( const FactorGraph &fg, const string &_name, const PropertySet &opts ) : obj(NULL), name(_name), err(), q(), logZ(0.0), maxdiff(0.0), time(0), has_logZ(true) {
             double tic = toc();
             obj = newInfAlg( name, fg, opts );
             time += toc() - tic;
@@ -112,7 +112,7 @@ class TestAI {
                 } catch( Exception &e ) {
                     has_logZ = false;
                 }
-                maxdiff = obj->MaxDiff();
+                maxdiff = obj->maxDiff();
                 q = allBeliefs();
             };
         }
@@ -141,14 +141,14 @@ class TestAI {
 };
 
 
-pair<string, Properties> parseMethod( const string &_s, const map<string,string> & aliases ) {
+pair<string, PropertySet> parseMethod( const string &_s, const map<string,string> & aliases ) {
     string s = _s;
     if( aliases.find(_s) != aliases.end() )
         s = aliases.find(_s)->second;
 
-    pair<string, Properties> result;
+    pair<string, PropertySet> result;
     string & name = result.first;
-    Properties & opts = result.second;
+    PropertySet & opts = result.second;
 
     string::size_type pos = s.find_first_of('[');
     name = s.substr( 0, pos );
@@ -273,7 +273,7 @@ int main( int argc, char *argv[] ) {
             cout << "MAXDIFF" << endl;
 
             for( size_t m = 0; m < methods.size(); m++ ) {
-                pair<string, Properties> meth = parseMethod( methods[m], Aliases );
+                pair<string, PropertySet> meth = parseMethod( methods[m], Aliases );
 
                 if( vm.count("tol") )
                     meth.second.Set("tol",tol);