LEMON/LEMON-official Changeset - r294:cbe3ec2d59d2

Repositories » LEMON » LEMON-official

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

@@ -51,3 +51,3 @@
 		      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;

lemon/arg_parser.h

Show inline comments

@@ -312,4 +312,5 @@
 		    ///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

lemon/assert.h

Show inline comments

@@ -110,3 +110,3 @@
 		///
-		/// 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

lemon/bfs.h

Show inline comments

@@ -137,12 +137,2 @@
 		  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";
+		      }
 		    };
@@ -234,3 +224,4 @@
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "PredMap is not initialized");
 		        return 0; // ignore warnings
+		      }
@@ -252,3 +243,4 @@
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "DistMap is not initialized");
 		        return 0; // ignore warnings
+		      }
@@ -270,3 +262,4 @@
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ReachedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
@@ -288,3 +281,4 @@
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ProcessedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
@@ -306,2 +300,3 @@
 		        return new ProcessedMap(g);
 		        return 0; // ignore warnings
+		      }
@@ -1042,3 +1037,2 @@
+		    {
 		      if (s==INVALID || t==INVALID) throw UninitializedParameter();
 		      Bfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
@@ -1325,14 +1319,2 @@
 		    /// \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.
@@ -1391,3 +1373,4 @@
 		      static ReachedMap *createReachedMap(const Digraph &digraph) {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ReachedMap is not initialized");
 		        return 0; // ignore warnings
+		      }

lemon/concepts/heap.h

Show inline comments

@@ -131,3 +131,2 @@
 		      ///
 		      /// It may throw an \ref UnderflowPriorityException.
 		      /// \param i The item.

lemon/dfs.h

Show inline comments

@@ -138,12 +138,2 @@
 		  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";
+		      }
 		    };
@@ -234,3 +224,4 @@
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "PredMap is not initialized");
 		        return 0; // ignore warnings
+		      }
@@ -252,3 +243,4 @@
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "DistMap is not initialized");
 		        return 0; // ignore warnings
+		      }
@@ -270,3 +262,4 @@
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ReachedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
@@ -288,3 +281,4 @@
+		      {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ProcessedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
@@ -976,3 +970,2 @@
+		    {
 		      if (s==INVALID || t==INVALID) throw UninitializedParameter();
 		      Dfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
@@ -1272,14 +1265,2 @@
 		    /// \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.
@@ -1338,3 +1319,4 @@
 		      static ReachedMap *createReachedMap(const Digraph &digraph) {
-		        throw UninitializedParameter();
+		        LEMON_ASSERT(false, "ReachedMap is not initialized");
 		        return 0; // ignore warnings
+		      }

lemon/dijkstra.h

Show inline comments

@@ -227,12 +227,2 @@
  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";
      }
    };

@@ -334,3 +324,4 @@
      {
        throw UninitializedParameter();
        LEMON_ASSERT(false, "PredMap is not initialized");
        return 0; // ignore warnings
      }
@@ -353,3 +344,4 @@
      {
        throw UninitializedParameter();
        LEMON_ASSERT(false, "DistMap is not initialized");
        return 0; // ignore warnings
      }
@@ -372,3 +364,4 @@
      {
        throw UninitializedParameter();
        LEMON_ASSERT(false, "ProcessedMap is not initialized");
        return 0; // ignore warnings
      }
@@ -410,3 +403,4 @@
      static HeapCrossRef *createHeapCrossRef(const Digraph &) {
        throw UninitializedParameter();
        LEMON_ASSERT(false, "HeapCrossRef is not initialized");
        return 0; // ignore warnings
      }
@@ -414,3 +408,4 @@
      {
        throw UninitializedParameter();
        LEMON_ASSERT(false, "Heap is not initialized");
        return 0; // ignore warnings
      }
@@ -1160,3 +1155,2 @@
    {
      if (s==INVALID) throw UninitializedParameter();
      Dijkstra<Digraph,LengthMap,TR>
@@ -1182,3 +1176,2 @@
    {
      if (s==INVALID || t==INVALID) throw UninitializedParameter();
      Dijkstra<Digraph,LengthMap,TR>

lemon/error.h

Show inline comments

@@ -37,131 +37,4 @@
-		  /// \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.
@@ -170,7 +43,7 @@
 		  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() {
@@ -180,233 +53,218 @@
-		  /// 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

@@ -42,2 +42,3 @@
 		#include<lemon/bits/bezier.h>
 		#include<lemon/error.h>
@@ -1168,4 +1169,9 @@
+		{
 		  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));
+		}
@@ -1184,4 +1190,9 @@
+		{
 		  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));
