Fixed testem failure caused by rounding error

[libdai.git] / include / dai / exceptions.h

diff --git a/include/dai/exceptions.h b/include/dai/exceptions.h
index 0f5c420..6023df0 100644 (file)
--- a/include/dai/exceptions.h
+++ b/include/dai/exceptions.h
@@ -22,6 +22,7 @@
 
 /// \file
 /// \brief Defines Exception class and the DAI_THROW macro
 
 /// \file
 /// \brief Defines Exception class and the DAI_THROW macro

+/// \todo Improve documentation

 
 
 #ifndef __defined_libdai_exceptions_h
 
 
 #ifndef __defined_libdai_exceptions_h


@@ -56,26 +57,43 @@ namespace dai {
 /// Represents an exception (based on std::runtime_error)
 class Exception : public std::runtime_error {
     public:
 /// Represents an exception (based on std::runtime_error)
 class Exception : public std::runtime_error {
     public:

+        /// Enumeration of exceptions used in libDAI
+        enum Code {NOT_IMPLEMENTED,
+                   UNKNOWN_DAI_ALGORITHM,
+                   UNKNOWN_PROPERTY_TYPE,
+                   MALFORMED_PROPERTY,
+                   UNKNOWN_ENUM_VALUE,
+                   CANNOT_READ_FILE,
+                   CANNOT_WRITE_FILE,
+                   INVALID_FACTORGRAPH_FILE,
+                   NOT_ALL_PROPERTIES_SPECIFIED,
+                   MULTIPLE_UNDO,
+                   FACTORGRAPH_NOT_CONNECTED,
+                   IMPOSSIBLE_TYPECAST,
+                   INTERNAL_ERROR,
+                   NOT_NORMALIZABLE,
+                   INVALID_EVIDENCE_FILE,
+                   INVALID_EVIDENCE_LINE,
+                   INVALID_EVIDENCE_OBSERVATION,
+                   INVALID_SHARED_PARAMETERS_ORDER,
+                   INVALID_SHARED_PARAMETERS_INPUT_LINE,
+                   UNKNOWN_PARAMETER_ESTIMATION_METHOD,
+                   NUM_ERRORS};  // NUM_ERRORS should be the last entry
+

         /// Constructor
         /// Constructor

-            Exception(size_t code, const std::string& msg = "") : std::runtime_error(ErrorStrings[code] + " [" +  msg + "]") {}
+        Exception( Code _code, const std::string& msg="" ) : std::runtime_error(ErrorStrings[_code] + " [" +  msg + "]"), errorcode(_code) {}
+
+        /// Copy constructor
+        Exception( const Exception &e ) : std::runtime_error(e), errorcode(e.errorcode) {}
+
+        /// Returns error code of this exception
+        Code code() const { return errorcode; }

 
 

-        /// Enumeration of exceptions used in libDAI
-        enum codes {NOT_IMPLEMENTED,
-                    UNKNOWN_DAI_ALGORITHM,
-                    UNKNOWN_PROPERTY_TYPE,
-                    MALFORMED_PROPERTY,
-                    UNKNOWN_ENUM_VALUE,
-                    CANNOT_READ_FILE,
-                    CANNOT_WRITE_FILE,
-                    INVALID_FACTORGRAPH_FILE,
-                    NOT_ALL_PROPERTIES_SPECIFIED,
-                    MULTIPLE_UNDO,
-                    FACTORGRAPH_NOT_CONNECTED,
-                    IMPOSSIBLE_TYPECAST,
-                    INTERNAL_ERROR,
-                    NUM_ERRORS};  // NUM_ERRORS should be the last entry

 
     private:
 
     private:

+        /// Contains the error code of this exception
+        Code errorcode;
+

         /// Error messages corresponding to the exceptions enumerated above
         static std::string ErrorStrings[NUM_ERRORS];
 };
         /// Error messages corresponding to the exceptions enumerated above
         static std::string ErrorStrings[NUM_ERRORS];
 };