LEMON/LEMON-main Changeset - r294:cbe3ec2d59d2

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r294:cbe3ec2d59d2

« 292:e7af73
« 293:47fbc8

296:9768e6 »
295:7c796c »

r294:cbe3ec2d59d2

Wed, 01 Oct 2008 13:56:40

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge

0 11 0

merge default

3 files changed with 389 insertions and 523 deletions:

demo/lgf_demo.cc

lemon/arg_parser.h

lemon/assert.h

lemon/bfs.h

lemon/concepts/heap.h

lemon/dfs.h

lemon/dijkstra.h

lemon/error.h

199

341

lemon/graph_to_eps.h

lemon/lgf_reader.h

120

lemon/lgf_writer.h

↑ Collapse diff ↑

demo/lgf_demo.cc

Show inline comments

@@ -48,9 +48,9 @@
 		      arcMap("capacity", cap).       // read the 'capacity' arc map into cap
 		      node("source", s).             // read 'source' node to s
 		      node("target", t).             // read 'target' node to t
 		      run();
-		  } catch (DataFormatError& error) { // check if there was any error
+		  } catch (Exception& error) { // check if there was any error
 		    std::cerr << "Error: " << error.what() << std::endl;
 		    return -1;
+		  }

lemon/arg_parser.h

Show inline comments

@@ -309,10 +309,11 @@
 		    ///Magic type for operator[]
 		    ///This is the type of the return value of ArgParser::operator[]().
 		    ///It automatically converts to \c int, \c double, \c bool or
 		    ///\c std::string if the type of the option matches, otherwise it
 		    ///throws an exception (i.e. it performs runtime type checking).
 		    ///\c std::string if the type of the option matches, which is checked
 		    ///with an \ref LEMON_ASSERT "assertion" (i.e. it performs runtime
 		    ///type checking).
 		    class RefType