+		}

lemon/lgf_reader.h

Show inline comments

@@ -50,3 +50,5 @@
 		        Value value;
-		        is >> value;
+		        if (!(is >> value)) {
 		          throw FormatError("Cannot read token");
+		        }
@@ -54,3 +56,3 @@
 		        if (is >> std::ws >> c) {
-		          throw DataFormatError("Remaining characters in token");
+		          throw FormatError("Remaining characters in token");
+		        }
@@ -168,3 +170,3 @@
 		          msg << "Item not found: " << str;
-		          throw DataFormatError(msg.str().c_str());
+		          throw FormatError(msg.str());
+		        }
@@ -186,3 +188,3 @@
 		        if (str.empty() || (str[0] != '+' && str[0] != '-')) {
-		          throw DataFormatError("Item must start with '+' or '-'");
+		          throw FormatError("Item must start with '+' or '-'");
+		        }
@@ -191,3 +193,3 @@
 		        if (it == _map.end()) {
-		          throw DataFormatError("Item not found");
+		          throw FormatError("Item not found");
+		        }
@@ -237,3 +239,3 @@
 		      if (!is.get(c))
-		        throw DataFormatError("Escape format error");
+		        throw FormatError("Escape format error");
@@ -266,3 +268,3 @@
 		          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);
@@ -275,3 +277,3 @@
 		          if (!isOct(c))
-		            throw DataFormatError("Escape format error");
+		            throw FormatError("Escape format error");
 		          else if (code = valueOct(c), !is.get(c) || !isOct(c))
@@ -302,3 +304,3 @@
 		        if (!is)
-		          throw DataFormatError("Quoted format error");
+		          throw FormatError("Quoted format error");
 		      } else {
@@ -463,2 +465,3 @@
 		    bool local_is;
 		    std::string _filename;
@@ -512,5 +515,8 @@
 		    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);
+		    }
@@ -521,5 +527,8 @@
 		    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);
+		    }
@@ -848,3 +857,3 @@
 		        if (!_node_maps.empty())
-		          throw DataFormatError("Cannot find map names");
+		          throw FormatError("Cannot find map names");
 		        return;
@@ -862,3 +871,3 @@
 		            msg << "Multiple occurence of node map: " << map;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -873,4 +882,4 @@
 		            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());
+		          }
@@ -898,3 +907,3 @@
 		            msg << "Column not found (" << i + 1 << ")";
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -902,3 +911,3 @@
 		        if (line >> std::ws >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -911,3 +920,3 @@
 		          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 =
@@ -917,3 +926,3 @@
 		            msg << "Node with label not found: " << tokens[label_index];
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -941,3 +950,3 @@
 		        if (!_arc_maps.empty())
-		          throw DataFormatError("Cannot find map names");
+		          throw FormatError("Cannot find map names");
 		        return;
@@ -955,3 +964,3 @@
 		            msg << "Multiple occurence of arc map: " << map;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -966,4 +975,4 @@
 		            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());
+		          }
@@ -990,6 +999,6 @@
 		        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");
@@ -1000,3 +1009,3 @@
 		            msg << "Column not found (" << i + 1 << ")";
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1004,3 +1013,3 @@
 		        if (line >> std::ws >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -1015,3 +1024,3 @@
 		            msg << "Item not found: " << source_token;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1023,3 +1032,3 @@
 		            msg << "Item not found: " << target_token;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1032,3 +1041,3 @@
 		          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 =
@@ -1038,3 +1047,3 @@
 		            msg << "Arc with label not found: " << tokens[label_index];
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1063,7 +1072,7 @@
 		        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");
@@ -1073,4 +1082,4 @@
 		            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());
+		          }
@@ -1095,4 +1104,4 @@
 		          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());
+		        }
@@ -1111,5 +1120,2 @@
 		      LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
 		      if (!*_is) {
 		        throw DataFormatError("Cannot find file");
+		      }
@@ -1132,3 +1138,3 @@
 		          if (line >> c)
