Replaced doubles by Reals, fixed two bugs

[libdai.git] / src / properties.cpp

diff --git a/src/properties.cpp b/src/properties.cpp
index 14a2714..628ef98 100644 (file)
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -1,33 +1,22 @@
-/*  Copyright (C) 2006-2008  Joris Mooij  [j dot mooij at science dot ru dot nl]
-    Radboud University Nijmegen, The Netherlands
-    
-    This file is part of libDAI.
-
-    libDAI is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    libDAI is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with libDAI; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+/*  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) 2006-2009  Joris Mooij  [joris dot mooij at libdai dot org]
+ *  Copyright (C) 2006-2007  Radboud University Nijmegen, The Netherlands
+ */
 
 
 #include <iostream>
 #include <dai/properties.h>
-#include <dai/alldai.h>
+#include <dai/exceptions.h>
 
 
 namespace dai {
 
 
-/// Sends a single Property object to an output stream
 std::ostream& operator<< (std::ostream & os, const Property & p) {
     os << p.first << "=";
     if( p.second.type() == typeid(size_t) )
@@ -36,67 +25,41 @@ std::ostream& operator<< (std::ostream & os, const Property & p) {
         os << boost::any_cast<std::string>(p.second);
     else if( p.second.type() == typeid(double) )
         os << boost::any_cast<double>(p.second);
+    else if( p.second.type() == typeid(long double) )
+        os << boost::any_cast<long double>(p.second);
     else if( p.second.type() == typeid(bool) )
         os << boost::any_cast<bool>(p.second);
-    else if( p.second.type() == typeid(Properties) )
-        os << boost::any_cast<Properties>(p.second);
-#ifdef WITH_BP
-    else if( p.second.type() == typeid(BP::UpdateType) )
-        os << boost::any_cast<BP::UpdateType>(p.second);
-#endif
-#ifdef WITH_HAK
-    else if( p.second.type() == typeid(HAK::ClustersType) )
-        os << boost::any_cast<HAK::ClustersType>(p.second);
-#endif
-#ifdef WITH_JTREE
-    else if( p.second.type() == typeid(JTree::UpdateType) )
-        os << boost::any_cast<JTree::UpdateType>(p.second);
-#endif
-#ifdef WITH_MR
-    else if( p.second.type() == typeid(MR::UpdateType) )
-        os << boost::any_cast<MR::UpdateType>(p.second);
-    else if( p.second.type() == typeid(MR::InitType) )
-        os << boost::any_cast<MR::InitType>(p.second);
-#endif
-#ifdef WITH_TREEEP
-    else if( p.second.type() == typeid(TreeEP::TypeType) )
-        os << boost::any_cast<TreeEP::TypeType>(p.second);
-#endif
-#ifdef WITH_LC
-    else if( p.second.type() == typeid(LC::CavityType) )
-        os << boost::any_cast<LC::CavityType>(p.second);
-    else if( p.second.type() == typeid(LC::UpdateType) )
-        os << boost::any_cast<LC::UpdateType>(p.second);
-#endif
+    else if( p.second.type() == typeid(PropertySet) )
+        os << boost::any_cast<PropertySet>(p.second);
     else
-        throw "Unknown property type";
+        DAI_THROW(UNKNOWN_PROPERTY_TYPE);
     return( os );
 }
 
 
-/// Sends a Properties object to an output stream
-std::ostream& operator<< (std::ostream & os, const Properties & ps) {
+/// Writes a PropertySet object to an output stream
+std::ostream& operator<< (std::ostream & os, const PropertySet & ps) {
     os << "[";
-    for( Properties::const_iterator p = ps.begin(); p != ps.end(); p++ ) {
+    for( PropertySet::const_iterator p = ps.begin(); p != ps.end(); p++ ) {
         if( p != ps.begin() )
             os << ",";
-        os << *p;
+        os << (Property)*p;
     }
     os << "]";
     return os;
 }
 
 
-/// Reads a Properties object from an input stream, storing values as strings
-std::istream& operator >> (std::istream& is, Properties & ps) {
-    ps = Properties();
+/// Reads a PropertySet object from an input stream, storing values as strings
+std::istream& operator>> (std::istream& is, PropertySet & ps) {
+    ps = PropertySet();
 
     std::string s;
     is >> s;
 
     // Check whether s is of the form "[.*]"
     if( (s.length() < 2) || (s.at(0) != '[') || (s.at(s.length()-1)) != ']' )
-        throw "Malformed property";
+        DAI_THROWE(MALFORMED_PROPERTY,"Malformed PropertySet: " + s);
 
     size_t N = s.length() - 1;
     for( size_t token_start = 1; token_start < N; ) {
@@ -106,10 +69,10 @@ std::istream& operator >> (std::istream& is, Properties & ps) {
         for( token_end = token_start + 1; token_end < N; token_end++ )
             if( s[token_end] == '=' )
                 break;
-        if( token_end == N )
-            throw "Malformed property key";
         // we found a key
         std::string key = s.substr(token_start, token_end - token_start);
+        if( token_end == N )
+            DAI_THROWE(MALFORMED_PROPERTY,"Malformed Property: " + key);
 
         token_start = token_end + 1;
         // scan until matching ',' is found
@@ -123,7 +86,7 @@ std::istream& operator >> (std::istream& is, Properties & ps) {
                 break;
         }
         if( !(level == 0) )
-            throw "Malformed property value";
+            DAI_THROWE(MALFORMED_PROPERTY,"Malformed Property: " + s.substr(token_start, token_end - token_start));
         // we found a vlue
         std::string value = s.substr(token_start, token_end - token_start);