+		    {
 		      const ArgParser &_parser;
 		      std::string _name;

lemon/assert.h

Show inline comments

@@ -107,9 +107,9 @@
 		/// \ingroup exceptions
 		///
 		/// \brief Macro for assertion with customizable message
 		///
-		/// Macro for assertion with customizable message.
 		/// Macro for assertion with customizable message.
 		/// \param exp An expression that must be convertible to \c bool.  If it is \c
 		/// false, then an assertion is raised. The concrete behaviour depends on the
 		/// settings of the assertion system.
 		/// \param msg A <tt>const char*</tt> parameter, which can be used to provide

lemon/bfs.h

Show inline comments

@@ -134,18 +134,8 @@
 		            typename TR=BfsDefaultTraits<GR> >
 		#endif
 		  class Bfs {
 		  public:
 		    ///\ref Exception for uninitialized parameters.
 		    ///This error represents problems in the initialization of the
 		    ///parameters of the algorithm.
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw() {
 		        return "lemon::Bfs::UninitializedParameter";
+		      }
 		    };
 		    ///The type of the digraph the algorithm runs on.
 		    typedef typename TR::Digraph Digraph;
@@ -231,9 +221,10 @@
 		    struct SetPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "PredMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref PredMap type.
@@ -249,9 +240,10 @@
 		    struct SetDistMapTraits : public Traits {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "DistMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref DistMap type.
@@ -267,9 +259,10 @@
 		    struct SetReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ReachedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref ReachedMap type.
@@ -285,9 +278,10 @@
 		    struct SetProcessedMapTraits : public Traits {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ProcessedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref ProcessedMap type.
@@ -303,8 +297,9 @@
 		      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &g)
+		      {
 		        return new ProcessedMap(g);
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
@@ -1039,9 +1034,8 @@
 		    ///
 		    ///\return \c true if \c t is reachable form \c s.
 		    bool run(Node s, Node t)
+		    {
 		      if (s==INVALID || t==INVALID) throw UninitializedParameter();
 		      Bfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
 		      if (Base::_pred)
 		        alg.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
 		      if (Base::_dist)
@@ -1322,20 +1316,8 @@
 		#endif
 		  class BfsVisit {
 		  public:
 		    /// \brief \ref Exception for uninitialized parameters.
 		    ///
 		    /// This error represents problems in the initialization
 		    /// of the parameters of the algorithm.
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw()
+		      {
 		        return "lemon::BfsVisit::UninitializedParameter";
+		      }
 		    };
 		    ///The traits class.
 		    typedef _Traits Traits;
 		    ///The type of the digraph the algorithm runs on.
@@ -1388,9 +1370,10 @@
 		    template <class T>
 		    struct SetReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &digraph) {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ReachedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// ReachedMap type.

lemon/concepts/heap.h

Show inline comments

@@ -128,9 +128,8 @@
 		      /// This method sets the priority of the given item if it is
 		      /// already stored in the heap.
 		      /// Otherwise it inserts the given item with the given priority.
 		      ///
 		      /// It may throw an \ref UnderflowPriorityException.
 		      /// \param i The item.
 		      /// \param p The priority.
 		      void set(const Item &i, const Prio &p) {}

lemon/dfs.h

Show inline comments

@@ -135,18 +135,8 @@
 		            typename TR=DfsDefaultTraits<GR> >
 		#endif
 		  class Dfs {
 		  public:
 		    ///\ref Exception for uninitialized parameters.
 		    ///This error represents problems in the initialization of the
 		    ///parameters of the algorithm.
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw() {
 		        return "lemon::Dfs::UninitializedParameter";
+		      }
 		    };
 		    ///The type of the digraph the algorithm runs on.
 		    typedef typename TR::Digraph Digraph;
@@ -231,9 +221,10 @@
 		    struct SetPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "PredMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref PredMap type.
@@ -249,9 +240,10 @@
 		    struct SetDistMapTraits : public Traits {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "DistMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref DistMap type.
@@ -267,9 +259,10 @@
 		    struct SetReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ReachedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref ReachedMap type.
@@ -285,9 +278,10 @@
 		    struct SetProcessedMapTraits : public Traits {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ProcessedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref ProcessedMap type.
@@ -973,9 +967,8 @@
 		    ///
 		    ///\return \c true if \c t is reachable form \c s.
 		    bool run(Node s, Node t)
+		    {
 		      if (s==INVALID || t==INVALID) throw UninitializedParameter();
 		      Dfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
 		      if (Base::_pred)
 		        alg.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
 		      if (Base::_dist)
@@ -1269,20 +1262,8 @@
 		#endif
 		  class DfsVisit {
 		  public:
 		    /// \brief \ref Exception for uninitialized parameters.
 		    ///
 		    /// This error represents problems in the initialization
 		    /// of the parameters of the algorithm.
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw()
+		      {
 		        return "lemon::DfsVisit::UninitializedParameter";
+		      }
 		    };
 		    ///The traits class.
 		    typedef _Traits Traits;
 		    ///The type of the digraph the algorithm runs on.
@@ -1335,9 +1316,10 @@
 		    template <class T>
 		    struct SetReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &digraph) {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ReachedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// ReachedMap type.

lemon/dijkstra.h

Show inline comments

@@ -224,18 +224,8 @@
 		            typename TR=DijkstraDefaultTraits<GR,LM> >
 		#endif
 		  class Dijkstra {
 		  public:
 		    ///\ref Exception for uninitialized parameters.
 		    ///This error represents problems in the initialization of the
 		    ///parameters of the algorithm.
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw() {
 		        return "lemon::Dijkstra::UninitializedParameter";
+		      }
 		    };
 		    ///The type of the digraph the algorithm runs on.
 		    typedef typename TR::Digraph Digraph;
@@ -331,9 +321,10 @@
 		    struct SetPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "PredMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref PredMap type.
@@ -350,9 +341,10 @@
 		    struct SetDistMapTraits : public Traits {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "DistMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref DistMap type.
@@ -369,9 +361,10 @@
 		    struct SetProcessedMapTraits : public Traits {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ProcessedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\ref ProcessedMap type.
@@ -407,13 +400,15 @@
 		    struct SetHeapTraits : public Traits {
 		      typedef CR HeapCrossRef;
 		      typedef H Heap;
 		      static HeapCrossRef *createHeapCrossRef(const Digraph &) {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "HeapCrossRef is not initialized");
 		        return 0; // ignore warnings
+		      }
 		      static Heap *createHeap(HeapCrossRef &)
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "Heap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///heap and cross reference type
@@ -1157,9 +1152,8 @@
 		    ///This method runs %Dijkstra algorithm from the given source node
 		    ///in order to compute the shortest path to each node.
 		    void run(Node s)
+		    {
 		      if (s==INVALID) throw UninitializedParameter();
 		      Dijkstra<Digraph,LengthMap,TR>
 		        dijk(*reinterpret_cast<const Digraph*>(Base::_g),
 		             *reinterpret_cast<const LengthMap*>(Base::_length));
 		      if (Base::_pred)
@@ -1179,9 +1173,8 @@
 		    ///
 		    ///\return \c true if \c t is reachable form \c s.
 		    bool run(Node s, Node t)
+		    {
 		      if (s==INVALID || t==INVALID) throw UninitializedParameter();
 		      Dijkstra<Digraph,LengthMap,TR>
 		        dijk(*reinterpret_cast<const Digraph*>(Base::_g),
 		             *reinterpret_cast<const LengthMap*>(Base::_length));
 		      if (Base::_pred)

lemon/error.h

Show inline comments

@@ -34,382 +34,240 @@
 		  /// \addtogroup exceptions
 		  /// @{
-		  /// \brief Exception safe wrapper class.
+		  /// \brief Generic exception class.
 		  ///
 		  /// Exception safe wrapper class to implement the members of exceptions.
 		  template <typename _Type>
 		  class ExceptionMember {
 		  public:
 		    typedef _Type Type;
 		    ExceptionMember() throw() {
 		      try {
 		        ptr.reset(new Type());
 		      } catch (...) {}
+		    }
 		    ExceptionMember(const Type& type) throw() {
 		      try {
 		        ptr.reset(new Type());
 		        if (ptr.get() == 0) return;
 		        *ptr = type;
 		      } catch (...) {}
+		    }
 		    ExceptionMember(const ExceptionMember& copy) throw() {
 		      try {
 		        if (!copy.valid()) return;
 		        ptr.reset(new Type());
 		        if (ptr.get() == 0) return;
 		        *ptr = copy.get();
 		      } catch (...) {}
+		    }
 		    ExceptionMember& operator=(const ExceptionMember& copy) throw() {
 		      if (ptr.get() == 0) return;
 		      try {
 		        if (!copy.valid()) return;
 		        *ptr = copy.get();
 		      } catch (...) {}
+		    }
 		    void set(const Type& type) throw() {
 		      if (ptr.get() == 0) return;
 		      try {
 		        *ptr = type;
 		      } catch (...) {}
+		    }
 		    const Type& get() const {
 		      return *ptr;
+		    }
 		    bool valid() const throw() {
 		      return ptr.get() != 0;
+		    }
 		  private:
 		    std::auto_ptr<_Type> ptr;
 		  };
 		  /// Exception-safe convenient error message builder class.
 		  /// Helper class which provides a convenient ostream-like (operator <<
 		  /// based) interface to create a string message. Mostly useful in
 		  /// exception classes (therefore the name).
 		  class ErrorMessage {
 		  protected:
 		    ///\e
 		    mutable std::auto_ptr<std::ostringstream> buf;
 		    ///\e
 		    bool init() throw() {
 		      try {
 		        buf.reset(new std::ostringstream);
+		      }
 		      catch(...) {
 		        buf.reset();
+		      }
 		      return buf.get();
+		    }
 		  public:
 		    ///\e
 		    ErrorMessage() throw() { init(); }
 		    ErrorMessage(const ErrorMessage& em) throw() : buf(em.buf) { }
 		    ///\e
 		    ErrorMessage(const char *msg) throw() {
 		      init();
 		      *this << msg;
+		    }
 		    ///\e
 		    ErrorMessage(const std::string &msg) throw() {
 		      init();
 		      *this << msg;
+		    }
 		    ///\e
 		    template <typename T>
 		    ErrorMessage& operator<<(const T &t) throw() {
 		      if( ! buf.get() ) return *this;
 		      try {
 		        *buf << t;
+		      }
 		      catch(...) {
 		        buf.reset();
+		      }
 		      return *this;
+		    }
 		    ///\e
 		    const char* message() throw() {
 		      if( ! buf.get() ) return 0;
 		      const char* mes = 0;
 		      try {
 		        mes = buf->str().c_str();
+		      }
 		      catch(...) {}
 		      return mes;
+		    }
 		  };
 		  /// Generic exception class.
 		  /// Base class for exceptions used in LEMON.
 		  ///
 		  class Exception : public std::exception {
 		  public:
 		    ///\e
 		    Exception() {}
-		    ///\e
+		    ///Constructor
 		    Exception() throw() {}
 		    ///Virtual destructor
 		    virtual ~Exception() throw() {}
-		    ///\e
+		    ///A short description of the exception
 		    virtual const char* what() const throw() {
 		      return "lemon::Exception";
+		    }
 		  };
-		  /// One of the two main subclasses of \ref Exception.
+		  /// \brief Input-Output error
 		  ///
 		  /// This exception is thrown when a file operation cannot be
 		  /// succeeded.
 		  class IoError : public Exception {
 		  protected:
 		    std::string _message;
 		    std::string _file;
 		  /// Logic errors represent problems in the internal logic of a program;
 		  /// in theory, these are preventable, and even detectable before the
 		  /// program runs (e.g. violations of class invariants).
 		  ///
 		  /// A typical example for this is \ref UninitializedParameter.
 		  class LogicError : public Exception {
 		    mutable std::string _what;
 		  public:
 		    /// Copy constructor
 		    IoError(const IoError &error) throw() : Exception() {
 		      message(error._message);
 		      file(error._file);
+		    }
 		    /// Constructor
 		    explicit IoError(const char *message) throw() {
 		      IoError::message(message);
+		    }
 		    /// Constructor
 		    explicit IoError(const std::string &message) throw() {
 		      IoError::message(message);
+		    }
 		    /// Constructor
 		    explicit IoError(const char *message,
 		                     const std::string &file) throw() {
 		      IoError::message(message);
 		      IoError::file(file);
+		    }
 		    /// Constructor
 		    explicit IoError(const std::string &message,
 		                     const std::string &file) throw() {
 		      IoError::message(message);
 		      IoError::file(file);
+		    }
 		    /// Virtual destructor
 		    virtual ~IoError() throw() {}
 		    /// Set the error message
 		    void message(const char *message) throw() {
 		      try {
 		        _message = message;
 		      } catch (...) {}
+		    }
 		    /// Set the error message
 		    void message(const std::string& message) throw() {
 		      try {
 		        _message = message;
 		      } catch (...) {}
+		    }
 		    /// Set the file name
 		    void file(const std::string &file) throw() {
 		      try {
 		        _file = file;
 		      } catch (...) {}
+		    }
 		    /// Returns the error message
 		    const std::string& message() const throw() {
 		      return _message;
+		    }
 		    /// \brief Returns the filename
 		    ///
 		    /// Returns the filename or an empty string if it was not specified.
 		    const std::string& file() const throw() {
 		      return _file;
+		    }
 		    /// \brief Returns a short error message
 		    ///
 		    /// Returns a short error message which contains the message and the
 		    /// file name.
 		    virtual const char* what() const throw() {
-		      return "lemon::LogicError";
+		      try {
 		        _what.clear();
 		        std::ostringstream oss;
 		        oss << "lemon:IoError" << ": ";
 		        oss << _message;
 		        if (!_file.empty()) {
 		          oss << " ('" << _file << "')";
+		        }
 		        _what = oss.str();
+		      }
 		      catch (...) {}
 		      if (!_what.empty()) return _what.c_str();
 		      else return "lemon:IoError";
+		    }
 		  };
 		  /// \ref Exception for uninitialized parameters.
 		  /// This error represents problems in the initialization
 		  /// of the parameters of the algorithms.
 		  class UninitializedParameter : public LogicError {
 		  public:
 		    virtual const char* what() const throw() {
 		      return "lemon::UninitializedParameter";
+		    }
 		  };
 		  /// One of the two main subclasses of \ref Exception.
 		  /// Runtime errors represent problems outside the scope of a program;
 		  /// they cannot be easily predicted and can generally only be caught
 		  /// as the program executes.
 		  class RuntimeError : public Exception {
 		  public:
 		    virtual const char* what() const throw() {
 		      return "lemon::RuntimeError";
+		    }
 		  };
 		  ///\e
 		  class RangeError : public RuntimeError {
 		  public:
 		    virtual const char* what() const throw() {
 		      return "lemon::RangeError";
+		    }
 		  };
 		  ///\e
 		  class IoError : public RuntimeError {
 		  public:
 		    virtual const char* what() const throw() {
 		      return "lemon::IoError";
+		    }
 		  };
 		  ///\e
 		  class DataFormatError : public IoError {
 		  /// \brief Format error
 		  ///
 		  /// This exception is thrown when an input file has wrong
 		  /// format or a data representation is not legal.
 		  class FormatError : public Exception {
 		  protected:
 		    ExceptionMember<std::string> _message;
 		    ExceptionMember<std::string> _file;
 		    std::string _message;
 		    std::string _file;
 		    int _line;
-		    mutable ExceptionMember<std::string> _message_holder;
+		    mutable std::string _what;
 		  public:
 		    DataFormatError(const DataFormatError &dfe) :
 		      IoError(dfe), _message(dfe._message), _file(dfe._file),
 		      _line(dfe._line) {}
 		    ///\e
 		    explicit DataFormatError(const char *the_message)
 		      : _message(the_message), _line(0) {}
 		    ///\e
 		    DataFormatError(const std::string &file_name, int line_num,
 		                    const char *the_message)
 		      : _message(the_message), _line(line_num) { file(file_name); }
 		    ///\e
 		    void line(int ln) { _line = ln; }
 		    ///\e
 		    void message(const std::string& msg) { _message.set(msg); }
 		    ///\e
 		    void file(const std::string &fl) { _file.set(fl); }
 		    ///\e
 		    int line() const { return _line; }
 		    ///\e
 		    const char* message() const {
 		      if (_message.valid() && !_message.get().empty()) {
 		        return _message.get().c_str();
 		      } else {
 		        return 0;
+		      }
+		    /// Copy constructor
 		    FormatError(const FormatError &error) throw() : Exception() {
 		      message(error._message);
 		      file(error._file);
 		      line(error._line);
+		    }
 		    /// \brief Returns the filename.
 		    ///
 		    /// Returns \e null if the filename was not specified.
 		    const char* file() const {
 		      if (_file.valid() && !_file.get().empty()) {
 		        return _file.get().c_str();
 		      } else {
 		        return 0;
+		      }
+		    /// Constructor
 		    explicit FormatError(const char *message) throw() {
 		      FormatError::message(message);
 		      _line = 0;
+		    }
-		    ///\e
+		    /// Constructor
 		    explicit FormatError(const std::string &message) throw() {
 		      FormatError::message(message);
 		      _line = 0;
+		    }
 		    /// Constructor
 		    explicit FormatError(const char *message,
 		                         const std::string &file, int line = 0) throw() {
 		      FormatError::message(message);
 		      FormatError::file(file);
 		      FormatError::line(line);
+		    }
 		    /// Constructor
 		    explicit FormatError(const std::string &message,
 		                         const std::string &file, int line = 0) throw() {
 		      FormatError::message(message);
 		      FormatError::file(file);
 		      FormatError::line(line);
+		    }
 		    /// Virtual destructor
 		    virtual ~FormatError() throw() {}
 		    /// Set the line number
 		    void line(int line) throw() { _line = line; }
 		    /// Set the error message
 		    void message(const char *message) throw() {
 		      try {
 		        _message = message;
 		      } catch (...) {}
+		    }
 		    /// Set the error message
 		    void message(const std::string& message) throw() {
 		      try {
 		        _message = message;
 		      } catch (...) {}
+		    }
 		    /// Set the file name
 		    void file(const std::string &file) throw() {
 		      try {
 		        _file = file;
 		      } catch (...) {}
+		    }
 		    /// \brief Returns the line number
 		    ///
 		    /// Returns the line number or zero if it was not specified.
 		    int line() const throw() { return _line; }
 		    /// Returns the error message
 		    const std::string& message() const throw() {
 		      return _message;
+		    }
 		    /// \brief Returns the filename
 		    ///
 		    /// Returns the filename or an empty string if it was not specified.
 		    const std::string& file() const throw() {
 		      return _file;
+		    }
 		    /// \brief Returns a short error message
 		    ///
 		    /// Returns a short error message which contains the message, the
 		    /// file name and the line number.
 		    virtual const char* what() const throw() {
 		      try {
 		        std::ostringstream ostr;
 		        ostr << "lemon:DataFormatError" << ": ";
 		        if (message()) ostr << message();
 		        if( file() || line() != 0 ) {
 		          ostr << " (";
 		          if( file() ) ostr << "in file '" << file() << "'";
 		          if( file() && line() != 0 ) ostr << " ";
 		          if( line() != 0 ) ostr << "at line " << line();
-		          ostr << ")";
+		        _what.clear();
 		        std::ostringstream oss;
 		        oss << "lemon:FormatError" << ": ";
 		        oss << _message;
 		        if (!_file.empty() || _line != 0) {
 		          oss << " (";
 		          if (!_file.empty()) oss << "in file '" << _file << "'";
 		          if (!_file.empty() && _line != 0) oss << " ";
 		          if (_line != 0) oss << "at line " << _line;
 		          oss << ")";
+		        }
-		        _message_holder.set(ostr.str());
+		        _what = oss.str();
+		      }
 		      catch (...) {}
 		      if( _message_holder.valid()) return _message_holder.get().c_str();
 		      return "lemon:DataFormatError";
 		      if (!_what.empty()) return _what.c_str();
 		      else return "lemon:FormatError";
+		    }
 		    virtual ~DataFormatError() throw() {}
 		  };
 		  ///\e
 		  class FileOpenError : public IoError {
 		  protected:
 		    ExceptionMember<std::string> _file;
 		    mutable ExceptionMember<std::string> _message_holder;
 		  public:
 		    FileOpenError(const FileOpenError &foe) :
 		      IoError(foe), _file(foe._file) {}
 		    ///\e
 		    explicit FileOpenError(const std::string& fl)
 		      : _file(fl) {}
 		    ///\e
 		    void file(const std::string &fl) { _file.set(fl); }
 		    /// \brief Returns the filename.
 		    ///
 		    /// Returns \e null if the filename was not specified.
 		    const char* file() const {
 		      if (_file.valid() && !_file.get().empty()) {
 		        return _file.get().c_str();
 		      } else {
 		        return 0;
+		      }
+		    }
 		    ///\e
 		    virtual const char* what() const throw() {
 		      try {
 		        std::ostringstream ostr;
 		        ostr << "lemon::FileOpenError" << ": ";
 		        ostr << "Cannot open file - " << file();
 		        _message_holder.set(ostr.str());
+		      }
 		      catch (...) {}
 		      if( _message_holder.valid()) return _message_holder.get().c_str();
 		      return "lemon::FileOpenError";
+		    }
 		    virtual ~FileOpenError() throw() {}
 		  };
 		  class IoParameterError : public IoError {
 		  protected:
 		    ExceptionMember<std::string> _message;
 		    ExceptionMember<std::string> _file;
 		    mutable ExceptionMember<std::string> _message_holder;
 		  public:
 		    IoParameterError(const IoParameterError &ile) :
 		      IoError(ile), _message(ile._message), _file(ile._file) {}
 		    ///\e
 		    explicit IoParameterError(const char *the_message)
 		      : _message(the_message) {}
 		    ///\e
 		    IoParameterError(const char *file_name, const char *the_message)
 		      : _message(the_message), _file(file_name) {}
 		     ///\e
 		    void message(const std::string& msg) { _message.set(msg); }
 		    ///\e
 		    void file(const std::string &fl) { _file.set(fl); }
 		     ///\e
 		    const char* message() const {
 		      if (_message.valid()) {
 		        return _message.get().c_str();
 		      } else {
 		        return 0;
+		      }
+		    }
 		    /// \brief Returns the filename.
 		    ///
 		    /// Returns \c 0 if the filename was not specified.
 		    const char* file() const {
 		      if (_file.valid()) {
 		        return _file.get().c_str();
 		      } else {
 		        return 0;
+		      }
+		    }
 		    ///\e
 		    virtual const char* what() const throw() {
 		      try {
 		        std::ostringstream ostr;
 		        if (message()) ostr << message();
 		        if (file()) ostr << "(when reading file '" << file() << "')";
 		        _message_holder.set(ostr.str());
+		      }
 		      catch (...) {}
 		      if( _message_holder.valid() ) return _message_holder.get().c_str();
 		      return "lemon:IoParameterError";
+		    }
 		    virtual ~IoParameterError() throw() {}
 		  };
 		  /// @}

lemon/graph_to_eps.h

Show inline comments

@@ -39,8 +39,9 @@
 		#include<lemon/dim2.h>
 		#include<lemon/maps.h>
 		#include<lemon/color.h>
 		#include<lemon/bits/bezier.h>
 		#include<lemon/error.h>
 		///\ingroup eps_io
 		///\file
@@ -1165,10 +1166,15 @@
 		template<class G>
 		GraphToEps<DefaultGraphToEpsTraits<G> >
 		graphToEps(G &g,const char *file_name)
+		{
 		  std::ostream* os = new std::ofstream(file_name);
 		  if (!(*os)) {
 		    delete os;
 		    throw IoError("Cannot write file", file_name);
+		  }
 		  return GraphToEps<DefaultGraphToEpsTraits<G> >
-		    (DefaultGraphToEpsTraits<G>(g,*new std::ofstream(file_name),true));
+		    (DefaultGraphToEpsTraits<G>(g,*os,true));
+		}
 		///Generates an EPS file from a graph
@@ -1181,10 +1187,15 @@
 		template<class G>
 		GraphToEps<DefaultGraphToEpsTraits<G> >
 		graphToEps(G &g,const std::string& file_name)
+		{
 		  std::ostream* os = new std::ofstream(file_name.c_str());
 		  if (!(*os)) {
 		    delete os;
 		    throw IoError("Cannot write file", file_name);
+		  }
 		  return GraphToEps<DefaultGraphToEpsTraits<G> >
-		    (DefaultGraphToEpsTraits<G>(g,*new std::ofstream(file_name.c_str()),true));
+		    (DefaultGraphToEpsTraits<G>(g,*os,true));
+		}
 		} //END OF NAMESPACE LEMON

lemon/lgf_reader.h

Show inline comments

@@ -47,13 +47,15 @@
 		    struct DefaultConverter {
 		      Value operator()(const std::string& str) {
 		        std::istringstream is(str);
 		        Value value;
-		        is >> value;
+		        if (!(is >> value)) {
 		          throw FormatError("Cannot read token");
+		        }
 		        char c;
 		        if (is >> std::ws >> c) {
-		          throw DataFormatError("Remaining characters in token");
+		          throw FormatError("Remaining characters in token");
+		        }
 		        return value;
+		      }
 		    };
@@ -165,9 +167,9 @@
 		          _map.find(str);
 		        if (it == _map.end()) {
 		          std::ostringstream msg;
 		          msg << "Item not found: " << str;
-		          throw DataFormatError(msg.str().c_str());
+		          throw FormatError(msg.str());
+		        }
 		        return it->second;
+		      }
 		    };
@@ -183,14 +185,14 @@
 		        : _graph(graph), _map(map) {}
 		      typename Graph::Arc operator()(const std::string& str) {
 		        if (str.empty() || (str[0] != '+' && str[0] != '-')) {
-		          throw DataFormatError("Item must start with '+' or '-'");
+		          throw FormatError("Item must start with '+' or '-'");
+		        }
 		        typename std::map<std::string, typename Graph::Edge>
 		          ::const_iterator it = _map.find(str.substr(1));
 		        if (it == _map.end()) {
-		          throw DataFormatError("Item not found");
+		          throw FormatError("Item not found");
+		        }
 		        return _graph.direct(it->second, str[0] == '+');
+		      }
 		    };
@@ -234,9 +236,9 @@
 		    inline char readEscape(std::istream& is) {
 		      char c;
 		      if (!is.get(c))
-		        throw DataFormatError("Escape format error");
+		        throw FormatError("Escape format error");
 		      switch (c) {
 		      case '\\':
 		        return '\\';
@@ -263,18 +265,18 @@
 		      case 'x':
+		        {
 		          int code;
 		          if (!is.get(c) || !isHex(c))
-		            throw DataFormatError("Escape format error");
+		            throw FormatError("Escape format error");
 		          else if (code = valueHex(c), !is.get(c) || !isHex(c)) is.putback(c);
 		          else code = code * 16 + valueHex(c);
 		          return code;
+		        }
 		      default:
+		        {
 		          int code;
 		          if (!isOct(c))
-		            throw DataFormatError("Escape format error");
+		            throw FormatError("Escape format error");
 		          else if (code = valueOct(c), !is.get(c) || !isOct(c))
 		            is.putback(c);
 		          else if (code = code * 8 + valueOct(c), !is.get(c) || !isOct(c))
 		            is.putback(c);
@@ -299,9 +301,9 @@
 		            c = readEscape(is);
 		          os << c;
+		        }
 		        if (!is)
-		          throw DataFormatError("Quoted format error");
+		          throw FormatError("Quoted format error");
 		      } else {
 		        is.putback(c);
 		        while (is.get(c) && !isWhiteSpace(c)) {
 		          if (c == '\\')
@@ -460,8 +462,9 @@
 		    std::istream* _is;
 		    bool local_is;
 		    std::string _filename;
 		    Digraph& _digraph;
 		    std::string _nodes_caption;
@@ -509,20 +512,26 @@
 		    ///
 		    /// Construct a directed graph reader, which reads from the given
 		    /// file.
 		    DigraphReader(Digraph& digraph, const std::string& fn)
-		      : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
 		      : _is(new std::ifstream(fn.c_str())), local_is(true),
 		        _filename(fn), _digraph(digraph),
 		        _use_nodes(false), _use_arcs(false),
-		        _skip_nodes(false), _skip_arcs(false) {}
 		        _skip_nodes(false), _skip_arcs(false) {
 		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph reader, which reads from the given
 		    /// file.
 		    DigraphReader(Digraph& digraph, const char* fn)
-		      : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
 		      : _is(new std::ifstream(fn)), local_is(true),
 		        _filename(fn), _digraph(digraph),
 		        _use_nodes(false), _use_arcs(false),
-		        _skip_nodes(false), _skip_arcs(false) {}
 		        _skip_nodes(false), _skip_arcs(false) {
 		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
 		    /// \brief Destructor
 		    ~DigraphReader() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
@@ -845,9 +854,9 @@
 		      char c;
 		      if (!readLine() || !(line >> c) || c == '@') {
 		        if (readSuccess() && line) line.putback(c);
 		        if (!_node_maps.empty())
-		          throw DataFormatError("Cannot find map names");
+		          throw FormatError("Cannot find map names");
 		        return;
+		      }
 		      line.putback(c);
@@ -859,9 +868,9 @@
 		        while (_reader_bits::readToken(line, map)) {
 		          if (maps.find(map) != maps.end()) {
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of node map: " << map;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          maps.insert(std::make_pair(map, index));
 		          ++index;
+		        }
@@ -870,10 +879,10 @@
 		          std::map<std::string, int>::iterator jt =
 		            maps.find(_node_maps[i].first);
 		          if (jt == maps.end()) {
 		            std::ostringstream msg;
 		            msg << "Map not found in file: " << _node_maps[i].first;
 		            throw DataFormatError(msg.str().c_str());
 		            msg << "Map not found: " << _node_maps[i].first;
 		            throw FormatError(msg.str());
+		          }
 		          map_index[i] = jt->second;
+		        }
@@ -895,28 +904,28 @@
 		        for (int i = 0; i < map_num; ++i) {
 		          if (!_reader_bits::readToken(line, tokens[i])) {
 		            std::ostringstream msg;
 		            msg << "Column not found (" << i + 1 << ")";
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
+		        }
 		        if (line >> std::ws >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
 		        Node n;
 		        if (!_use_nodes) {
 		          n = _digraph.addNode();
 		          if (label_index != -1)
 		            _node_index.insert(std::make_pair(tokens[label_index], n));
 		        } else {
 		          if (label_index == -1)
-		            throw DataFormatError("Label map not found in file");
+		            throw FormatError("Label map not found");
 		          typename std::map<std::string, Node>::iterator it =
 		            _node_index.find(tokens[label_index]);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Node with label not found: " << tokens[label_index];
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          n = it->second;
+		        }
@@ -938,9 +947,9 @@
 		      char c;
 		      if (!readLine() || !(line >> c) || c == '@') {
 		        if (readSuccess() && line) line.putback(c);
 		        if (!_arc_maps.empty())
-		          throw DataFormatError("Cannot find map names");
+		          throw FormatError("Cannot find map names");
 		        return;
+		      }
 		      line.putback(c);
@@ -952,9 +961,9 @@
 		        while (_reader_bits::readToken(line, map)) {
 		          if (maps.find(map) != maps.end()) {
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of arc map: " << map;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          maps.insert(std::make_pair(map, index));
 		          ++index;
+		        }
@@ -963,10 +972,10 @@
 		          std::map<std::string, int>::iterator jt =
 		            maps.find(_arc_maps[i].first);
 		          if (jt == maps.end()) {
 		            std::ostringstream msg;
 		            msg << "Map not found in file: " << _arc_maps[i].first;
 		            throw DataFormatError(msg.str().c_str());
 		            msg << "Map not found: " << _arc_maps[i].first;
 		            throw FormatError(msg.str());
+		          }
 		          map_index[i] = jt->second;
+		        }
@@ -987,23 +996,23 @@
 		        std::string source_token;
 		        std::string target_token;
 		        if (!_reader_bits::readToken(line, source_token))
-		          throw DataFormatError("Source not found");
+		          throw FormatError("Source not found");
 		        if (!_reader_bits::readToken(line, target_token))
-		          throw DataFormatError("Target not found");
+		          throw FormatError("Target not found");
 		        std::vector<std::string> tokens(map_num);
 		        for (int i = 0; i < map_num; ++i) {
 		          if (!_reader_bits::readToken(line, tokens[i])) {
 		            std::ostringstream msg;
 		            msg << "Column not found (" << i + 1 << ")";
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
+		        }
 		        if (line >> std::ws >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
 		        Arc a;
 		        if (!_use_arcs) {
@@ -1012,32 +1021,32 @@
 		          it = _node_index.find(source_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << source_token;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          Node source = it->second;
 		          it = _node_index.find(target_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << target_token;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          Node target = it->second;
 		          a = _digraph.addArc(source, target);
 		          if (label_index != -1)
 		            _arc_index.insert(std::make_pair(tokens[label_index], a));
 		        } else {
 		          if (label_index == -1)
-		            throw DataFormatError("Label map not found in file");
+		            throw FormatError("Label map not found");
 		          typename std::map<std::string, Arc>::iterator it =
 		            _arc_index.find(tokens[label_index]);
 		          if (it == _arc_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Arc with label not found: " << tokens[label_index];
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          a = it->second;
+		        }
@@ -1060,20 +1069,20 @@
 		        line.putback(c);
 		        std::string attr, token;
 		        if (!_reader_bits::readToken(line, attr))
-		          throw DataFormatError("Attribute name not found");
+		          throw FormatError("Attribute name not found");
 		        if (!_reader_bits::readToken(line, token))
-		          throw DataFormatError("Attribute value not found");
+		          throw FormatError("Attribute value not found");
 		        if (line >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
+		        {
 		          std::set<std::string>::iterator it = read_attr.find(attr);
 		          if (it != read_attr.end()) {
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of attribute " << attr;
 		            throw DataFormatError(msg.str().c_str());
 		            msg << "Multiple occurence of attribute: " << attr;
 		            throw FormatError(msg.str());
+		          }
 		          read_attr.insert(attr);
+		        }
@@ -1092,10 +1101,10 @@
 		      for (typename Attributes::iterator it = _attributes.begin();
 		           it != _attributes.end(); ++it) {
 		        if (read_attr.find(it->first) == read_attr.end()) {
 		          std::ostringstream msg;
 		          msg << "Attribute not found in file: " << it->first;
 		          throw DataFormatError(msg.str().c_str());
 		          msg << "Attribute not found: " << it->first;
 		          throw FormatError(msg.str());
+		        }
+		      }
+		    }
@@ -1108,11 +1117,8 @@
 		    ///
 		    /// This function starts the batch processing
 		    void run() {
 		      LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
 		      if (!*_is) {
 		        throw DataFormatError("Cannot find file");
+		      }
 		      bool nodes_done = _skip_nodes;
 		      bool arcs_done = _skip_arcs;
 		      bool attributes_done = false;
@@ -1129,9 +1135,9 @@
 		          _reader_bits::readToken(line, section);
 		          _reader_bits::readToken(line, caption);
 		          if (line >> c)
-		            throw DataFormatError("Extra character on the end of line");
+		            throw FormatError("Extra character at the end of line");
 		          if (section == "nodes" && !nodes_done) {
 		            if (_nodes_caption.empty() || _nodes_caption == caption) {
 		              readNodes();
@@ -1151,24 +1157,25 @@
 		          } else {
 		            readLine();
 		            skipSection();
+		          }
-		        } catch (DataFormatError& error) {
+		        } catch (FormatError& error) {
 		          error.line(line_num);
 		          error.file(_filename);
 		          throw;
+		        }
+		      }
 		      if (!nodes_done) {
-		        throw DataFormatError("Section @nodes not found");
+		        throw FormatError("Section @nodes not found");
+		      }
 		      if (!arcs_done) {
-		        throw DataFormatError("Section @arcs not found");
+		        throw FormatError("Section @arcs not found");
+		      }
 		      if (!attributes_done && !_attributes.empty()) {
-		        throw DataFormatError("Section @attributes not found");
+		        throw FormatError("Section @attributes not found");
+		      }
+		    }
@@ -1246,8 +1253,9 @@
 		  private:
 		    std::istream* _is;
 		    bool local_is;
 		    std::string _filename;
 		    Graph& _graph;
 		    std::string _nodes_caption;
@@ -1295,20 +1303,26 @@
 		    ///
 		    /// Construct an undirected graph reader, which reads from the given
 		    /// file.
 		    GraphReader(Graph& graph, const std::string& fn)
-		      : _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
 		      : _is(new std::ifstream(fn.c_str())), local_is(true),
 		        _filename(fn), _graph(graph),
 		        _use_nodes(false), _use_edges(false),
-		        _skip_nodes(false), _skip_edges(false) {}
 		        _skip_nodes(false), _skip_edges(false) {
 		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct an undirected graph reader, which reads from the given
 		    /// file.
 		    GraphReader(Graph& graph, const char* fn)
-		      : _is(new std::ifstream(fn)), local_is(true), _graph(graph),
 		      : _is(new std::ifstream(fn)), local_is(true),
 		        _filename(fn), _graph(graph),
 		        _use_nodes(false), _use_edges(false),
-		        _skip_nodes(false), _skip_edges(false) {}
 		        _skip_nodes(false), _skip_edges(false) {
 		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
 		    /// \brief Destructor
 		    ~GraphReader() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
@@ -1675,9 +1689,9 @@
 		      char c;
 		      if (!readLine() || !(line >> c) || c == '@') {
 		        if (readSuccess() && line) line.putback(c);
 		        if (!_node_maps.empty())
-		          throw DataFormatError("Cannot find map names");
+		          throw FormatError("Cannot find map names");
 		        return;
+		      }
 		      line.putback(c);
@@ -1689,9 +1703,9 @@
 		        while (_reader_bits::readToken(line, map)) {
 		          if (maps.find(map) != maps.end()) {
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of node map: " << map;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          maps.insert(std::make_pair(map, index));
 		          ++index;
+		        }
@@ -1700,10 +1714,10 @@
 		          std::map<std::string, int>::iterator jt =
 		            maps.find(_node_maps[i].first);
 		          if (jt == maps.end()) {
 		            std::ostringstream msg;
 		            msg << "Map not found in file: " << _node_maps[i].first;
 		            throw DataFormatError(msg.str().c_str());
 		            msg << "Map not found: " << _node_maps[i].first;
 		            throw FormatError(msg.str());
+		          }
 		          map_index[i] = jt->second;
+		        }
@@ -1725,28 +1739,28 @@
 		        for (int i = 0; i < map_num; ++i) {
 		          if (!_reader_bits::readToken(line, tokens[i])) {
 		            std::ostringstream msg;
 		            msg << "Column not found (" << i + 1 << ")";
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
+		        }
 		        if (line >> std::ws >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
 		        Node n;
 		        if (!_use_nodes) {
 		          n = _graph.addNode();
 		          if (label_index != -1)
 		            _node_index.insert(std::make_pair(tokens[label_index], n));
 		        } else {
 		          if (label_index == -1)
-		            throw DataFormatError("Label map not found in file");
+		            throw FormatError("Label map not found");
 		          typename std::map<std::string, Node>::iterator it =
 		            _node_index.find(tokens[label_index]);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Node with label not found: " << tokens[label_index];
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          n = it->second;
+		        }
@@ -1768,9 +1782,9 @@
 		      char c;
 		      if (!readLine() || !(line >> c) || c == '@') {
 		        if (readSuccess() && line) line.putback(c);
 		        if (!_edge_maps.empty())
-		          throw DataFormatError("Cannot find map names");
+		          throw FormatError("Cannot find map names");
 		        return;
+		      }
 		      line.putback(c);
@@ -1782,9 +1796,9 @@
 		        while (_reader_bits::readToken(line, map)) {
 		          if (maps.find(map) != maps.end()) {
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of edge map: " << map;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          maps.insert(std::make_pair(map, index));
 		          ++index;
+		        }
@@ -1793,10 +1807,10 @@
 		          std::map<std::string, int>::iterator jt =
 		            maps.find(_edge_maps[i].first);
 		          if (jt == maps.end()) {
 		            std::ostringstream msg;
 		            msg << "Map not found in file: " << _edge_maps[i].first;
 		            throw DataFormatError(msg.str().c_str());
 		            msg << "Map not found: " << _edge_maps[i].first;
 		            throw FormatError(msg.str());
+		          }
 		          map_index[i] = jt->second;
+		        }
@@ -1817,23 +1831,23 @@
 		        std::string source_token;
 		        std::string target_token;
 		        if (!_reader_bits::readToken(line, source_token))
-		          throw DataFormatError("Node u not found");
+		          throw FormatError("Node u not found");
 		        if (!_reader_bits::readToken(line, target_token))
-		          throw DataFormatError("Node v not found");
+		          throw FormatError("Node v not found");
 		        std::vector<std::string> tokens(map_num);
 		        for (int i = 0; i < map_num; ++i) {
 		          if (!_reader_bits::readToken(line, tokens[i])) {
 		            std::ostringstream msg;
 		            msg << "Column not found (" << i + 1 << ")";
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
+		        }
 		        if (line >> std::ws >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
 		        Edge e;
 		        if (!_use_edges) {
@@ -1842,32 +1856,32 @@
 		          it = _node_index.find(source_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << source_token;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          Node source = it->second;
 		          it = _node_index.find(target_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << target_token;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          Node target = it->second;
 		          e = _graph.addEdge(source, target);
 		          if (label_index != -1)
 		            _edge_index.insert(std::make_pair(tokens[label_index], e));
 		        } else {
 		          if (label_index == -1)
-		            throw DataFormatError("Label map not found in file");
+		            throw FormatError("Label map not found");
 		          typename std::map<std::string, Edge>::iterator it =
 		            _edge_index.find(tokens[label_index]);
 		          if (it == _edge_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Edge with label not found: " << tokens[label_index];
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
 		          e = it->second;
+		        }
@@ -1890,20 +1904,20 @@
 		        line.putback(c);
 		        std::string attr, token;
 		        if (!_reader_bits::readToken(line, attr))
-		          throw DataFormatError("Attribute name not found");
+		          throw FormatError("Attribute name not found");
 		        if (!_reader_bits::readToken(line, token))
-		          throw DataFormatError("Attribute value not found");
+		          throw FormatError("Attribute value not found");
 		        if (line >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
+		        {
 		          std::set<std::string>::iterator it = read_attr.find(attr);
 		          if (it != read_attr.end()) {
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of attribute " << attr;
 		            throw DataFormatError(msg.str().c_str());
 		            msg << "Multiple occurence of attribute: " << attr;
 		            throw FormatError(msg.str());
+		          }
 		          read_attr.insert(attr);
+		        }
@@ -1922,10 +1936,10 @@
 		      for (typename Attributes::iterator it = _attributes.begin();
 		           it != _attributes.end(); ++it) {
 		        if (read_attr.find(it->first) == read_attr.end()) {
 		          std::ostringstream msg;
 		          msg << "Attribute not found in file: " << it->first;
 		          throw DataFormatError(msg.str().c_str());
 		          msg << "Attribute not found: " << it->first;
 		          throw FormatError(msg.str());
+		        }
+		      }
+		    }
@@ -1957,9 +1971,9 @@
 		          _reader_bits::readToken(line, section);
 		          _reader_bits::readToken(line, caption);
 		          if (line >> c)
-		            throw DataFormatError("Extra character on the end of line");
+		            throw FormatError("Extra character at the end of line");
 		          if (section == "nodes" && !nodes_done) {
 		            if (_nodes_caption.empty() || _nodes_caption == caption) {
 		              readNodes();
@@ -1979,24 +1993,25 @@
 		          } else {
 		            readLine();
 		            skipSection();
+		          }
-		        } catch (DataFormatError& error) {
+		        } catch (FormatError& error) {
 		          error.line(line_num);
 		          error.file(_filename);
 		          throw;
+		        }
+		      }
 		      if (!nodes_done) {
-		        throw DataFormatError("Section @nodes not found");
+		        throw FormatError("Section @nodes not found");
+		      }
 		      if (!edges_done) {
-		        throw DataFormatError("Section @edges not found");
+		        throw FormatError("Section @edges not found");
+		      }
 		      if (!attributes_done && !_attributes.empty()) {
-		        throw DataFormatError("Section @attributes not found");
+		        throw FormatError("Section @attributes not found");
+		      }
+		    }
@@ -2055,8 +2070,9 @@
 		  private:
 		    std::istream* _is;
 		    bool local_is;
 		    std::string _filename;
 		    typedef std::map<std::string, _reader_bits::Section*> Sections;
 		    Sections _sections;
@@ -2075,15 +2091,21 @@
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section reader, which reads from the given file.
 		    SectionReader(const std::string& fn)
-		      : _is(new std::ifstream(fn.c_str())), local_is(true) {}
+		      : _is(new std::ifstream(fn.c_str())), local_is(true),
 		        _filename(fn) {
 		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section reader, which reads from the given file.
 		    SectionReader(const char* fn)
-		      : _is(new std::ifstream(fn)), local_is(true) {}
+		      : _is(new std::ifstream(fn)), local_is(true),
 		        _filename(fn) {
 		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
 		    /// \brief Destructor
 		    ~SectionReader() {
 		      for (Sections::iterator it = _sections.begin();
@@ -2237,33 +2259,34 @@
 		          _reader_bits::readToken(line, section);
 		          _reader_bits::readToken(line, caption);
 		          if (line >> c)
-		            throw DataFormatError("Extra character on the end of line");
+		            throw FormatError("Extra character at the end of line");
 		          if (extra_sections.find(section) != extra_sections.end()) {
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of section " << section;
 		            throw DataFormatError(msg.str().c_str());
 		            msg << "Multiple occurence of section: " << section;
 		            throw FormatError(msg.str());
+		          }
 		          Sections::iterator it = _sections.find(section);
 		          if (it != _sections.end()) {
 		            extra_sections.insert(section);
 		            it->second->process(*_is, line_num);
+		          }
 		          readLine();
 		          skipSection();
-		        } catch (DataFormatError& error) {
+		        } catch (FormatError& error) {
 		          error.line(line_num);
 		          error.file(_filename);
 		          throw;
+		        }
+		      }
 		      for (Sections::iterator it = _sections.begin();
 		           it != _sections.end(); ++it) {
 		        if (extra_sections.find(it->first) == extra_sections.end()) {
 		          std::ostringstream os;
 		          os << "Cannot find section: " << it->first;
-		          throw DataFormatError(os.str().c_str());
+		          throw FormatError(os.str());
+		        }
+		      }
+		    }
@@ -2361,16 +2384,20 @@
 		    ///
 		    /// Construct an \e LGF contents reader, which reads from the given
 		    /// file.
 		    LgfContents(const std::string& fn)
-		      : _is(new std::ifstream(fn.c_str())), local_is(true) {}
 		      : _is(new std::ifstream(fn.c_str())), local_is(true) {
 		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct an \e LGF contents reader, which reads from the given
 		    /// file.
 		    LgfContents(const char* fn)
-		      : _is(new std::ifstream(fn)), local_is(true) {}
 		      : _is(new std::ifstream(fn)), local_is(true) {
 		      if (!(*_is)) throw IoError("Cannot open file", fn);
+		    }
 		    /// \brief Destructor
 		    ~LgfContents() {
 		      if (local_is) delete _is;

lemon/lgf_writer.h

Show inline comments

@@ -54,9 +54,9 @@
 		    };
 		    template <typename T>
 		    bool operator<(const T&, const T&) {
-		      throw DataFormatError("Label map is not comparable");
+		      throw FormatError("Label map is not comparable");
+		    }
 		    template <typename _Map>
 		    class MapLess {
@@ -202,9 +202,9 @@
 		      std::string operator()(const Value& str) {
 		        typename std::map<Value, std::string>::const_iterator it =
 		          _map.find(str);
 		        if (it == _map.end()) {
-		          throw DataFormatError("Item not found");
+		          throw FormatError("Item not found");
+		        }
 		        return it->second;
+		      }
 		    };
@@ -222,9 +222,9 @@
 		      std::string operator()(const typename Graph::Arc& val) {
 		        typename std::map<typename Graph::Edge, std::string>
 		          ::const_iterator it = _map.find(val);
 		        if (it == _map.end()) {
-		          throw DataFormatError("Item not found");
+		          throw FormatError("Item not found");
+		        }
 		        return (_graph.direction(val) ? '+' : '-') + it->second;
+		      }
 		    };
@@ -461,17 +461,21 @@
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    DigraphWriter(const Digraph& digraph, const std::string& fn)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph),
-		        _skip_nodes(false), _skip_arcs(false) {}
 		        _skip_nodes(false), _skip_arcs(false) {
 		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    DigraphWriter(const Digraph& digraph, const char* fn)
 		      : _os(new std::ofstream(fn)), local_os(true), _digraph(digraph),
-		        _skip_nodes(false), _skip_arcs(false) {}
 		        _skip_nodes(false), _skip_arcs(false) {
 		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
 		    /// \brief Destructor
 		    ~DigraphWriter() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
@@ -1018,17 +1022,21 @@
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    GraphWriter(const Graph& graph, const std::string& fn)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true), _graph(graph),
-		        _skip_nodes(false), _skip_edges(false) {}
 		        _skip_nodes(false), _skip_edges(false) {
 		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    GraphWriter(const Graph& graph, const char* fn)
 		      : _os(new std::ofstream(fn)), local_os(true), _graph(graph),
-		        _skip_nodes(false), _skip_edges(false) {}
 		        _skip_nodes(false), _skip_edges(false) {
 		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
 		    /// \brief Destructor
 		    ~GraphWriter() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
@@ -1577,15 +1585,19 @@
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section writer, which writes into the given file.
 		    SectionWriter(const std::string& fn)
-		      : _os(new std::ofstream(fn.c_str())), local_os(true) {}
 		      : _os(new std::ofstream(fn.c_str())), local_os(true) {
 		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section writer, which writes into the given file.
 		    SectionWriter(const char* fn)
-		      : _os(new std::ofstream(fn)), local_os(true) {}
 		      : _os(new std::ofstream(fn)), local_os(true) {
 		      if (!(*_os)) throw IoError("Cannot write file", fn);
+		    }
 		    /// \brief Destructor
 		    ~SectionWriter() {
 		      for (Sections::iterator it = _sections.begin();

0 comments (0 inline)

RhodeCode

Login to your account