-		            throw DataFormatError("Extra character on the end of line");
+		            throw FormatError("Extra character at the end of line");
@@ -1154,4 +1160,5 @@
+		          }
-		        } catch (DataFormatError& error) {
+		        } catch (FormatError& error) {
 		          error.line(line_num);
 		          error.file(_filename);
 		          throw;
@@ -1161,3 +1168,3 @@
 		      if (!nodes_done) {
-		        throw DataFormatError("Section @nodes not found");
+		        throw FormatError("Section @nodes not found");
+		      }
@@ -1165,3 +1172,3 @@
 		      if (!arcs_done) {
-		        throw DataFormatError("Section @arcs not found");
+		        throw FormatError("Section @arcs not found");
+		      }
@@ -1169,3 +1176,3 @@
 		      if (!attributes_done && !_attributes.empty()) {
-		        throw DataFormatError("Section @attributes not found");
+		        throw FormatError("Section @attributes not found");
+		      }
@@ -1249,2 +1256,3 @@
 		    bool local_is;
 		    std::string _filename;
@@ -1298,5 +1306,8 @@
 		    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);
+		    }
@@ -1307,5 +1318,8 @@
 		    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);
+		    }
@@ -1678,3 +1692,3 @@
 		        if (!_node_maps.empty())
-		          throw DataFormatError("Cannot find map names");
+		          throw FormatError("Cannot find map names");
 		        return;
@@ -1692,3 +1706,3 @@
 		            msg << "Multiple occurence of node map: " << map;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1703,4 +1717,4 @@
 		            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());
+		          }
@@ -1728,3 +1742,3 @@
 		            msg << "Column not found (" << i + 1 << ")";
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1732,3 +1746,3 @@
 		        if (line >> std::ws >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -1741,3 +1755,3 @@
 		          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 =
@@ -1747,3 +1761,3 @@
 		            msg << "Node with label not found: " << tokens[label_index];
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1771,3 +1785,3 @@
 		        if (!_edge_maps.empty())
-		          throw DataFormatError("Cannot find map names");
+		          throw FormatError("Cannot find map names");
 		        return;
@@ -1785,3 +1799,3 @@
 		            msg << "Multiple occurence of edge map: " << map;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1796,4 +1810,4 @@
 		            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());
+		          }
@@ -1820,6 +1834,6 @@
 		        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");
@@ -1830,3 +1844,3 @@
 		            msg << "Column not found (" << i + 1 << ")";
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1834,3 +1848,3 @@
 		        if (line >> std::ws >> c)
-		          throw DataFormatError("Extra character on the end of line");
+		          throw FormatError("Extra character at the end of line");
@@ -1845,3 +1859,3 @@
 		            msg << "Item not found: " << source_token;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1853,3 +1867,3 @@
 		            msg << "Item not found: " << target_token;
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1862,3 +1876,3 @@
 		          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 =
@@ -1868,3 +1882,3 @@
 		            msg << "Edge with label not found: " << tokens[label_index];
-		            throw DataFormatError(msg.str().c_str());
+		            throw FormatError(msg.str());
+		          }
@@ -1893,7 +1907,7 @@
 		        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");
@@ -1903,4 +1917,4 @@
 		            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());
+		          }
@@ -1925,4 +1939,4 @@
 		          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());
+		        }
@@ -1960,3 +1974,3 @@
 		          if (line >> c)
-		            throw DataFormatError("Extra character on the end of line");
+		            throw FormatError("Extra character at the end of line");
@@ -1982,4 +1996,5 @@
+		          }
-		        } catch (DataFormatError& error) {
+		        } catch (FormatError& error) {
 		          error.line(line_num);
 		          error.file(_filename);
 		          throw;
@@ -1989,3 +2004,3 @@
 		      if (!nodes_done) {
-		        throw DataFormatError("Section @nodes not found");
+		        throw FormatError("Section @nodes not found");
+		      }
@@ -1993,3 +2008,3 @@
 		      if (!edges_done) {
-		        throw DataFormatError("Section @edges not found");
+		        throw FormatError("Section @edges not found");
+		      }
@@ -1997,3 +2012,3 @@
 		      if (!attributes_done && !_attributes.empty()) {
-		        throw DataFormatError("Section @attributes not found");
+		        throw FormatError("Section @attributes not found");
+		      }
@@ -2058,2 +2073,3 @@
 		    bool local_is;
 		    std::string _filename;
@@ -2078,3 +2094,6 @@
 		    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);
