Added fromString<>( const std::string& x )

diff --git a/ChangeLog b/ChangeLog
index dfc69a4..5e7b073 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 git HEAD
 --------
+* Added fromString<>( const std::string& x )
 * Added SmallSet::erase( const T& t )
 * Added DECMAP algorithm.
 * Added createFactorDelta( const VarSet& vs, size_t state )

diff --git a/include/dai/util.h b/include/dai/util.h
index f913da4..783a990 100644 (file)
--- a/include/dai/util.h
+++ b/include/dai/util.h
@@ -145,13 +145,20 @@ inline int rnd( int n ) {
 }
 
 
-/// Converts a variable of type \a T to a \c std::string by using a \c std::stringstream
+/// Converts a variable of type \a T to a \c std::string by using a \c boost::lexical_cast
 template<class T>
 std::string toString( const T& x ) {
     return boost::lexical_cast<std::string>(x);
 }
 
 
+/// Converts a variable of type std::string to \a T by using a \c boost::lexical_cast
+template<class T>
+T fromString( const std::string& x ) {
+    return boost::lexical_cast<T>(x);
+}
+
+
 /// Writes a \c std::vector<> to a \c std::ostream
 template<class T>
 std::ostream& operator << (std::ostream& os, const std::vector<T> & x) {

diff --git a/src/evidence.cpp b/src/evidence.cpp
index 82cdb25..0dfe2e9 100644 (file)
--- a/src/evidence.cpp
+++ b/src/evidence.cpp
@@ -71,7 +71,7 @@ void Evidence::addEvidenceTabFile( std::istream &is, std::map<std::string, Var>
             if( fields[i].size() > 0 ) { // skip if missing observation
                 if( fields[i].find_first_not_of("0123456789") != std::string::npos )
                     DAI_THROWE(INVALID_EVIDENCE_FILE,"Invalid state " + fields[i] + " in line " + boost::lexical_cast<std::string>(line_number));
-                size_t state = atoi( fields[i].c_str() );
+                size_t state = fromString<size_t>( fields[i].c_str() );
                 if( state >= vars[i].states() )
                     DAI_THROWE(INVALID_EVIDENCE_FILE,"State " + fields[i] + " too large in line " + boost::lexical_cast<std::string>(line_number));
                 sample[vars[i]] = state;

diff --git a/tests/unit/util_test.cpp b/tests/unit/util_test.cpp
index 21dba60..6648b15 100644 (file)
--- a/tests/unit/util_test.cpp
+++ b/tests/unit/util_test.cpp
@@ -130,6 +130,25 @@ BOOST_AUTO_TEST_CASE( concatTest ) {
 }
 
 
+BOOST_AUTO_TEST_CASE( stringTest ) {
+    int a = 5;
+    BOOST_CHECK_EQUAL( toString( a ), std::string("5") );
+    BOOST_CHECK_EQUAL( fromString<int>( "5" ), a );
+    
+    bool b = true;
+    BOOST_CHECK_EQUAL( toString( b ), std::string("1") );
+    BOOST_CHECK_EQUAL( fromString<bool>( "1" ), b );
+
+    double c = -3.5;
+    BOOST_CHECK_EQUAL( toString( c ), std::string("-3.5") );
+    BOOST_CHECK_EQUAL( fromString<double>( "-3.5" ), c );
+
+    unsigned char d = 'e';
+    BOOST_CHECK_EQUAL( toString( d ), std::string("e") );
+    BOOST_CHECK_EQUAL( fromString<unsigned char>( "e" ), d );
+}
+
+
 BOOST_AUTO_TEST_CASE( tokenizeStringTest ) {
     std::string s("Hello\tworld.\nThis is it.");
     std::vector<std::string> words;

diff --git a/utils/fginfo.cpp b/utils/fginfo.cpp
index 7d6180e..80da9d5 100644 (file)
--- a/utils/fginfo.cpp
+++ b/utils/fginfo.cpp
@@ -83,7 +83,7 @@ int main( int argc, char *argv[] ) {
         // Read factorgraph
         FactorGraph fg;
         char *infile = argv[1];
-        int calc_tw = atoi(argv[2]);
+        size_t maxstates = fromString<size_t>( argv[2] );
         fg.ReadFromFile( infile );
 
         // Output various statistics

diff --git a/utils/uai2fg.cpp b/utils/uai2fg.cpp
index e58c2a7..e1c315c 100644 (file)
--- a/utils/uai2fg.cpp
+++ b/utils/uai2fg.cpp
@@ -190,9 +190,9 @@ int main( int argc, char *argv[] ) {
         cout << "If run_jtree!=0, runs a junction tree and reports the results in the UAI 2008 results file format." << endl;
         return 1;
     } else {
-        long verbose = atoi( argv[6] );
-        long type = atoi( argv[4] );
-        bool run_jtree = atoi( argv[5] );
+        long verbose = fromString<long>( argv[6] );
+        long type = fromString<long>( argv[4] );
+        bool run_jtree = fromString<bool>( argv[5] );
 
         // read factor graph
         vector<Var> vars;