Fixed two regressions
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 14 Sep 2009 11:35:14 +0000 (13:35 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 14 Sep 2009 11:35:14 +0000 (13:35 +0200)
include/dai/properties.h
src/mr.cpp

index 0aa02da..c3d7022 100644 (file)
@@ -75,7 +75,7 @@ class PropertySet : private std::map<PropertyKey, PropertyValue> {
         const PropertyValue & Get(const PropertyKey &key) const {
             PropertySet::const_iterator x = find(key);
             if( x == this->end() )
-                DAI_THROWE(NOT_FOUND,"PropertySet::Get cannot find property '" + key + "'");
+                DAI_THROWE(OBJECT_NOT_FOUND,"PropertySet::Get cannot find property '" + key + "'");
             return x->second;
         }
 
index a2ad194..71b76da 100644 (file)
@@ -499,11 +499,11 @@ void MR::init_cor() {
     for( size_t i = 0; i < nrVars(); i++ ) {
         vector<Factor> pairq;
         if( props.inits == Properties::InitType::CLAMPING ) {
-            BP bpcav(*this, PropertySet()("updates", string("SEQMAX"))("tol", 1.0e-9)("maxiter", 10000UL)("verbose", 0UL)("logdomain", false));
+            BP bpcav(*this, PropertySet()("updates", string("SEQMAX"))("tol", 1.0e-9)("maxiter", (size_t)10000)("verbose", (size_t)0)("logdomain", false));
             bpcav.makeCavity( i );
             pairq = calcPairBeliefs( bpcav, delta(i), false );
         } else if( props.inits == Properties::InitType::EXACT ) {
-            JTree jtcav(*this, PropertySet()("updates", string("HUGIN"))("verbose", 0UL) );
+            JTree jtcav(*this, PropertySet()("updates", string("HUGIN"))("verbose", (size_t)0) );
             jtcav.makeCavity( i );
             pairq = calcPairBeliefs( jtcav, delta(i), false );
         }