+		    }
@@ -2084,3 +2103,6 @@
 		    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);
+		    }
@@ -2240,3 +2262,3 @@
 		          if (line >> c)
-		            throw DataFormatError("Extra character on the end of line");
+		            throw FormatError("Extra character at the end of line");
@@ -2244,4 +2266,4 @@
 		            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());
+		          }
@@ -2254,4 +2276,5 @@
 		          skipSection();
-		        } catch (DataFormatError& error) {
+		        } catch (FormatError& error) {
 		          error.line(line_num);
 		          error.file(_filename);
 		          throw;
@@ -2264,3 +2287,3 @@
 		          os << "Cannot find section: " << it->first;
-		          throw DataFormatError(os.str().c_str());
+		          throw FormatError(os.str());
+		        }
@@ -2364,3 +2387,5 @@
 		    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);
+		    }
@@ -2371,3 +2396,5 @@
 		    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);
+		    }

lemon/lgf_writer.h

Show inline comments

@@ -57,3 +57,3 @@
 		    bool operator<(const T&, const T&) {
-		      throw DataFormatError("Label map is not comparable");
+		      throw FormatError("Label map is not comparable");
+		    }
@@ -205,3 +205,3 @@
 		        if (it == _map.end()) {
-		          throw DataFormatError("Item not found");
+		          throw FormatError("Item not found");
+		        }
@@ -225,3 +225,3 @@
 		        if (it == _map.end()) {
-		          throw DataFormatError("Item not found");
+		          throw FormatError("Item not found");
+		        }
@@ -464,3 +464,5 @@
 		      : _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);
+		    }
@@ -472,3 +474,5 @@
 		      : _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);
+		    }
@@ -1021,3 +1025,5 @@
 		      : _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);
+		    }
@@ -1029,3 +1035,5 @@
 		      : _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);
+		    }
@@ -1580,3 +1588,5 @@
 		    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);
+		    }
@@ -1586,3 +1596,5 @@
 		    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);
+		    }

0 comments (0 inline)

RhodeCode

Login to your account

...	...	@@ -227,12 +227,2 @@
227	227	public:
228		///\ref Exception for uninitialized parameters.
229
230		///This error represents problems in the initialization of the
231		///parameters of the algorithm.
232		class UninitializedParameter : public lemon::UninitializedParameter {
233		public:
234		virtual const char* what() const throw() {
235		return "lemon::Dijkstra::UninitializedParameter";
236		}
237		};
238	228
...	...	@@ -334,3 +324,4 @@
334	324	{
335		~~throw~~ ~~UninitializedParameter~~();
	325	LEMON_ASSERT(false, "PredMap is not initialized");
	326	return 0; // ignore warnings
336	327	}
...	...	@@ -353,3 +344,4 @@
353	344	{
354		~~throw~~ ~~UninitializedParameter~~();
	345	LEMON_ASSERT(false, "DistMap is not initialized");
	346	return 0; // ignore warnings
355	347	}
...	...	@@ -372,3 +364,4 @@
372	364	{
373		~~throw~~ ~~UninitializedParameter~~();
	365	LEMON_ASSERT(false, "ProcessedMap is not initialized");
	366	return 0; // ignore warnings
374	367	}
...	...	@@ -410,3 +403,4 @@
410	403	static HeapCrossRef *createHeapCrossRef(const Digraph &) {
411		~~throw~~ ~~UninitializedParameter~~();
	404	LEMON_ASSERT(false, "HeapCrossRef is not initialized");
	405	return 0; // ignore warnings
412	406	}
...	...	@@ -414,3 +408,4 @@
414	408	{
415		~~throw~~ ~~UninitializedParameter~~();
	409	LEMON_ASSERT(false, "Heap is not initialized");
	410	return 0; // ignore warnings
416	411	}
...	...	@@ -1160,3 +1155,2 @@
1160	1155	{
1161		if (s==INVALID) throw UninitializedParameter();
1162	1156	Dijkstra<Digraph,LengthMap,TR>
...	...	@@ -1182,3 +1176,2 @@
1182	1176	{
1183		if (s==INVALID \|\| t==INVALID) throw UninitializedParameter();
1184	1177	Dijkstra<Digraph,LengthMap,TR>