Index: demo/graph_to_eps_demo.cc
===================================================================
--- demo/graph_to_eps_demo.cc (revision 211)
+++ demo/graph_to_eps_demo.cc (revision 209)
@@ -21,6 +21,6 @@
/// \brief Demo of the graph drawing function \ref graphToEps()
///
-/// This demo program shows examples how to use the function \ref
-/// graphToEps(). It takes no input but simply creates seven
+/// This demo program shows examples how to use the function \ref
+/// graphToEps(). It takes no input but simply creates six
/// .eps files demonstrating the capability of \ref
/// graphToEps(), and showing how to draw directed graphs,
@@ -82,5 +82,5 @@
IdMap id(g);
- // Create .eps files showing the digraph with different options
+ // Create five .eps files showing the digraph with different options
cout << "Create 'graph_to_eps_demo_out_1_pure.eps'" << endl;
graphToEps(g,"graph_to_eps_demo_out_1_pure.eps").
@@ -119,5 +119,4 @@
run();
- // Add more arcs to the digraph
a=g.addArc(n1,n4); acolors[a]=2; widths[a]=1;
a=g.addArc(n4,n1); acolors[a]=1; widths[a]=2;
@@ -131,6 +130,7 @@
a=g.addArc(n1,n2); acolors[a]=7; widths[a]=1;
- cout << "Create 'graph_to_eps_demo_out_4_par.eps'" << endl;
- graphToEps(g,"graph_to_eps_demo_out_4_par.eps").
+ cout << "Create 'graph_to_eps_demo_out_par.eps'" << endl;
+ graphToEps(g,"graph_to_eps_demo_out_par.eps").
+ //scale(10).
title("Sample .eps figure (parallel arcs)").
copyright("(C) 2003-2008 LEMON Project").
@@ -146,6 +146,6 @@
run();
- cout << "Create 'graph_to_eps_demo_out_5_par_arr.eps'" << endl;
- graphToEps(g,"graph_to_eps_demo_out_5_par_arr.eps").
+ cout << "Create 'graph_to_eps_demo_out_4_par_arr.eps'" << endl;
+ graphToEps(g,"graph_to_eps_demo_out_4_par_arr.eps").
title("Sample .eps figure (parallel arcs and arrowheads)").
copyright("(C) 2003-2008 LEMON Project").
@@ -162,6 +162,6 @@
run();
- cout << "Create 'graph_to_eps_demo_out_6_par_arr_a4.eps'" << endl;
- graphToEps(g,"graph_to_eps_demo_out_6_par_arr_a4.eps").
+ cout << "Create 'graph_to_eps_demo_out_5_par_arr_a4.eps'" << endl;
+ graphToEps(g,"graph_to_eps_demo_out_5_par_arr_a4.eps").
title("Sample .eps figure (fits to A4)").
copyright("(C) 2003-2008 LEMON Project").
@@ -191,6 +191,6 @@
}
- cout << "Create 'graph_to_eps_demo_out_7_colors.eps'" << endl;
- graphToEps(h,"graph_to_eps_demo_out_7_colors.eps").
+ cout << "Create 'graph_to_eps_demo_out_6_colors.eps'" << endl;
+ graphToEps(h,"graph_to_eps_demo_out_6_colors.eps").
scale(60).
title("Sample .eps figure (Palette demo)").
Index: doc/Doxyfile.in
===================================================================
--- doc/Doxyfile.in (revision 212)
+++ doc/Doxyfile.in (revision 153)
@@ -103,5 +103,5 @@
EXAMPLE_RECURSIVE = NO
IMAGE_PATH = @abs_top_srcdir@/doc/images \
- @abs_top_builddir@/doc/gen-images
+ @abs_top_builddir@/doc/gen-images
INPUT_FILTER =
FILTER_PATTERNS =
Index: doc/lgf.dox
===================================================================
--- doc/lgf.dox (revision 212)
+++ doc/lgf.dox (revision 209)
@@ -58,8 +58,8 @@
\code
@nodes
- label coordinates size title
- 1 (10,20) 10 "First node"
- 2 (80,80) 8 "Second node"
- 3 (40,10) 10 "Third node"
+ label coordinates size title
+ 1 (10,20) 10 "First node"
+ 2 (80,80) 8 "Second node"
+ 3 (40,10) 10 "Third node"
\endcode
@@ -73,5 +73,5 @@
\code
@arcs
- capacity
+ capacity
1 2 16
1 3 12
Index: lemon/arg_parser.cc
===================================================================
--- lemon/arg_parser.cc (revision 214)
+++ lemon/arg_parser.cc (revision 210)
@@ -240,9 +240,9 @@
}
- void ArgParser::show(std::ostream &os,Opts::const_iterator i) const
+ void ArgParser::show(std::ostream &os,Opts::iterator i)
{
os << "-" << i->first;
if(i->second.has_syn)
- for(Opts::const_iterator j=_opts.begin();j!=_opts.end();++j)
+ for(Opts::iterator j=_opts.begin();j!=_opts.end();++j)
if(j->second.syn&&j->second.help==i->first)
os << "|-" << j->first;
@@ -262,7 +262,7 @@
}
- void ArgParser::show(std::ostream &os,Groups::const_iterator i) const
- {
- GroupData::Opts::const_iterator o=i->second.opts.begin();
+ void ArgParser::show(std::ostream &os,Groups::iterator i)
+ {
+ GroupData::Opts::iterator o=i->second.opts.begin();
while(o!=i->second.opts.end()) {
show(os,_opts.find(*o));
@@ -272,5 +272,5 @@
}
- void ArgParser::showHelp(Opts::const_iterator i) const
+ void ArgParser::showHelp(Opts::iterator i)
{
if(i->second.help.size()==0||i->second.syn) return;
@@ -280,6 +280,5 @@
std::cerr << " " << i->second.help << std::endl;
}
- void ArgParser::showHelp(std::vector::const_iterator i)
- const
+ void ArgParser::showHelp(std::vector::iterator i)
{
if(i->help.size()==0) return;
@@ -288,5 +287,5 @@
}
- void ArgParser::shortHelp() const
+ void ArgParser::shortHelp()
{
const unsigned int LINE_LEN=77;
@@ -294,5 +293,5 @@
std::cerr << "Usage:\n " << _command_name;
int pos=_command_name.size()+2;
- for(Groups::const_iterator g=_groups.begin();g!=_groups.end();++g) {
+ for(Groups::iterator g=_groups.begin();g!=_groups.end();++g) {
std::ostringstream cstr;
cstr << ' ';
@@ -307,5 +306,5 @@
pos+=cstr.str().size();
}
- for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i)
+ for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
if(!i->second.ingroup&&!i->second.syn) {
std::ostringstream cstr;
@@ -321,5 +320,5 @@
pos+=cstr.str().size();
}
- for(std::vector::const_iterator i=_others_help.begin();
+ for(std::vector::iterator i=_others_help.begin();
i!=_others_help.end();++i)
{
@@ -337,16 +336,16 @@
}
- void ArgParser::showHelp() const
+ void ArgParser::showHelp()
{
shortHelp();
std::cerr << "Where:\n";
- for(std::vector::const_iterator i=_others_help.begin();
+ for(std::vector::iterator i=_others_help.begin();
i!=_others_help.end();++i) showHelp(i);
- for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
+ for(Opts::iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
exit(1);
}
- void ArgParser::unknownOpt(std::string arg) const
+ void ArgParser::unknownOpt(std::string arg)
{
std::cerr << "\nUnknown option: " << arg << "\n";
@@ -356,5 +355,5 @@
}
- void ArgParser::requiresValue(std::string arg, OptType t) const
+ void ArgParser::requiresValue(std::string arg, OptType t)
{
std::cerr << "Argument '" << arg << "' requires a";
@@ -377,8 +376,8 @@
- void ArgParser::checkMandatories() const
+ void ArgParser::checkMandatories()
{
bool ok=true;
- for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i)
+ for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
if(i->second.mandatory&&!i->second.set)
{
@@ -389,9 +388,9 @@
showHelp(i);
}
- for(Groups::const_iterator i=_groups.begin();i!=_groups.end();++i)
+ for(Groups::iterator i=_groups.begin();i!=_groups.end();++i)
if(i->second.mandatory||i->second.only_one)
{
int set=0;
- for(GroupData::Opts::const_iterator o=i->second.opts.begin();
+ for(GroupData::Opts::iterator o=i->second.opts.begin();
o!=i->second.opts.end();++o)
if(_opts.find(*o)->second.set) ++set;
@@ -400,5 +399,5 @@
": At least one of the following arguments is mandatory.\n";
ok=false;
- for(GroupData::Opts::const_iterator o=i->second.opts.begin();
+ for(GroupData::Opts::iterator o=i->second.opts.begin();
o!=i->second.opts.end();++o)
showHelp(_opts.find(*o));
@@ -408,5 +407,5 @@
": At most one of the following arguments can be given.\n";
ok=false;
- for(GroupData::Opts::const_iterator o=i->second.opts.begin();
+ for(GroupData::Opts::iterator o=i->second.opts.begin();
o!=i->second.opts.end();++o)
showHelp(_opts.find(*o));
Index: lemon/arg_parser.h
===================================================================
--- lemon/arg_parser.h (revision 214)
+++ lemon/arg_parser.h (revision 209)
@@ -272,18 +272,15 @@
///@}
- private:
- void show(std::ostream &os,Opts::const_iterator i) const;
- void show(std::ostream &os,Groups::const_iterator i) const;
- void showHelp(Opts::const_iterator i) const;
- void showHelp(std::vector::const_iterator i) const;
-
- void unknownOpt(std::string arg) const;
-
- void requiresValue(std::string arg, OptType t) const;
- void checkMandatories() const;
-
- void shortHelp() const;
- void showHelp() const;
- public:
+ void show(std::ostream &os,Opts::iterator i);
+ void show(std::ostream &os,Groups::iterator i);
+ void showHelp(Opts::iterator i);
+ void showHelp(std::vector::iterator i);
+ void shortHelp();
+ void showHelp();
+
+ void unknownOpt(std::string arg);
+
+ void requiresValue(std::string arg, OptType t);
+ void checkMandatories();
///Start the parsing process
@@ -297,10 +294,10 @@
///Give back the command name (the 0th argument)
- const std::string &commandName() const { return _command_name; }
+ const std::string &commandName() { return _command_name; }
///Check if an opion has been given to the command.
- bool given(std::string op) const
- {
- Opts::const_iterator i = _opts.find(op);
+ bool given(std::string op)
+ {
+ Opts::iterator i = _opts.find(op);
return i!=_opts.end()?i->second.set:false;
}
@@ -315,13 +312,13 @@
class RefType
{
- const ArgParser &_parser;
+ ArgParser &_parser;
std::string _name;
public:
///\e
- RefType(const ArgParser &p,const std::string &n) :_parser(p),_name(n) {}
+ RefType(ArgParser &p,const std::string &n) :_parser(p),_name(n) {}
///\e
operator bool()
{
- Opts::const_iterator i = _parser._opts.find(_name);
+ Opts::iterator i = _parser._opts.find(_name);
LEMON_ASSERT(i!=_parser._opts.end(),
std::string()+"Unkown option: '"+_name+"'");
@@ -333,5 +330,5 @@
operator std::string()
{
- Opts::const_iterator i = _parser._opts.find(_name);
+ Opts::iterator i = _parser._opts.find(_name);
LEMON_ASSERT(i!=_parser._opts.end(),
std::string()+"Unkown option: '"+_name+"'");
@@ -343,5 +340,5 @@
operator double()
{
- Opts::const_iterator i = _parser._opts.find(_name);
+ Opts::iterator i = _parser._opts.find(_name);
LEMON_ASSERT(i!=_parser._opts.end(),
std::string()+"Unkown option: '"+_name+"'");
@@ -355,5 +352,5 @@
operator int()
{
- Opts::const_iterator i = _parser._opts.find(_name);
+ Opts::iterator i = _parser._opts.find(_name);
LEMON_ASSERT(i!=_parser._opts.end(),
std::string()+"Unkown option: '"+_name+"'");
@@ -369,5 +366,5 @@
///Give back the value of an option.
///\sa RefType
- RefType operator[](const std::string &n) const
+ RefType operator[](const std::string &n)
{
return RefType(*this, n);
@@ -378,5 +375,5 @@
///Give back a reference to a vector consisting of the program arguments
///not starting with a '-' character.
- const std::vector &files() const { return _file_args; }
+ std::vector &files() { return _file_args; }
};
Index: lemon/assert.h
===================================================================
--- lemon/assert.h (revision 212)
+++ lemon/assert.h (revision 210)
@@ -67,15 +67,15 @@
#undef LEMON_DEBUG
-#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
- (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
+#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
+ (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
(defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) > 1
#error "LEMON assertion system is not set properly"
#endif
-#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
- (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
- (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 || \
- defined(LEMON_ENABLE_ASSERTS)) && \
- (defined(LEMON_DISABLE_ASSERTS) || \
+#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
+ (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
+ (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 || \
+ defined(LEMON_ENABLE_ASSERTS)) && \
+ (defined(LEMON_DISABLE_ASSERTS) || \
defined(NDEBUG))
#error "LEMON assertion system is not set properly"
@@ -169,7 +169,7 @@
/// behaviour is changed appropiately to the new settings.
# define LEMON_ASSERT(exp, msg) \
- (static_cast (!!(exp) ? 0 : ( \
- LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
- LEMON_FUNCTION_NAME, \
+ (static_cast (!!(exp) ? 0 : ( \
+ LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
+ LEMON_FUNCTION_NAME, \
::lemon::_assert_bits::cstringify(msg), #exp), 0)))
@@ -185,7 +185,7 @@
///
/// \see LEMON_ASSERT
-# define LEMON_FIXME(msg) \
+# define LEMON_FIXME(msg) \
(LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
- ::lemon::_assert_bits::cstringify(msg), \
+ ::lemon::_assert_bits::cstringify(msg), \
static_cast(0)))
@@ -213,8 +213,8 @@
///
/// \see LEMON_ASSERT
-# define LEMON_DEBUG(exp, msg) \
- (static_cast (!!(exp) ? 0 : ( \
+# define LEMON_DEBUG(exp, msg) \
+ (static_cast (!!(exp) ? 0 : ( \
LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
- LEMON_FUNCTION_NAME, \
+ LEMON_FUNCTION_NAME, \
::lemon::_assert_bits::cstringify(msg), #exp), 0)))
@@ -226,21 +226,21 @@
# define LEMON_DEBUG(exp, msg) (static_cast(0))
# else
-# define LEMON_ASSERT(exp, msg) \
- (static_cast (!!(exp) ? 0 : ( \
+# define LEMON_ASSERT(exp, msg) \
+ (static_cast (!!(exp) ? 0 : ( \
LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
- LEMON_FUNCTION_NAME, \
- ::lemon::_assert_bits::cstringify(msg), \
+ LEMON_FUNCTION_NAME, \
+ ::lemon::_assert_bits::cstringify(msg), \
#exp), 0)))
-# define LEMON_FIXME(msg) \
- (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
- ::lemon::_assert_bits::cstringify(msg), \
+# define LEMON_FIXME(msg) \
+ (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
+ ::lemon::_assert_bits::cstringify(msg), \
static_cast(0)))
# if LEMON_ENABLE_DEBUG
# define LEMON_DEBUG(exp, msg)
- (static_cast (!!(exp) ? 0 : ( \
- LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
- LEMON_FUNCTION_NAME, \
- ::lemon::_assert_bits::cstringify(msg), \
+ (static_cast (!!(exp) ? 0 : ( \
+ LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
+ LEMON_FUNCTION_NAME, \
+ ::lemon::_assert_bits::cstringify(msg), \
#exp), 0)))
# else
@@ -250,2 +250,12 @@
#endif
+
+#ifdef DOXYGEN
+
+
+#else
+
+
+#endif
+
+
Index: lemon/concepts/path.h
===================================================================
--- lemon/concepts/path.h (revision 212)
+++ lemon/concepts/path.h (revision 209)
@@ -101,6 +101,6 @@
/// Comparison operator
bool operator!=(const ArcIt&) const {return true;}
- /// Comparison operator
- bool operator<(const ArcIt&) const {return false;}
+ /// Comparison operator
+ bool operator<(const ArcIt&) const {return false;}
};
@@ -256,6 +256,6 @@
/// Comparison operator
bool operator!=(const ArcIt&) const {return true;}
- /// Comparison operator
- bool operator<(const ArcIt&) const {return false;}
+ /// Comparison operator
+ bool operator<(const ArcIt&) const {return false;}
};
@@ -284,6 +284,6 @@
/// Comparison operator
bool operator!=(const RevArcIt&) const {return true;}
- /// Comparison operator
- bool operator<(const RevArcIt&) const {return false;}
+ /// Comparison operator
+ bool operator<(const RevArcIt&) const {return false;}
};
Index: lemon/error.h
===================================================================
--- lemon/error.h (revision 212)
+++ lemon/error.h (revision 209)
@@ -71,5 +71,5 @@
try {
if (!copy.valid()) return;
- *ptr = copy.get();
+ *ptr = copy.get();
} catch (...) {}
}
Index: lemon/graph_to_eps.h
===================================================================
--- lemon/graph_to_eps.h (revision 212)
+++ lemon/graph_to_eps.h (revision 210)
@@ -909,5 +909,5 @@
//\todo better 'epsilon' would be nice here.
dim2::Point d(dvec/std::max(l,EPSILON));
- dim2::Point m;
+ dim2::Point m;
// m=dim2::Point(mycoords[g.target(*i)]+
// mycoords[g.source(*i)])/2.0;
@@ -917,5 +917,5 @@
// (_nodeSizes[g.source(*i)]+_nodeSizes[g.target(*i)]));
- m=dim2::Point(mycoords[g.source(*i)])+
+ m=dim2::Point(mycoords[g.source(*i)])+
d*(l+_nodeSizes[g.source(*i)]-_nodeSizes[g.target(*i)])/2.0;
Index: lemon/graph_utils.h
===================================================================
--- lemon/graph_utils.h (revision 212)
+++ lemon/graph_utils.h (revision 209)
@@ -53,16 +53,16 @@
///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
///macro.
-#define DIGRAPH_TYPEDEFS(Digraph) \
- typedef Digraph::Node Node; \
- typedef Digraph::NodeIt NodeIt; \
- typedef Digraph::Arc Arc; \
- typedef Digraph::ArcIt ArcIt; \
- typedef Digraph::InArcIt InArcIt; \
- typedef Digraph::OutArcIt OutArcIt; \
- typedef Digraph::NodeMap BoolNodeMap; \
- typedef Digraph::NodeMap IntNodeMap; \
- typedef Digraph::NodeMap DoubleNodeMap; \
- typedef Digraph::ArcMap BoolArcMap; \
- typedef Digraph::ArcMap IntArcMap; \
+#define DIGRAPH_TYPEDEFS(Digraph) \
+ typedef Digraph::Node Node; \
+ typedef Digraph::NodeIt NodeIt; \
+ typedef Digraph::Arc Arc; \
+ typedef Digraph::ArcIt ArcIt; \
+ typedef Digraph::InArcIt InArcIt; \
+ typedef Digraph::OutArcIt OutArcIt; \
+ typedef Digraph::NodeMap BoolNodeMap; \
+ typedef Digraph::NodeMap IntNodeMap; \
+ typedef Digraph::NodeMap DoubleNodeMap; \
+ typedef Digraph::ArcMap BoolArcMap; \
+ typedef Digraph::ArcMap IntArcMap; \
typedef Digraph::ArcMap DoubleArcMap
@@ -73,16 +73,16 @@
///\note Use this macro, if the graph type is a dependent type,
///ie. the graph type depend on a template parameter.
-#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph) \
- typedef typename Digraph::Node Node; \
- typedef typename Digraph::NodeIt NodeIt; \
- typedef typename Digraph::Arc Arc; \
+#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph) \
+ typedef typename Digraph::Node Node; \
+ typedef typename Digraph::NodeIt NodeIt; \
+ typedef typename Digraph::Arc Arc; \
typedef typename Digraph::ArcIt ArcIt; \
- typedef typename Digraph::InArcIt InArcIt; \
- typedef typename Digraph::OutArcIt OutArcIt; \
- typedef typename Digraph::template NodeMap BoolNodeMap; \
- typedef typename Digraph::template NodeMap IntNodeMap; \
- typedef typename Digraph::template NodeMap DoubleNodeMap; \
- typedef typename Digraph::template ArcMap BoolArcMap; \
- typedef typename Digraph::template ArcMap IntArcMap; \
+ typedef typename Digraph::InArcIt InArcIt; \
+ typedef typename Digraph::OutArcIt OutArcIt; \
+ typedef typename Digraph::template NodeMap BoolNodeMap; \
+ typedef typename Digraph::template NodeMap IntNodeMap; \
+ typedef typename Digraph::template NodeMap DoubleNodeMap; \
+ typedef typename Digraph::template ArcMap BoolArcMap; \
+ typedef typename Digraph::template ArcMap IntArcMap; \
typedef typename Digraph::template ArcMap DoubleArcMap
@@ -97,11 +97,11 @@
///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
///macro.
-#define GRAPH_TYPEDEFS(Graph) \
- DIGRAPH_TYPEDEFS(Graph); \
- typedef Graph::Edge Edge; \
- typedef Graph::EdgeIt EdgeIt; \
- typedef Graph::IncEdgeIt IncEdgeIt; \
- typedef Graph::EdgeMap BoolEdgeMap; \
- typedef Graph::EdgeMap IntEdgeMap; \
+#define GRAPH_TYPEDEFS(Graph) \
+ DIGRAPH_TYPEDEFS(Graph); \
+ typedef Graph::Edge Edge; \
+ typedef Graph::EdgeIt EdgeIt; \
+ typedef Graph::IncEdgeIt IncEdgeIt; \
+ typedef Graph::EdgeMap BoolEdgeMap; \
+ typedef Graph::EdgeMap IntEdgeMap; \
typedef Graph::EdgeMap DoubleEdgeMap
@@ -112,11 +112,11 @@
///\note Use this macro, if the graph type is a dependent type,
///ie. the graph type depend on a template parameter.
-#define TEMPLATE_GRAPH_TYPEDEFS(Graph) \
- TEMPLATE_DIGRAPH_TYPEDEFS(Graph); \
- typedef typename Graph::Edge Edge; \
+#define TEMPLATE_GRAPH_TYPEDEFS(Graph) \
+ TEMPLATE_DIGRAPH_TYPEDEFS(Graph); \
+ typedef typename Graph::Edge Edge; \
typedef typename Graph::EdgeIt EdgeIt; \
- typedef typename Graph::IncEdgeIt IncEdgeIt; \
- typedef typename Graph::template EdgeMap BoolEdgeMap; \
- typedef typename Graph::template EdgeMap IntEdgeMap; \
+ typedef typename Graph::IncEdgeIt IncEdgeIt; \
+ typedef typename Graph::template EdgeMap BoolEdgeMap; \
+ typedef typename Graph::template EdgeMap IntEdgeMap; \
typedef typename Graph::template EdgeMap DoubleEdgeMap
Index: lemon/kruskal.h
===================================================================
--- lemon/kruskal.h (revision 209)
+++ lemon/kruskal.h (revision 216)
@@ -301,7 +301,6 @@
/// \return The total cost of the found spanning tree.
///
- /// \warning If Kruskal runs on an be consistent of using the same
- /// Arc type for input and output.
- ///
+ /// \note If the input graph is not (weakly) connected, a spanning
+ /// forest is calculated instead of a spanning tree.
#ifdef DOXYGEN
Index: lemon/lgf_reader.h
===================================================================
--- lemon/lgf_reader.h (revision 212)
+++ lemon/lgf_reader.h (revision 210)
@@ -147,5 +147,5 @@
public:
ValueStorage(Value& value, const Converter& converter = Converter())
- : _value(value), _converter(converter) {}
+ : _value(value), _converter(converter) {}
virtual void set(const std::string& value) {
@@ -511,5 +511,5 @@
DigraphReader(const std::string& fn, Digraph& digraph)
: _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
- _use_nodes(false), _use_arcs(false),
+ _use_nodes(false), _use_arcs(false),
_skip_nodes(false), _skip_arcs(false) {}
@@ -520,5 +520,5 @@
DigraphReader(const char* fn, Digraph& digraph)
: _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
- _use_nodes(false), _use_arcs(false),
+ _use_nodes(false), _use_arcs(false),
_skip_nodes(false), _skip_arcs(false) {}
@@ -1295,5 +1295,5 @@
GraphReader(const std::string& fn, Graph& graph)
: _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
- _use_nodes(false), _use_edges(false),
+ _use_nodes(false), _use_edges(false),
_skip_nodes(false), _skip_edges(false) {}
@@ -1304,5 +1304,5 @@
GraphReader(const char* fn, Graph& graph)
: _is(new std::ifstream(fn)), local_is(true), _graph(graph),
- _use_nodes(false), _use_edges(false),
+ _use_nodes(false), _use_edges(false),
_skip_nodes(false), _skip_edges(false) {}
Index: lemon/lgf_writer.h
===================================================================
--- lemon/lgf_writer.h (revision 212)
+++ lemon/lgf_writer.h (revision 209)
@@ -182,5 +182,5 @@
public:
ValueStorage(const Value& value, const Converter& converter = Converter())
- : _value(value), _converter(converter) {}
+ : _value(value), _converter(converter) {}
virtual std::string get() {
Index: lemon/list_graph.h
===================================================================
--- lemon/list_graph.h (revision 212)
+++ lemon/list_graph.h (revision 209)
@@ -495,5 +495,5 @@
Node b = addNode();
for(OutArcIt e(*this,n);e!=INVALID;) {
- OutArcIt f=e;
+ OutArcIt f=e;
++f;
changeSource(e,b);
Index: test/heap_test.cc
===================================================================
--- test/heap_test.cc (revision 212)
+++ test/heap_test.cc (revision 209)
@@ -55,25 +55,25 @@
"9\n"
"@arcs\n"
- " label capacity\n"
- "0 5 0 94\n"
- "3 9 1 11\n"
- "8 7 2 83\n"
- "1 2 3 94\n"
- "5 7 4 35\n"
- "7 4 5 84\n"
- "9 5 6 38\n"
- "0 4 7 96\n"
- "6 7 8 6\n"
- "3 1 9 27\n"
- "5 2 10 77\n"
- "5 6 11 69\n"
- "6 5 12 41\n"
- "4 6 13 70\n"
- "3 2 14 45\n"
- "7 9 15 93\n"
- "5 9 16 50\n"
- "9 0 17 94\n"
- "9 6 18 67\n"
- "0 9 19 86\n"
+ " label capacity\n"
+ "0 5 0 94\n"
+ "3 9 1 11\n"
+ "8 7 2 83\n"
+ "1 2 3 94\n"
+ "5 7 4 35\n"
+ "7 4 5 84\n"
+ "9 5 6 38\n"
+ "0 4 7 96\n"
+ "6 7 8 6\n"
+ "3 1 9 27\n"
+ "5 2 10 77\n"
+ "5 6 11 69\n"
+ "6 5 12 41\n"
+ "4 6 13 70\n"
+ "3 2 14 45\n"
+ "7 9 15 93\n"
+ "5 9 16 50\n"
+ "9 0 17 94\n"
+ "9 6 18 67\n"
+ "0 9 19 86\n"
"@attributes\n"
"source 3\n";
@@ -142,5 +142,5 @@
if (dijkstra.reached(s)) {
check( dijkstra.dist(t) - dijkstra.dist(s) <= length[a],
- "Error in a shortest path tree!");
+ "Error in a shortest path tree!");
}
}