LEMON/LEMON-official Changeset - r209:765619b7cbb2

Repositories » LEMON » LEMON-official

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

Changeset - r209:765619b7cbb2

« 208:4317d2

210:81cfc0 »

r209:765619b7cbb2

Sun, 13 Jul 2008 20:51:02

[Not Reviewed]

0 comments (0 inline)

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

Apply unify-sources.sh to the source tree

! ! !

default

80 files changed:

demo/arg_parser_demo.cc

demo/graph_to_eps_demo.cc

demo/lgf_demo.cc

doc/coding_style.dox

doc/dirs.dox

doc/groups.dox

doc/lgf.dox

doc/license.dox

doc/mainpage.dox

doc/namespaces.dox

doc/template.h

lemon/arg_parser.cc

137

lemon/arg_parser.h

lemon/assert.h

lemon/base.cc

lemon/bfs.h

229

lemon/bin_heap.h

lemon/bits/alteration_notifier.h

lemon/bits/array_map.h

109

lemon/bits/base_extender.h

lemon/bits/bezier.h

lemon/bits/default_map.h

lemon/bits/graph_extender.h

147

lemon/bits/invalid.h

lemon/bits/map_extender.h

lemon/bits/path_dump.h

lemon/bits/traits.h

lemon/bits/utility.h

lemon/bits/vector_map.h

lemon/color.cc

lemon/color.h

lemon/concept_check.h

lemon/concepts/digraph.h

lemon/concepts/graph.h

111

lemon/concepts/graph_components.h

380

lemon/concepts/heap.h

lemon/concepts/maps.h

lemon/concepts/path.h

lemon/counter.h

lemon/dfs.h

251

lemon/dijkstra.h

180

lemon/dim2.h

Changeset was too big and was cut off... Show full diff

↑ Collapse diff ↑

demo/arg_parser_demo.cc

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -66,3 +66,3 @@
 		    .other("...");
 		  // Perform the parsing process
@@ -86,3 +86,3 @@
 		  if(ap.given("grc")) std::cout << "  -grc is given\n";
 		  switch(ap.files().size()) {
@@ -96,3 +96,3 @@
 		    std::cout << "  "
-			      << ap.files().size() << " file arguments were given. They are:\n";
+		              << ap.files().size() << " file arguments were given. They are:\n";
+		  }
@@ -100,3 +100,3 @@
 		    std::cout << "    '" << ap.files()[i] << "'\n";
 		  return 0;

demo/graph_to_eps_demo.cc

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -51,3 +51,3 @@
 		  typedef dim2::Point<int> Point;
 		  Node n1=g.addNode();
@@ -64,3 +64,3 @@
 		  ListDigraph::ArcMap<int> widths(g);
 		  coords[n1]=Point(50,50);  sizes[n1]=1; colors[n1]=1; shapes[n1]=0;
@@ -70,3 +70,3 @@
 		  coords[n5]=Point(85,60);  sizes[n5]=3; colors[n5]=5; shapes[n5]=2;
 		  Arc a;
@@ -80,3 +80,3 @@
 		  a=g.addArc(n3,n4); acolors[a]=2; widths[a]=1;
 		  IdMap<ListDigraph,Node> id(g);
@@ -184,3 +184,3 @@
 		  ListDigraph::NodeMap<Point> hcoords(h);
 		  int cols=int(sqrt(double(palette.size())));
@@ -191,3 +191,3 @@
+		  }
 		  cout << "Create 'graph_to_eps_demo_out_6_colors.eps'" << endl;
@@ -204,3 +204,3 @@
 		    run();
 		  return 0;

demo/lgf_demo.cc

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -23,3 +23,3 @@
 		/// This program gives an example of how to read and write a digraph
-		/// and additional maps from/to a stream or a file using the
 		/// and additional maps from/to a stream or a file using the
 		/// \ref lgf-format "LGF" format.
@@ -44,3 +44,3 @@
 		  SmartDigraph::Node s, t;
 		  try {

doc/coding_style.dox

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -20,3 +20,3 @@
-		\page coding_style LEMON Coding Style
 		\page coding_style LEMON Coding Style
@@ -70,3 +70,3 @@
 		\code
-		AllWordsCapitalizedWithoutUnderscores
 		AllWordsCapitalizedWithoutUnderscores
 		\endcode
@@ -78,3 +78,3 @@
 		\code
-		firstWordLowerCaseRestCapitalizedWithoutUnderscores
 		firstWordLowerCaseRestCapitalizedWithoutUnderscores
 		\endcode
@@ -86,6 +86,6 @@
 		\code
-		ALL_UPPER_CASE_WITH_UNDERSCORES
 		ALL_UPPER_CASE_WITH_UNDERSCORES
 		\endcode
-		\subsection cs-loc-var Class and instance member variables, auto variables
 		\subsection cs-loc-var Class and instance member variables, auto variables
@@ -94,3 +94,3 @@
 		\code
-		all_lower_case_with_underscores
 		all_lower_case_with_underscores
 		\endcode

doc/dirs.dox

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -76,3 +76,3 @@
 		This directory contains some helper classes to implement graphs, maps and
-		some other classes. As a user you typically don't have to deal with these
 		some other classes. As a user you typically don't have to deal with these
 		files.

doc/groups.dox

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -28,6 +28,6 @@
 		The implementation of combinatorial algorithms heavily relies on
 		efficient graph implementations. LEMON offers data structures which are
 		planned to be easily used in an experimental phase of implementation studies,
 		and thereafter the program code can be made efficient by small modifications.
 		The implementation of combinatorial algorithms heavily relies on
 		efficient graph implementations. LEMON offers data structures which are
 		planned to be easily used in an experimental phase of implementation studies,
 		and thereafter the program code can be made efficient by small modifications.
@@ -42,13 +42,13 @@
 		Alteration of standard containers need a very limited number of
 		operations, these together satisfy the everyday requirements.
 		In the case of graph structures, different operations are needed which do
 		not alter the physical graph, but gives another view. If some nodes or
 		Alteration of standard containers need a very limited number of
 		operations, these together satisfy the everyday requirements.
 		In the case of graph structures, different operations are needed which do
 		not alter the physical graph, but gives another view. If some nodes or
 		arcs have to be hidden or the reverse oriented graph have to be used, then
 		this is the case. It also may happen that in a flow implementation
 		the residual graph can be accessed by another algorithm, or a node-set
 		is to be shrunk for another algorithm.
 		LEMON also provides a variety of graphs for these requirements called
 		\ref graph_adaptors "graph adaptors". Adaptors cannot be used alone but only
 		in conjunction with other graph representations.
 		this is the case. It also may happen that in a flow implementation
 		the residual graph can be accessed by another algorithm, or a node-set
 		is to be shrunk for another algorithm.
 		LEMON also provides a variety of graphs for these requirements called
 		\ref graph_adaptors "graph adaptors". Adaptors cannot be used alone but only
 		in conjunction with other graph representations.
@@ -56,3 +56,3 @@
 		the best, most graph algorithms and auxiliary data structures can be used
-		with any graph structures.
 		with any graph structures.
 		*/
@@ -65,3 +65,3 @@
 		This group describes some graph types between real graphs and graph adaptors.
-		These classes wrap graphs to give new functionality as the adaptors do it.
 		These classes wrap graphs to give new functionality as the adaptors do it.
 		On the other hand they are not light-weight structures as the adaptors.
@@ -70,3 +70,3 @@
 		/**
-		@defgroup maps Maps
 		@defgroup maps Maps
 		@ingroup datas
@@ -81,3 +81,3 @@
 		/**
-		@defgroup graph_maps Graph Maps
 		@defgroup graph_maps Graph Maps
 		@ingroup maps
@@ -117,5 +117,5 @@
+		  }
 		  Digraph::NodeMap<int> degree_map(graph);
 		  digraphToEps(graph, "graph.eps")
@@ -124,3 +124,3 @@
 		    .run();
-		\endcode
 		\endcode
 		The \c functorToMap() function makes an \c int to \c Color map from the
@@ -142,3 +142,3 @@
 		  TimeMap time(length, speed);
 		  Dijkstra<Digraph, TimeMap> dijkstra(graph, time);
@@ -154,3 +154,3 @@
 		/**
-		@defgroup matrices Matrices
 		@defgroup matrices Matrices
 		@ingroup datas
@@ -202,3 +202,3 @@
-		This group describes the common graph search algorithms like
 		This group describes the common graph search algorithms like
 		Breadth-first search (Bfs) and Depth-first search (Dfs).
@@ -214,5 +214,5 @@
 		/**
 		@defgroup max_flow Maximum Flow algorithms
-		@ingroup algs
+		/**
 		@defgroup max_flow Maximum Flow algorithms
 		@ingroup algs
 		\brief Algorithms for finding maximum flows.
@@ -233,3 +233,3 @@
 		LEMON contains several algorithms for solving maximum flow problems:
-		- \ref lemon::EdmondsKarp "Edmonds-Karp"
 		- \ref lemon::EdmondsKarp "Edmonds-Karp"
 		- \ref lemon::Preflow "Goldberg's Preflow algorithm"
@@ -252,3 +252,3 @@
 		This group describes the algorithms for finding minimum cost flows and
-		circulations.
 		circulations.
 		*/
@@ -256,4 +256,4 @@
 		/**
 		@defgroup min_cut Minimum Cut algorithms
 		@ingroup algs
 		@defgroup min_cut Minimum Cut algorithms
 		@ingroup algs
@@ -274,3 +274,3 @@
 		- \ref lemon::HaoOrlin "Hao-Orlin algorithm" to calculate minimum cut
-		  in directed graphs
 		  in directed graphs
 		- \ref lemon::NagamochiIbaraki "Nagamochi-Ibaraki algorithm" to
@@ -309,3 +309,3 @@
 		/**
-		@defgroup matching Matching algorithms
 		@defgroup matching Matching algorithms
 		@ingroup algs
@@ -316,3 +316,3 @@
 		finding a subset of the arcs which does not shares common endpoints.
 		There are several different algorithms for calculate matchings in
@@ -325,12 +325,12 @@
 		Lemon contains the next algorithms:
 		- \ref lemon::MaxBipartiteMatching "MaxBipartiteMatching" Hopcroft-Karp
 		  augmenting path algorithm for calculate maximum cardinality matching in
 		- \ref lemon::MaxBipartiteMatching "MaxBipartiteMatching" Hopcroft-Karp
 		  augmenting path algorithm for calculate maximum cardinality matching in
 		  bipartite graphs
 		- \ref lemon::PrBipartiteMatching "PrBipartiteMatching" Push-Relabel
 		  algorithm for calculate maximum cardinality matching in bipartite graphs
 		- \ref lemon::MaxWeightedBipartiteMatching "MaxWeightedBipartiteMatching"
 		  Successive shortest path algorithm for calculate maximum weighted matching
 		- \ref lemon::PrBipartiteMatching "PrBipartiteMatching" Push-Relabel
 		  algorithm for calculate maximum cardinality matching in bipartite graphs
 		- \ref lemon::MaxWeightedBipartiteMatching "MaxWeightedBipartiteMatching"
 		  Successive shortest path algorithm for calculate maximum weighted matching
 		  and maximum weighted bipartite matching in bipartite graph
 		- \ref lemon::MinCostMaxBipartiteMatching "MinCostMaxBipartiteMatching"
 		  Successive shortest path algorithm for calculate minimum cost maximum
 		- \ref lemon::MinCostMaxBipartiteMatching "MinCostMaxBipartiteMatching"
 		  Successive shortest path algorithm for calculate minimum cost maximum
 		  matching in bipartite graph
@@ -398,4 +398,4 @@
 		/**
 		@defgroup lp_utils Tools for Lp and Mip solvers
 		/**
 		@defgroup lp_utils Tools for Lp and Mip solvers
 		@ingroup lp_group
@@ -416,3 +416,3 @@
 		/**
-		@defgroup utils Tools and Utilities
 		@defgroup utils Tools and Utilities
 		\brief Tools and utilities for programming in LEMON
@@ -469,3 +469,3 @@
-		This group describes the tools for importing and exporting graphs
 		This group describes the tools for importing and exporting graphs
 		and graph related data. Now it supports the LEMON format, the
@@ -488,3 +488,3 @@
 		This group describes general \c EPS drawing methods and special
-		graph exporting tools.
 		graph exporting tools.
 		*/
@@ -500,3 +500,3 @@
 		The purpose of the classes in this group is fourfold.
 		- These classes contain the documentations of the concepts. In order
@@ -553,6 +553,6 @@
-		Some utility applications are listed here.
 		Some utility applications are listed here.
 		The standard compilation procedure (<tt>./configure;make</tt>) will compile
-		them, as well.
 		them, as well.
 		*/

doc/lgf.dox

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -45,3 +45,3 @@
 		character sequence surrounded by double quotes, and it can also
-		contain whitespaces and escape sequences.
 		contain whitespaces and escape sequences.
@@ -74,3 +74,3 @@
 		 @arcs
-		 	      capacity
+		               capacity
 2   16

doc/license.dox

Show inline comments

1		/* -- C++ --
	1	/* -- mode: C++; indent-tabs-mode: nil; --
2	2	*
3		* This file is a part of LEMON, a generic C++ optimization library
	3	* This file is a part of LEMON, a generic C++ optimization library.
4	4	*

doc/mainpage.dox

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -43,3 +43,3 @@
-		If you want to get a quick start and see the most important features then
 		If you want to get a quick start and see the most important features then
 		take a look at our \ref quicktour
@@ -47,7 +47,7 @@
-		If you already feel like using our library, see the page that tells you
 		If you already feel like using our library, see the page that tells you
 		\ref getstart "How to start using LEMON".
 		If you
 		want to see how LEMON works, see
 		If you
 		want to see how LEMON works, see
 		some \ref demoprograms "demo programs"!

doc/namespaces.dox

Show inline comments

1		/* -- C++ --
	1	/* -- mode: C++; indent-tabs-mode: nil; --
2	2	*
3		* This file is a part of LEMON, a generic C++ optimization library
	3	* This file is a part of LEMON, a generic C++ optimization library.
4	4	*

doc/template.h

Show inline comments

1		/* -- C++ --
	1	/* -- mode: C++; indent-tabs-mode: nil; --
2	2	*
3		* This file is a part of LEMON, a generic C++ optimization library
	3	* This file is a part of LEMON, a generic C++ optimization library.
4	4	*

lemon/arg_parser.cc

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -40,26 +40,26 @@
 		      if(i->second.self_delete)
 			switch(i->second.type) {
 			case BOOL:
 			  delete i->second.bool_p;
 			  break;
 			case STRING:
 			  delete i->second.string_p;
 			  break;
 			case DOUBLE:
 			  delete i->second.double_p;
 			  break;
 			case INTEGER:
 			  delete i->second.int_p;
 			  break;
 			case UNKNOWN:
 			  break;
 			case FUNC:
 			  break;
+			}
 		        switch(i->second.type) {
 		        case BOOL:
 		          delete i->second.bool_p;
 		          break;
 		        case STRING:
 		          delete i->second.string_p;
 		          break;
 		        case DOUBLE:
 		          delete i->second.double_p;
 		          break;
 		        case INTEGER:
 		          delete i->second.int_p;
 		          break;
 		        case UNKNOWN:
 		          break;
 		        case FUNC:
 		          break;
+		        }
+		  }
 		  ArgParser &ArgParser::intOption(const std::string &name,
 					       const std::string &help,
 					       int value, bool obl)
 		                               const std::string &help,
 		                               int value, bool obl)
+		  {
@@ -76,4 +76,4 @@
 		  ArgParser &ArgParser::doubleOption(const std::string &name,
 					       const std::string &help,
 					       double value, bool obl)
 		                               const std::string &help,
 		                               double value, bool obl)
+		  {
@@ -90,4 +90,4 @@
 		  ArgParser &ArgParser::boolOption(const std::string &name,
 					       const std::string &help,
 					       bool value, bool obl)
 		                               const std::string &help,
 		                               bool value, bool obl)
+		  {
@@ -104,4 +104,4 @@
 		  ArgParser &ArgParser::stringOption(const std::string &name,
 					       const std::string &help,
 					       std::string value, bool obl)
 		                               const std::string &help,
 		                               std::string value, bool obl)
+		  {
@@ -118,4 +118,4 @@
 		  ArgParser &ArgParser::refOption(const std::string &name,
 					       const std::string &help,
 					       int &ref, bool obl)
 		                               const std::string &help,
 		                               int &ref, bool obl)
+		  {
@@ -163,4 +163,4 @@
 		  ArgParser &ArgParser::refOption(const std::string &name,
 					       const std::string &help,
 					       std::string &ref, bool obl)
 		                               const std::string &help,
 		                               std::string &ref, bool obl)
+		  {
@@ -177,4 +177,4 @@
 		  ArgParser &ArgParser::funcOption(const std::string &name,
 					       const std::string &help,
 					       void (*func)(void *),void *data)
 		                               const std::string &help,
 		                               void (*func)(void *),void *data)
+		  {
@@ -192,3 +192,3 @@
 		  ArgParser &ArgParser::optionGroup(const std::string &group,
-						    const std::string &opt)
+		                                    const std::string &opt)
+		  {
@@ -196,3 +196,3 @@
 		    LEMON_ASSERT(i!=_opts.end(), "Unknown option: '"+opt+"'");
-		    LEMON_ASSERT(!(i->second.ingroup),
 		    LEMON_ASSERT(!(i->second.ingroup),
 		                 "Option already in option group: '"+opt+"'");
@@ -212,3 +212,3 @@
 		  ArgParser &ArgParser::synonym(const std::string &syn,
-						const std::string &opt)
+		                                const std::string &opt)
+		  {
@@ -235,3 +235,3 @@
 		  ArgParser &ArgParser::other(const std::string &name,
-					      const std::string &help)
+		                              const std::string &help)
+		  {
@@ -246,4 +246,4 @@
 		      for(Opts::iterator j=_opts.begin();j!=_opts.end();++j)
 			if(j->second.syn&&j->second.help==i->first)
 			  os << "|-" << j->first;
 		        if(j->second.syn&&j->second.help==i->first)
 		          os << "|-" << j->first;
 		    switch(i->second.type) {
@@ -272,3 +272,3 @@
+		  }
 		  void ArgParser::showHelp(Opts::iterator i)
@@ -285,5 +285,5 @@
 		    std::cerr << "  " << i->name << std::endl
-			      << "     " << i->help << std::endl;
+		              << "     " << i->help << std::endl;
+		  }
 		  void ArgParser::shortHelp()
@@ -301,4 +301,4 @@
 		      if(pos+cstr.str().size()>LINE_LEN) {
 			std::cerr << std::endl << indent;
 			pos=indent.size();
 		        std::cerr << std::endl << indent;
 		        pos=indent.size();
+		      }
@@ -309,26 +309,26 @@
 		      if(!i->second.ingroup&&!i->second.syn) {
 			std::ostringstream cstr;
 			cstr << ' ';
 			if(!i->second.mandatory) cstr << '[';
 			show(cstr,i);
 			if(!i->second.mandatory) cstr << ']';
 			if(pos+cstr.str().size()>LINE_LEN) {
 			  std::cerr << std::endl << indent;
 			  pos=indent.size();
+			}
 			std::cerr << cstr.str();
-			pos+=cstr.str().size();
+		        std::ostringstream cstr;
 		        cstr << ' ';
 		        if(!i->second.mandatory) cstr << '[';
 		        show(cstr,i);
 		        if(!i->second.mandatory) cstr << ']';
 		        if(pos+cstr.str().size()>LINE_LEN) {
 		          std::cerr << std::endl << indent;
 		          pos=indent.size();
+		        }
 		        std::cerr << cstr.str();
 		        pos+=cstr.str().size();
+		      }
 		    for(std::vector<OtherArg>::iterator i=_others_help.begin();
-			i!=_others_help.end();++i)
+		        i!=_others_help.end();++i)
+		      {
 			std::ostringstream cstr;
 			cstr << ' ' << i->name;
 			if(pos+cstr.str().size()>LINE_LEN) {
 			  std::cerr << std::endl << indent;
 			  pos=indent.size();
+			}
 			std::cerr << cstr.str();
-			pos+=cstr.str().size();
+		        std::ostringstream cstr;
 		        cstr << ' ' << i->name;
 		        if(pos+cstr.str().size()>LINE_LEN) {
 		          std::cerr << std::endl << indent;
 		          pos=indent.size();
+		        }
 		        std::cerr << cstr.str();
 		        pos+=cstr.str().size();
+		      }
@@ -336,3 +336,3 @@
+		  }
 		  void ArgParser::showHelp()
@@ -342,3 +342,3 @@
 		    for(std::vector<OtherArg>::iterator i=_others_help.begin();
-			i!=_others_help.end();++i) showHelp(i);
+		        i!=_others_help.end();++i) showHelp(i);
 		    for(Opts::iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
@@ -346,5 +346,5 @@
+		  }
-		  void ArgParser::unknownOpt(std::string arg)
 		  void ArgParser::unknownOpt(std::string arg)
+		  {
@@ -355,4 +355,4 @@
+		  }
 		  void ArgParser::requiresValue(std::string arg, OptType t)
 		  void ArgParser::requiresValue(std::string arg, OptType t)
+		  {
@@ -375,3 +375,3 @@
+		  }
@@ -381,37 +381,37 @@
 		    for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
 		      if(i->second.mandatory&&!i->second.set)
+			{
 			  if(ok)
 			    std::cerr << _command_name
 				      << ": The following mandatory arguments are missing.\n";
 			  ok=false;
 			  showHelp(i);
+			}
 		      if(i->second.mandatory&&!i->second.set)
+		        {
 		          if(ok)
 		            std::cerr << _command_name
 		                      << ": The following mandatory arguments are missing.\n";
 		          ok=false;
 		          showHelp(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::iterator o=i->second.opts.begin();
 			      o!=i->second.opts.end();++o)
 			    if(_opts.find(*o)->second.set) ++set;
 			  if(i->second.mandatory&&!set) {
 			    std::cerr << _command_name
 				      << ": At least one of the following arguments is mandatory.\n";
 			    ok=false;
 			    for(GroupData::Opts::iterator o=i->second.opts.begin();
 				o!=i->second.opts.end();++o)
 			      showHelp(_opts.find(*o));
+			  }
 			  if(i->second.only_one&&set>1) {
 			    std::cerr << _command_name
 				      << ": At most one of the following arguments can be given.\n";
 			    ok=false;
 			    for(GroupData::Opts::iterator o=i->second.opts.begin();
 				o!=i->second.opts.end();++o)
 			      showHelp(_opts.find(*o));
+			  }
+			}
+		        {
 		          int set=0;
 		          for(GroupData::Opts::iterator o=i->second.opts.begin();
 		              o!=i->second.opts.end();++o)
 		            if(_opts.find(*o)->second.set) ++set;
 		          if(i->second.mandatory&&!set) {
 		            std::cerr << _command_name
 		                      << ": At least one of the following arguments is mandatory.\n";
 		            ok=false;
 		            for(GroupData::Opts::iterator o=i->second.opts.begin();
 		                o!=i->second.opts.end();++o)
 		              showHelp(_opts.find(*o));
+		          }
 		          if(i->second.only_one&&set>1) {
 		            std::cerr << _command_name
 		                      << ": At most one of the following arguments can be given.\n";
 		            ok=false;
 		            for(GroupData::Opts::iterator o=i->second.opts.begin();
 		                o!=i->second.opts.end();++o)
 		              showHelp(_opts.find(*o));
+		          }
+		        }
 		    if(!ok) {
 		      std::cerr << "\nType '" << _command_name <<
-			" --help' to obtain a short summary on the usage.\n\n";
+		        " --help' to obtain a short summary on the usage.\n\n";
 		      exit(1);
@@ -425,34 +425,34 @@
 		      if (arg[0] != '-' || arg.size() == 1) {
-			_file_args.push_back(arg);
+		        _file_args.push_back(arg);
+		      }
 		      else {
 			Opts::iterator i = _opts.find(arg.substr(1));
 			if(i==_opts.end()) unknownOpt(arg);
 			else {
 			  if(i->second.syn) i=_opts.find(i->second.help);
 			  ParData &p(i->second);
 			  if (p.type==BOOL) *p.bool_p=true;
 			  else if (p.type==FUNC) p.func_p.p(p.func_p.data);
 			  else if(++ar==_argc) requiresValue(arg, p.type);
 			  else {
 			    std::string val(_argv[ar]);
 			    std::istringstream vals(val);
 			    switch(p.type) {
 			    case STRING:
 			      *p.string_p=val;
 			      break;
 			    case INTEGER:
 			      vals >> *p.int_p;
 			      break;
 			    case DOUBLE:
 			      vals >> *p.double_p;
 			      break;
 			    default:
 			      break;
+			    }
 			    if(p.type!=STRING&&(!vals||!vals.eof()))
 			      requiresValue(arg, p.type);
+			  }
 			  p.set = true;
+			}
+		        Opts::iterator i = _opts.find(arg.substr(1));
 		        if(i==_opts.end()) unknownOpt(arg);
 		        else {
 		          if(i->second.syn) i=_opts.find(i->second.help);
 		          ParData &p(i->second);
 		          if (p.type==BOOL) *p.bool_p=true;
 		          else if (p.type==FUNC) p.func_p.p(p.func_p.data);
 		          else if(++ar==_argc) requiresValue(arg, p.type);
 		          else {
 		            std::string val(_argv[ar]);
 		            std::istringstream vals(val);
 		            switch(p.type) {
 		            case STRING:
 		              *p.string_p=val;
 		              break;
 		            case INTEGER:
 		              vals >> *p.int_p;
 		              break;
 		            case DOUBLE:
 		              vals >> *p.double_p;
 		              break;
 		            default:
 		              break;
+		            }
 		            if(p.type!=STRING&&(!vals||!vals.eof()))
 		              requiresValue(arg, p.type);
+		          }
 		          p.set = true;
+		        }
+		      }
@@ -462,3 +462,3 @@
 		    return *this;
+		  }
+		  }

lemon/arg_parser.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -43,11 +43,11 @@
 		  class ArgParser {
 		    static void _showHelp(void *p);
 		  protected:
 		    int _argc;
 		    const char **_argv;
 		    enum OptType { UNKNOWN=0, BOOL=1, STRING=2, DOUBLE=3, INTEGER=4, FUNC=5 };
 		    class ParData {
@@ -55,11 +55,11 @@
 		      union {
 			bool *bool_p;
 			int *int_p;
 			double *double_p;
 			std::string *string_p;
 			struct {
 			  void (*p)(void *);
 			  void *data;
 			} func_p;
+		        bool *bool_p;
 		        int *int_p;
 		        double *double_p;
 		        std::string *string_p;
 		        struct {
 		          void (*p)(void *);
 		          void *data;
 		        } func_p;
 		      };
@@ -74,3 +74,3 @@
 		      ParData() : mandatory(false), type(UNKNOWN), set(false), ingroup(false),
-				  has_syn(false), syn(false), self_delete(false) {}
+		                  has_syn(false), syn(false), self_delete(false) {}
 		    };
@@ -80,3 +80,3 @@
-		    class GroupData
 		    class GroupData
+		    {
@@ -89,3 +89,3 @@
 		    };
 		    typedef std::map<std::string,GroupData> Groups;
@@ -100,3 +100,3 @@
 		    };
 		    std::vector<OtherArg> _others_help;
@@ -105,3 +105,3 @@
 		  private:
@@ -115,5 +115,5 @@
 		    ArgParser &funcOption(const std::string &name,
 				    const std::string &help,
 				    void (*func)(void *),void *data);
+		                    const std::string &help,
 		                    void (*func)(void *),void *data);
 		  public:
@@ -138,4 +138,4 @@
 		    ArgParser &intOption(const std::string &name,
 				    const std::string &help,
 				    int value=0, bool obl=false);
 		                    const std::string &help,
 		                    int value=0, bool obl=false);
@@ -149,4 +149,4 @@
 		    ArgParser &doubleOption(const std::string &name,
 				      const std::string &help,
 				      double value=0, bool obl=false);
 		                      const std::string &help,
 		                      double value=0, bool obl=false);
@@ -161,4 +161,4 @@
 		    ArgParser &boolOption(const std::string &name,
 				      const std::string &help,
 				      bool value=false, bool obl=false);
 		                      const std::string &help,
 		                      bool value=false, bool obl=false);
@@ -172,4 +172,4 @@
 		    ArgParser &stringOption(const std::string &name,
 				      const std::string &help,
 				      std::string value="", bool obl=false);
 		                      const std::string &help,
 		                      std::string value="", bool obl=false);
@@ -181,4 +181,4 @@
 		    ArgParser &other(const std::string &name,
 				     const std::string &help="");
 		                     const std::string &help="");
 		    ///@}
@@ -199,4 +199,4 @@
 		    ArgParser &refOption(const std::string &name,
 				    const std::string &help,
 				    int &ref, bool obl=false);
 		                    const std::string &help,
 		                    int &ref, bool obl=false);
@@ -210,4 +210,4 @@
 		    ArgParser &refOption(const std::string &name,
 				      const std::string &help,
 				      double &ref, bool obl=false);
 		                      const std::string &help,
 		                      double &ref, bool obl=false);
@@ -222,4 +222,4 @@
 		    ArgParser &refOption(const std::string &name,
 				      const std::string &help,
 				      bool &ref, bool obl=false);
 		                      const std::string &help,
 		                      bool &ref, bool obl=false);
@@ -233,5 +233,5 @@
 		    ArgParser &refOption(const std::string &name,
 				      const std::string &help,
 				      std::string &ref, bool obl=false);
+		                      const std::string &help,
 		                      std::string &ref, bool obl=false);
 		    ///@}
@@ -240,3 +240,3 @@
 		    ///
 		    ///@{
@@ -250,3 +250,3 @@
 		    ArgParser &optionGroup(const std::string &group,
-					   const std::string &opt);
+		                           const std::string &opt);
@@ -257,3 +257,3 @@
 		    ArgParser &onlyOneGroup(const std::string &group);
 		    ///Make a group mandatory
@@ -263,3 +263,3 @@
 		    ArgParser &mandatoryGroup(const std::string &group);
 		    ///Create synonym to an option
@@ -269,4 +269,4 @@
 		    ArgParser &synonym(const std::string &syn,
 					   const std::string &opt);
 		                           const std::string &opt);
 		    ///@}
@@ -284,3 +284,3 @@
 		    void checkMandatories();
 		    ///Start the parsing process
@@ -289,3 +289,3 @@
 		    /// Synonym for parse()
-		    ArgParser &run()
 		    ArgParser &run()
+		    {
@@ -293,3 +293,3 @@
+		    }
 		    ///Give back the command name (the 0th argument)
@@ -298,3 +298,3 @@
 		    ///Check if an opion has been given to the command.
-		    bool given(std::string op)
 		    bool given(std::string op)
+		    {
@@ -306,3 +306,3 @@
 		    ///Magic type for operator[]
 		    ///This is the type of the return value of ArgParser::operator[]().
@@ -311,3 +311,3 @@
 		    ///throws an exception (i.e. it performs runtime type checking).
-		    class RefType
 		    class RefType
+		    {
@@ -319,10 +319,10 @@
 		      ///\e
-		      operator bool()
 		      operator bool()
+		      {
 			Opts::iterator i = _parser._opts.find(_name);
 			LEMON_ASSERT(i!=_parser._opts.end(),
 				     std::string()+"Unkown option: '"+_name+"'");
 			LEMON_ASSERT(i->second.type==ArgParser::BOOL,
 				     std::string()+"'"+_name+"' is a bool option");
 			return *(i->second.bool_p);
 		        Opts::iterator i = _parser._opts.find(_name);
 		        LEMON_ASSERT(i!=_parser._opts.end(),
 		                     std::string()+"Unkown option: '"+_name+"'");
 		        LEMON_ASSERT(i->second.type==ArgParser::BOOL,
 		                     std::string()+"'"+_name+"' is a bool option");
 		        return *(i->second.bool_p);
+		      }
@@ -331,30 +331,30 @@
+		      {
 			Opts::iterator i = _parser._opts.find(_name);
 			LEMON_ASSERT(i!=_parser._opts.end(),
 				     std::string()+"Unkown option: '"+_name+"'");
 			LEMON_ASSERT(i->second.type==ArgParser::STRING,
 				     std::string()+"'"+_name+"' is a string option");
 			return *(i->second.string_p);
 		        Opts::iterator i = _parser._opts.find(_name);
 		        LEMON_ASSERT(i!=_parser._opts.end(),
 		                     std::string()+"Unkown option: '"+_name+"'");
 		        LEMON_ASSERT(i->second.type==ArgParser::STRING,
 		                     std::string()+"'"+_name+"' is a string option");
 		        return *(i->second.string_p);
+		      }
 		      ///\e
-		      operator double()
 		      operator double()
+		      {
 			Opts::iterator i = _parser._opts.find(_name);
 			LEMON_ASSERT(i!=_parser._opts.end(),
 				     std::string()+"Unkown option: '"+_name+"'");
 			LEMON_ASSERT(i->second.type==ArgParser::DOUBLE ||
 				     i->second.type==ArgParser::INTEGER,
 				     std::string()+"'"+_name+"' is a floating point option");
 			return i->second.type==ArgParser::DOUBLE ?
 			  *(i->second.double_p) : *(i->second.int_p);
 		        Opts::iterator i = _parser._opts.find(_name);
 		        LEMON_ASSERT(i!=_parser._opts.end(),
 		                     std::string()+"Unkown option: '"+_name+"'");
 		        LEMON_ASSERT(i->second.type==ArgParser::DOUBLE ||
 		                     i->second.type==ArgParser::INTEGER,
 		                     std::string()+"'"+_name+"' is a floating point option");
 		        return i->second.type==ArgParser::DOUBLE ?
 		          *(i->second.double_p) : *(i->second.int_p);
+		      }
 		      ///\e
-		      operator int()
 		      operator int()
+		      {
 			Opts::iterator i = _parser._opts.find(_name);
 			LEMON_ASSERT(i!=_parser._opts.end(),
 				     std::string()+"Unkown option: '"+_name+"'");
 			LEMON_ASSERT(i->second.type==ArgParser::INTEGER,
 				     std::string()+"'"+_name+"' is an integer option");
 			return *(i->second.int_p);
 		        Opts::iterator i = _parser._opts.find(_name);
 		        LEMON_ASSERT(i!=_parser._opts.end(),
 		                     std::string()+"Unkown option: '"+_name+"'");
 		        LEMON_ASSERT(i->second.type==ArgParser::INTEGER,
 		                     std::string()+"'"+_name+"' is an integer option");
 		        return *(i->second.int_p);
+		      }
@@ -364,3 +364,3 @@
 		    ///Give back the value of an option
 		    ///Give back the value of an option.
@@ -370,3 +370,3 @@
 		      return RefType(*this, n);
+		    }
+		    }
@@ -377,3 +377,3 @@
 		    std::vector<std::string> &files() { return _file_args; }
 		  };

lemon/assert.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -30,3 +30,3 @@
 		  inline void assert_fail_log(const char *file, int line, const char *function,
-					      const char *message, const char *assertion)
+		                              const char *message, const char *assertion)
+		  {
@@ -42,4 +42,4 @@
 		  inline void assert_fail_abort(const char *file, int line,
 						const char *function, const char* message,
 						const char *assertion)
 		                                const char *function, const char* message,
 		                                const char *assertion)
+		  {
@@ -50,4 +50,4 @@
 		  namespace _assert_bits {
 		    inline const char* cstringify(const std::string& str) {
@@ -58,3 +58,3 @@
 		      return str;
+		    }
+		    }
+		  }
@@ -68,4 +68,4 @@
 		#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
@@ -74,7 +74,7 @@
 		#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))
@@ -138,3 +138,3 @@
 		/// The checking is also disabled when the standard macro \c NDEBUG is defined.
-		///
 		///
 		/// The LEMON assertion system has a wide range of customization
@@ -143,3 +143,3 @@
 		///
-		/// The following modes can be used in the assertion system:
 		/// The following modes can be used in the assertion system:
 		///
@@ -157,3 +157,3 @@
 		///   The name of the function should be defined as the \c
-		///   LEMON_CUSTOM_ASSERT_HANDLER macro name.
 		///   LEMON_CUSTOM_ASSERT_HANDLER macro name.
 		///   \code
@@ -168,7 +168,7 @@
 		/// behaviour is changed appropiately to the new settings.
 		#  define LEMON_ASSERT(exp, msg)					\
 		  (static_cast<void> (!!(exp) ? 0 : (					\
 		    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,				\
 					 LEMON_FUNCTION_NAME,				\
-					 ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
+		#  define LEMON_ASSERT(exp, msg)                                        \
 		  (static_cast<void> (!!(exp) ? 0 : (                                        \
 		    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                                \
 		                         LEMON_FUNCTION_NAME,                                \
 		                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
@@ -184,7 +184,7 @@
 		///
 		/// \see LEMON_ASSERT
 		#  define LEMON_FIXME(msg)						\
 		  (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,	\
 					::lemon::_assert_bits::cstringify(msg),		\
-					static_cast<const char*>(0)))
+		/// \see LEMON_ASSERT
 		#  define LEMON_FIXME(msg)                                                \
 		  (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,        \
 		                        ::lemon::_assert_bits::cstringify(msg),                \
 		                        static_cast<const char*>(0)))
@@ -212,8 +212,8 @@
 		///
 		/// \see LEMON_ASSERT
 		#  define LEMON_DEBUG(exp, msg)						\
-		  (static_cast<void> (!!(exp) ? 0 : (					\
+		/// \see LEMON_ASSERT
 		#  define LEMON_DEBUG(exp, msg)                                                \
 		  (static_cast<void> (!!(exp) ? 0 : (                                        \
 		    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                            \
 					 LEMON_FUNCTION_NAME,				\
 					 ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
 		                         LEMON_FUNCTION_NAME,                                \
 		                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
@@ -226,12 +226,12 @@
 		#  else
 		#    define LEMON_ASSERT(exp, msg)					\
 		       (static_cast<void> (!!(exp) ? 0 : (				\
 		#    define LEMON_ASSERT(exp, msg)                                        \
 		       (static_cast<void> (!!(exp) ? 0 : (                                \
 		        LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                        \
 					     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),	\
-					     static_cast<const char*>(0)))
+		                             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),        \
 		                             static_cast<const char*>(0)))
@@ -242,4 +242,4 @@
 		                                LEMON_FUNCTION_NAME, \
 						::lemon::_assert_bits::cstringify(msg),	\
 						#exp), 0)))
 		                                ::lemon::_assert_bits::cstringify(msg),        \
 		                                #exp), 0)))
 		#    else

lemon/base.cc

Show inline comments

1		/* -- C++ --
	1	/* -- mode: C++; indent-tabs-mode: nil; --
2	2	*
3		* This file is a part of LEMON, a generic C++ optimization library
	3	* This file is a part of LEMON, a generic C++ optimization library.
4	4	*

lemon/bfs.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -35,3 +35,3 @@
 		  ///Default traits class of Bfs class.
@@ -43,3 +43,3 @@
+		  {
-		    ///The digraph type the algorithm runs on.
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
@@ -47,3 +47,3 @@
 		    ///arcs of the shortest paths.
-		    ///
 		    ///
 		    ///The type of the map that stores the last
@@ -54,7 +54,7 @@
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param G is the digraph, to which we would like to define the PredMap.
 		    ///\todo The digraph alone may be insufficient to initialize
-		    static PredMap *createPredMap(const GR &G)
 		    static PredMap *createPredMap(const GR &G)
+		    {
@@ -63,3 +63,3 @@
 		    ///The type of the map that indicates which nodes are processed.
 		    ///The type of the map that indicates which nodes are processed.
@@ -69,4 +69,4 @@
 		    ///Instantiates a ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///\param g is the digraph, to which
@@ -82,3 +82,3 @@
 		    ///The type of the map that indicates which nodes are reached.
 		    ///The type of the map that indicates which nodes are reached.
@@ -88,4 +88,4 @@
 		    ///Instantiates a ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///\param G is the digraph, to which
@@ -97,3 +97,3 @@
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
@@ -103,4 +103,4 @@
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param G is the digraph, to which we would like to define the \ref DistMap
@@ -111,5 +111,5 @@
 		  };
 		  ///%BFS algorithm class.
 		  ///\ingroup search
@@ -128,6 +128,6 @@
 		  template <typename GR,
-			    typename TR>
+		            typename TR>
 		#else
 		  template <typename GR=ListDigraph,
-			    typename TR=BfsDefaultTraits<GR> >
+		            typename TR=BfsDefaultTraits<GR> >
 		#endif
@@ -144,3 +144,3 @@
 		      virtual const char* what() const throw() {
-			return "lemon::Bfs::UninitializedParameter";
+		        return "lemon::Bfs::UninitializedParameter";
+		      }
@@ -151,3 +151,3 @@
 		    typedef typename TR::Digraph Digraph;
 		    ///\brief The type of the map that stores the last
@@ -192,21 +192,21 @@
 		    ///Creates the maps if necessary.
 		    ///\todo Better memory allocation (instead of new).
-		    void create_maps()
 		    void create_maps()
+		    {
 		      if(!_pred) {
 			local_pred = true;
 			_pred = Traits::createPredMap(*G);
 		        local_pred = true;
 		        _pred = Traits::createPredMap(*G);
+		      }
 		      if(!_dist) {
 			local_dist = true;
 			_dist = Traits::createDistMap(*G);
 		        local_dist = true;
 		        _dist = Traits::createDistMap(*G);
+		      }
 		      if(!_reached) {
 			local_reached = true;
 			_reached = Traits::createReachedMap(*G);
 		        local_reached = true;
 		        _reached = Traits::createReachedMap(*G);
+		      }
 		      if(!_processed) {
 			local_processed = true;
 			_processed = Traits::createProcessedMap(*G);
 		        local_processed = true;
 		        _processed = Traits::createProcessedMap(*G);
+		      }
@@ -215,7 +215,7 @@
 		  protected:
 		    Bfs() {}
 		  public:
 		    typedef Bfs Create;
@@ -229,5 +229,5 @@
 		      typedef T PredMap;
-		      static PredMap *createPredMap(const Digraph &)
 		      static PredMap *createPredMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -240,6 +240,6 @@
 		    template <class T>
-		    struct DefPredMap : public Bfs< Digraph, DefPredMapTraits<T> > {
 		    struct DefPredMap : public Bfs< Digraph, DefPredMapTraits<T> > {
 		      typedef Bfs< Digraph, DefPredMapTraits<T> > Create;
 		    };
 		    template <class T>
@@ -247,5 +247,5 @@
 		      typedef T DistMap;
-		      static DistMap *createDistMap(const Digraph &)
 		      static DistMap *createDistMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -258,6 +258,6 @@
 		    template <class T>
-		    struct DefDistMap : public Bfs< Digraph, DefDistMapTraits<T> > {
 		    struct DefDistMap : public Bfs< Digraph, DefDistMapTraits<T> > {
 		      typedef Bfs< Digraph, DefDistMapTraits<T> > Create;
 		    };
 		    template <class T>
@@ -265,5 +265,5 @@
 		      typedef T ReachedMap;
-		      static ReachedMap *createReachedMap(const Digraph &)
 		      static ReachedMap *createReachedMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -276,6 +276,6 @@
 		    template <class T>
-		    struct DefReachedMap : public Bfs< Digraph, DefReachedMapTraits<T> > {
 		    struct DefReachedMap : public Bfs< Digraph, DefReachedMapTraits<T> > {
 		      typedef Bfs< Digraph, DefReachedMapTraits<T> > Create;
 		    };
 		    template <class T>
@@ -283,5 +283,5 @@
 		      typedef T ProcessedMap;
-		      static ProcessedMap *createProcessedMap(const Digraph &)
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -297,8 +297,8 @@
 		    };
 		    struct DefDigraphProcessedMapTraits : public Traits {
 		      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
-		      static ProcessedMap *createProcessedMap(const Digraph &G)
 		      static ProcessedMap *createProcessedMap(const Digraph &G)
+		      {
-			return new ProcessedMap(G);
+		        return new ProcessedMap(G);
+		      }
@@ -313,12 +313,12 @@
 		    struct DefProcessedMapToBeDefaultMap :
-		      public Bfs< Digraph, DefDigraphProcessedMapTraits> {
 		      public Bfs< Digraph, DefDigraphProcessedMapTraits> {
 		      typedef Bfs< Digraph, DefDigraphProcessedMapTraits> Create;
 		    };
 		    ///@}
 		  public:
 		  public:
 		    ///Constructor.
 		    ///\param _G the digraph the algorithm will run on.
@@ -332,5 +332,5 @@
 		    { }
 		    ///Destructor.
-		    ~Bfs()
 		    ~Bfs()
+		    {
@@ -349,7 +349,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Bfs &predMap(PredMap &m)
 		    Bfs &predMap(PredMap &m)
+		    {
 		      if(local_pred) {
 			delete _pred;
 			local_pred=false;
 		        delete _pred;
 		        local_pred=false;
+		      }
@@ -366,7 +366,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Bfs &reachedMap(ReachedMap &m)
 		    Bfs &reachedMap(ReachedMap &m)
+		    {
 		      if(local_reached) {
 			delete _reached;
 			local_reached=false;
 		        delete _reached;
 		        local_reached=false;
+		      }
@@ -383,7 +383,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Bfs &processedMap(ProcessedMap &m)
 		    Bfs &processedMap(ProcessedMap &m)
+		    {
 		      if(local_processed) {
 			delete _processed;
 			local_processed=false;
 		        delete _processed;
 		        local_processed=false;
+		      }
@@ -400,7 +400,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Bfs &distMap(DistMap &m)
 		    Bfs &distMap(DistMap &m)
+		    {
 		      if(local_dist) {
 			delete _dist;
 			local_dist=false;
 		        delete _dist;
 		        local_dist=false;
+		      }
@@ -434,8 +434,8 @@
 		      for ( NodeIt u(*G) ; u!=INVALID ; ++u ) {
 			_pred->set(u,INVALID);
 			_reached->set(u,false);
-			_processed->set(u,false);
+		        _pred->set(u,INVALID);
 		        _reached->set(u,false);
 		        _processed->set(u,false);
+		      }
+		    }
 		    ///Adds a new source node.
@@ -447,11 +447,11 @@
 		      if(!(*_reached)[s])
+			{
 			  _reached->set(s,true);
 			  _pred->set(s,INVALID);
 			  _dist->set(s,0);
 			  _queue[_queue_head++]=s;
 			  _queue_next_dist=_queue_head;
+			}
+		        {
 		          _reached->set(s,true);
 		          _pred->set(s,INVALID);
 		          _dist->set(s,0);
 		          _queue[_queue_head++]=s;
 		          _queue_next_dist=_queue_head;
+		        }
+		    }
 		    ///Processes the next node.
@@ -466,4 +466,4 @@
 		      if(_queue_tail==_queue_next_dist) {
 			_curr_dist++;
 			_queue_next_dist=_queue_head;
 		        _curr_dist++;
 		        _queue_next_dist=_queue_head;
+		      }
@@ -473,8 +473,8 @@
 		      for(OutArcIt e(*G,n);e!=INVALID;++e)
 			if(!(*_reached)[m=G->target(e)]) {
 			  _queue[_queue_head++]=m;
 			  _reached->set(m,true);
 			  _pred->set(m,e);
 			  _dist->set(m,_curr_dist);
+			}
 		        if(!(*_reached)[m=G->target(e)]) {
 		          _queue[_queue_head++]=m;
 		          _reached->set(m,true);
 		          _pred->set(m,e);
 		          _dist->set(m,_curr_dist);
+		        }
 		      return n;
@@ -497,4 +497,4 @@
 		      if(_queue_tail==_queue_next_dist) {
 			_curr_dist++;
 			_queue_next_dist=_queue_head;
 		        _curr_dist++;
 		        _queue_next_dist=_queue_head;
+		      }
@@ -504,9 +504,9 @@
 		      for(OutArcIt e(*G,n);e!=INVALID;++e)
 			if(!(*_reached)[m=G->target(e)]) {
 			  _queue[_queue_head++]=m;
 			  _reached->set(m,true);
 			  _pred->set(m,e);
-			  _dist->set(m,_curr_dist);
+		        if(!(*_reached)[m=G->target(e)]) {
 		          _queue[_queue_head++]=m;
 		          _reached->set(m,true);
 		          _pred->set(m,e);
 		          _dist->set(m,_curr_dist);
 		          reach = reach || (target == m);
+			}
+		        }
 		      return n;
@@ -530,4 +530,4 @@
 		      if(_queue_tail==_queue_next_dist) {
 			_curr_dist++;
 			_queue_next_dist=_queue_head;
 		        _curr_dist++;
 		        _queue_next_dist=_queue_head;
+		      }
@@ -537,12 +537,12 @@
 		      for(OutArcIt e(*G,n);e!=INVALID;++e)
 			if(!(*_reached)[m=G->target(e)]) {
 			  _queue[_queue_head++]=m;
 			  _reached->set(m,true);
 			  _pred->set(m,e);
 			  _dist->set(m,_curr_dist);
 			  if (nm[m] && rnode == INVALID) rnode = m;
+			}
+		        if(!(*_reached)[m=G->target(e)]) {
 		          _queue[_queue_head++]=m;
 		          _reached->set(m,true);
 		          _pred->set(m,e);
 		          _dist->set(m,_curr_dist);
 		          if (nm[m] && rnode == INVALID) rnode = m;
+		        }
 		      return n;
+		    }
 		    ///Next node to be processed.
@@ -554,6 +554,6 @@
 		    Node nextNode()
+		    {
+		    {
 		      return _queue_tail<_queue_head?_queue[_queue_tail]:INVALID;
+		    }
 		    ///\brief Returns \c false if there are nodes
@@ -565,6 +565,6 @@
 		    ///Returns the number of the nodes to be processed.
 		    ///Returns the number of the nodes to be processed in the queue.
 		    int queueSize() { return _queue_head-_queue_tail; }
 		    ///Executes the algorithm.
@@ -586,3 +586,3 @@
+		    }
 		    ///Executes the algorithm until \c dest is reached.
@@ -604,3 +604,3 @@
+		    }
 		    ///Executes the algorithm until a condition is met.
@@ -623,3 +623,3 @@
 		      while ( !emptyQueue() && rnode == INVALID ) {
-			processNextNode(nm, rnode);
+		        processNextNode(nm, rnode);
+		      }
@@ -627,5 +627,5 @@
+		    }
 		    ///Runs %BFS algorithm from node \c s.
 		    ///This method runs the %BFS algorithm from a root node \c s
@@ -648,5 +648,5 @@
+		    }
 		    ///Finds the shortest path between \c s and \c t.
 		    ///Finds the shortest path between \c s and \c t.
@@ -668,3 +668,3 @@
+		    }
 		    ///@}
@@ -676,3 +676,3 @@
 		    ///either run() or start() must be calleb.
 		    ///@{
@@ -682,6 +682,6 @@
 		    ///Gives back the shortest path.
 		    ///Gives back the shortest path.
 		    ///\pre The \c t should be reachable from the source.
-		    Path path(Node t)
 		    Path path(Node t)
+		    {
@@ -724,4 +724,4 @@
 		    Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
 						  G->source((*_pred)[v]); }
 		                                  G->source((*_pred)[v]); }
 		    ///Returns a reference to the NodeMap of distances.
@@ -732,3 +732,3 @@
 		    const DistMap &distMap() const { return *_dist;}
 		    ///Returns a reference to the shortest path tree map.
@@ -740,3 +740,3 @@
 		    const PredMap &predMap() const { return *_pred;}
 		    ///Checks if a node is reachable from the root.
@@ -749,3 +749,3 @@
 		    bool reached(Node v) { return (*_reached)[v]; }
 		    ///@}
@@ -760,3 +760,3 @@
+		  {
-		    ///The digraph type the algorithm runs on.
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
@@ -764,3 +764,3 @@
 		    ///arcs of the shortest paths.
-		    ///
 		    ///
 		    ///The type of the map that stores the last
@@ -771,4 +771,4 @@
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param g is the digraph, to which we would like to define the PredMap.
@@ -776,5 +776,5 @@
 		#ifdef DOXYGEN
-		    static PredMap *createPredMap(const GR &g)
 		    static PredMap *createPredMap(const GR &g)
 		#else
-		    static PredMap *createPredMap(const GR &)
 		    static PredMap *createPredMap(const GR &)
 		#endif
@@ -785,3 +785,3 @@
 		    ///The type of the map that indicates which nodes are processed.
 		    ///The type of the map that indicates which nodes are processed.
@@ -791,4 +791,4 @@
 		    ///Instantiates a ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///\param g is the digraph, to which
@@ -804,3 +804,3 @@
 		    ///The type of the map that indicates which nodes are reached.
 		    ///The type of the map that indicates which nodes are reached.
@@ -810,4 +810,4 @@
 		    ///Instantiates a ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///\param G is the digraph, to which
@@ -819,3 +819,3 @@
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
@@ -825,4 +825,4 @@
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param g is the digraph, to which we would like to define the \ref DistMap
@@ -837,3 +837,3 @@
 		  };
 		  /// Default traits used by \ref BfsWizard
@@ -867,6 +867,6 @@
 		    Node _source;
 		    public:
 		    /// Constructor.
 		    /// This constructor does not require parameters, therefore it initiates
@@ -874,6 +874,6 @@
 		    BfsWizardBase() : _g(0), _reached(0), _processed(0), _pred(0),
-					   _dist(0), _source(INVALID) {}
+		                           _dist(0), _source(INVALID) {}
 		    /// Constructor.
 		    /// This constructor requires some parameters,
@@ -884,3 +884,3 @@
 		    BfsWizardBase(const GR &g, Node s=INVALID) :
-		      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
 		      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
 		      _reached(0), _processed(0), _pred(0), _dist(0), _source(s) {}
@@ -888,3 +888,3 @@
 		  };
 		  /// A class to make the usage of Bfs algorithm easier
@@ -923,3 +923,3 @@
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///\brief The type of the map that stores
@@ -953,3 +953,3 @@
 		    ///Runs Bfs algorithm from a given node.
 		    ///Runs Bfs algorithm from a given node.
@@ -961,8 +961,8 @@
 		      if(Base::_reached)
 			alg.reachedMap(*reinterpret_cast<ReachedMap*>(Base::_reached));
 		      if(Base::_processed)
 		        alg.reachedMap(*reinterpret_cast<ReachedMap*>(Base::_reached));
 		      if(Base::_processed)
 		        alg.processedMap(*reinterpret_cast<ProcessedMap*>(Base::_processed));
-		      if(Base::_pred)
 		      if(Base::_pred)
 		        alg.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
-		      if(Base::_dist)
 		      if(Base::_dist)
 		        alg.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
@@ -987,3 +987,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -995,3 +995,3 @@
 		    template<class T>
-		    BfsWizard<DefPredMapBase<T> > predMap(const T &t)
 		    BfsWizard<DefPredMapBase<T> > predMap(const T &t)
+		    {
@@ -1000,4 +1000,4 @@
+		    }
 		    template<class T>
@@ -1008,3 +1008,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -1016,3 +1016,3 @@
 		    template<class T>
-		    BfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
 		    BfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
+		    {
@@ -1021,3 +1021,3 @@
+		    }
@@ -1029,3 +1029,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -1037,3 +1037,3 @@
 		    template<class T>
-		    BfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
 		    BfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
+		    {
@@ -1042,4 +1042,4 @@
+		    }
 		    template<class T>
@@ -1050,3 +1050,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -1058,3 +1058,3 @@
 		    template<class T>
-		    BfsWizard<DefDistMapBase<T> > distMap(const T &t)
 		    BfsWizard<DefDistMapBase<T> > distMap(const T &t)
+		    {
@@ -1063,3 +1063,3 @@
+		    }
 		    /// Sets the source node, from which the Bfs algorithm runs.
@@ -1068,3 +1068,3 @@
 		    /// \param s is the source node.
-		    BfsWizard<TR> &source(Node s)
 		    BfsWizard<TR> &source(Node s)
+		    {
@@ -1073,5 +1073,5 @@
+		    }
 		  };
 		  ///Function type interface for Bfs algorithm.
@@ -1102,3 +1102,3 @@
 		  /// \brief Visitor class for bfs.
-		  ///
 		  ///
 		  /// This class defines the interface of the BfsVisit events, and
@@ -1111,3 +1111,3 @@
 		    /// \brief Called when the arc reach a node.
-		    ///
 		    ///
 		    /// It is called when the bfs find an arc which target is not
@@ -1116,9 +1116,9 @@
 		    /// \brief Called when the node reached first time.
-		    ///
 		    ///
 		    /// It is Called when the node reached first time.
 		    void reach(const Node& node) {}
-		    /// \brief Called when the arc examined but target of the arc
 		    /// \brief Called when the arc examined but target of the arc
 		    /// already discovered.
 		    ///
 		    /// It called when the arc examined but the target of the arc
 		    ///
 		    /// It called when the arc examined but the target of the arc
 		    /// already discovered.
@@ -1126,3 +1126,3 @@
 		    /// \brief Called for the source node of the bfs.
-		    ///
 		    ///
 		    /// It is called for the source node of the bfs.
@@ -1130,3 +1130,3 @@
 		    /// \brief Called when the node processed.
-		    ///
 		    ///
 		    /// It is Called when the node processed.
@@ -1149,8 +1149,8 @@
 		      void constraints() {
 			Arc arc;
 			Node node;
 			visitor.discover(arc);
 			visitor.reach(node);
 			visitor.examine(arc);
 			visitor.start(node);
 		        Arc arc;
 		        Node node;
 		        visitor.discover(arc);
 		        visitor.reach(node);
 		        visitor.examine(arc);
 		        visitor.start(node);
 		        visitor.process(node);
@@ -1169,3 +1169,3 @@
-		    /// \brief The digraph type the algorithm runs on.
 		    /// \brief The digraph type the algorithm runs on.
 		    typedef _Digraph Digraph;
@@ -1173,3 +1173,3 @@
 		    /// \brief The type of the map that indicates which nodes are reached.
-		    ///
 		    ///
 		    /// The type of the map that indicates which nodes are reached.
@@ -1181,3 +1181,3 @@
 		    ///
-		    /// This function instantiates a \ref ReachedMap.
 		    /// This function instantiates a \ref ReachedMap.
 		    /// \param digraph is the digraph, to which
@@ -1191,5 +1191,5 @@
 		  /// \ingroup search
-		  ///
 		  ///
 		  /// \brief %BFS Visit algorithm class.
-		  ///
 		  ///
 		  /// This class provides an efficient implementation of the %BFS algorithm
@@ -1199,3 +1199,3 @@
 		  /// class. It works with callback mechanism, the BfsVisit object calls
-		  /// on every bfs event the \c Visitor class member functions.
 		  /// on every bfs event the \c Visitor class member functions.
 		  ///
@@ -1204,3 +1204,3 @@
 		  /// is only passed to \ref BfsDefaultTraits.
-		  /// \tparam _Visitor The Visitor object for the algorithm. The
 		  /// \tparam _Visitor The Visitor object for the algorithm. The
 		  /// \ref BfsVisitor "BfsVisitor<_Digraph>" is an empty Visitor which
@@ -1208,3 +1208,3 @@
 		  /// events you should implement your own Visitor class.
-		  /// \tparam _Traits Traits class to set various data types used by the
 		  /// \tparam _Traits Traits class to set various data types used by the
 		  /// algorithm. The default traits class is
@@ -1217,4 +1217,4 @@
 		  template <typename _Digraph = ListDigraph,
 			    typename _Visitor = BfsVisitor<_Digraph>,
 			    typename _Traits = BfsDefaultTraits<_Digraph> >
 		            typename _Visitor = BfsVisitor<_Digraph>,
 		            typename _Traits = BfsDefaultTraits<_Digraph> >
 		#endif
@@ -1222,3 +1222,3 @@
 		  public:
 		    /// \brief \ref Exception for uninitialized parameters.
@@ -1229,5 +1229,5 @@
 		    public:
-		      virtual const char* what() const throw()
 		      virtual const char* what() const throw()
+		      {
-			return "lemon::BfsVisit::UninitializedParameter";
+		        return "lemon::BfsVisit::UninitializedParameter";
+		      }
@@ -1268,4 +1268,4 @@
 		      if(!_reached) {
 			local_reached = true;
 			_reached = Traits::createReachedMap(*_digraph);
 		        local_reached = true;
 		        _reached = Traits::createReachedMap(*_digraph);
+		      }
@@ -1276,3 +1276,3 @@
 		    BfsVisit() {}
 		  public:
@@ -1288,6 +1288,6 @@
 		      static ReachedMap *createReachedMap(const Digraph &digraph) {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
 		    };
-		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// ReachedMap type
@@ -1297,3 +1297,3 @@
 		    struct DefReachedMap : public BfsVisit< Digraph, Visitor,
-							    DefReachedMapTraits<T> > {
+		                                            DefReachedMapTraits<T> > {
 		      typedef BfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
@@ -1302,4 +1302,4 @@
 		  public:
 		  public:
 		    /// \brief Constructor.
@@ -1311,6 +1311,6 @@
 		    ///
-		    BfsVisit(const Digraph& digraph, Visitor& visitor)
 		    BfsVisit(const Digraph& digraph, Visitor& visitor)
 		      : _digraph(&digraph), _visitor(&visitor),
 			_reached(0), local_reached(false) {}
 		        _reached(0), local_reached(false) {}
 		    /// \brief Destructor.
@@ -1331,4 +1331,4 @@
 		      if(local_reached) {
 			delete _reached;
 			local_reached = false;
 		        delete _reached;
 		        local_reached = false;
+		      }
@@ -1359,6 +1359,6 @@
 		      for (NodeIt u(*_digraph) ; u != INVALID ; ++u) {
-			_reached->set(u, false);
+		        _reached->set(u, false);
+		      }
+		    }
 		    /// \brief Adds a new source node.
@@ -1368,9 +1368,9 @@
 		      if(!(*_reached)[s]) {
 			  _reached->set(s,true);
 			  _visitor->start(s);
-			  _visitor->reach(s);
+		          _reached->set(s,true);
 		          _visitor->start(s);
 		          _visitor->reach(s);
 		          _list[++_list_back] = s;
+			}
+		        }
+		    }
 		    /// \brief Processes the next node.
@@ -1382,3 +1382,3 @@
 		    /// \pre The queue must not be empty!
-		    Node processNextNode() {
 		    Node processNextNode() {
 		      Node n = _list[++_list_front];
@@ -1469,3 +1469,3 @@
 		    /// empty.
-		    Node nextNode() {
 		    Node nextNode() {
 		      return _list_front != _list_back ? _list[_list_front + 1] : INVALID;
@@ -1484,3 +1484,3 @@
 		    int queueSize() { return _list_back - _list_front; }
 		    /// \brief Executes the algorithm.
@@ -1494,3 +1494,3 @@
+		    }
 		    /// \brief Executes the algorithm until \c dest is reached.
@@ -1505,3 +1505,3 @@
+		    }
 		    /// \brief Executes the algorithm until a condition is met.
@@ -1523,3 +1523,3 @@
 		      while ( !emptyQueue() && rnode == INVALID ) {
-			processNextNode(nm, rnode);
+		        processNextNode(nm, rnode);
+		      }
@@ -1544,3 +1544,3 @@
 		    /// \brief Runs %BFSVisit algorithm to visit all nodes in the digraph.
-		    ///
 		    ///
 		    /// This method runs the %BFS algorithm in order to

lemon/bin_heap.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -50,3 +50,3 @@
 		  template <typename _Prio, typename _ItemIntMap,
-			    typename _Compare = std::less<_Prio> >
+		            typename _Compare = std::less<_Prio> >
 		  class BinHeap {
@@ -92,3 +92,3 @@
 		    explicit BinHeap(ItemIntMap &_iim) : iim(_iim) {}
 		    /// \brief The constructor.
@@ -101,3 +101,3 @@
 		    /// \param _comp The comparator function object.
-		    BinHeap(ItemIntMap &_iim, const Compare &_comp)
 		    BinHeap(ItemIntMap &_iim, const Compare &_comp)
 		      : iim(_iim), comp(_comp) {}
@@ -109,3 +109,3 @@
 		    int size() const { return data.size(); }
 		    /// \brief Checks if the heap stores no items.
@@ -116,3 +116,3 @@
 		    /// \brief Make empty this heap.
-		    ///
 		    ///
 		    /// Make empty this heap. It does not change the cross reference map.
@@ -121,4 +121,4 @@
 		    /// each item to \c PRE_HEAP.
 		    void clear() {
 		      data.clear();
 		    void clear() {
 		      data.clear();
+		    }
@@ -136,5 +136,5 @@
 		      while( hole>0 && less(p,data[par]) ) {
 			move(data[par],hole);
 			hole = par;
-			par = parent(hole);
+		        move(data[par],hole);
 		        hole = par;
 		        par = parent(hole);
+		      }
@@ -147,10 +147,10 @@
 		      while(child < length) {
 			if( less(data[child-1], data[child]) ) {
 			  --child;
+			}
 			if( !less(data[child], p) )
 			  goto ok;
 			move(data[child], hole);
 			hole = child;
 			child = second_child(hole);
 		        if( less(data[child-1], data[child]) ) {
 		          --child;
+		        }
 		        if( !less(data[child], p) )
 		          goto ok;
 		        move(data[child], hole);
 		        hole = child;
 		        child = second_child(hole);
+		      }
@@ -158,4 +158,4 @@
 		      if( child<length && less(data[child], p) ) {
 			move(data[child], hole);
 			hole=child;
 		        move(data[child], hole);
 		        hole=child;
+		      }
@@ -183,4 +183,4 @@
 		    /// \brief Insert an item into the heap with the given heap.
 		    ///
 		    /// Adds \c i to the heap with priority \c p.
 		    ///
 		    /// Adds \c i to the heap with priority \c p.
 		    /// \param i The item to insert.
@@ -192,4 +192,4 @@
 		    /// This method returns the item with minimum priority relative to \c
 		    /// Compare.
 		    /// \pre The heap must be nonempty.
 		    /// Compare.
 		    /// \pre The heap must be nonempty.
 		    Item top() const {
@@ -209,4 +209,4 @@
 		    /// This method deletes the item with minimum priority relative to \c
 		    /// Compare from the heap.
 		    /// \pre The heap must be non-empty.
 		    /// Compare from the heap.
 		    /// \pre The heap must be non-empty.
 		    void pop() {
@@ -215,3 +215,3 @@
 		      if (n > 0) {
-			bubble_down(0, data[n], n);
+		        bubble_down(0, data[n], n);
+		      }
@@ -230,5 +230,5 @@
 		      if( h < n ) {
 			if ( bubble_up(h, data[n]) == h) {
 			  bubble_down(h, data[n], n);
+			}
+		        if ( bubble_up(h, data[n]) == h) {
 		          bubble_down(h, data[n], n);
+		        }
+		      }
@@ -237,6 +237,6 @@
 		    /// \brief Returns the priority of \c i.
 		    ///
-		    /// This function returns the priority of item \c i.
 		    /// This function returns the priority of item \c i.
 		    /// \pre \c i must be in the heap.
@@ -248,3 +248,3 @@
-		    /// \brief \c i gets to the heap with priority \c p independently
 		    /// \brief \c i gets to the heap with priority \c p independently
 		    /// if \c i was already there.
@@ -258,9 +258,9 @@
 		      if( idx < 0 ) {
-			push(i,p);
+		        push(i,p);
+		      }
 		      else if( comp(p, data[idx].second) ) {
-			bubble_up(idx, Pair(i,p));
+		        bubble_up(idx, Pair(i,p));
+		      }
 		      else {
-			bubble_down(idx, Pair(i,p), data.size());
+		        bubble_down(idx, Pair(i,p), data.size());
+		      }
@@ -279,6 +279,6 @@
+		    }
 		    /// \brief Increases the priority of \c i to \c p.
 		    ///
-		    /// This method sets the priority of item \c i to \c p.
 		    /// This method sets the priority of item \c i to \c p.
 		    /// \pre \c i must be stored in the heap with priority at most \c
@@ -292,3 +292,3 @@
-		    /// \brief Returns if \c item is in, has already been in, or has
 		    /// \brief Returns if \c item is in, has already been in, or has
 		    /// never been in the heap.
@@ -303,3 +303,3 @@
 		      if( s>=0 )
-			s=0;
+		        s=0;
 		      return State(s);
@@ -313,3 +313,3 @@
 		    /// \param i The item.
-		    /// \param st The state. It should not be \c IN_HEAP.
 		    /// \param st The state. It should not be \c IN_HEAP.
 		    void state(const Item& i, State st) {
@@ -342,3 +342,3 @@
 		  }; // class BinHeap
 		} // namespace lemon

lemon/bits/alteration_notifier.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -34,3 +34,3 @@
 		  ///
-		  /// \brief Notifier class to notify observes about alterations in
 		  /// \brief Notifier class to notify observes about alterations in
 		  /// a container.
@@ -51,3 +51,3 @@
 		  ///
-		  /// This class provides an interface to the container. The \e first() and \e
 		  /// This class provides an interface to the container. The \e first() and \e
 		  /// next() member functions make possible to iterate on the keys of the
@@ -62,3 +62,3 @@
 		  /// graph a new graph is builded then it can be signaled with the
-		  /// clear() and build() members. Important rule that if we erase items
 		  /// clear() and build() members. Important rule that if we erase items
 		  /// from graph we should first signal the alteration and after that erase
@@ -70,3 +70,3 @@
 		  /// overriding the virtual functions defined in the base class.  The
-		  /// observer base can be attached to the notifier with the
 		  /// observer base can be attached to the notifier with the
 		  /// \e attach() member and can be detached with detach() function. The
@@ -81,3 +81,3 @@
 		  /// functions. Thence the \e erase() and \e clear() should not throw
-		  /// exception. Actullay, it can be throw only
 		  /// exception. Actullay, it can be throw only
 		  /// \ref AlterationObserver::ImmediateDetach ImmediateDetach
@@ -87,3 +87,3 @@
 		  /// reliable. If we want to carry out the node degree in the graph
-		  /// as in the \ref InDegMap and we use the reverseEdge that cause
 		  /// as in the \ref InDegMap and we use the reverseEdge that cause
 		  /// unreliable functionality. Because the alteration observing signals
@@ -106,3 +106,3 @@
-		    /// \brief Exception which can be called from \e clear() and
 		    /// \brief Exception which can be called from \e clear() and
 		    /// \e erase().
@@ -129,3 +129,3 @@
 		    /// about the container is built from an empty container or
-		    /// is cleared to an empty container.
 		    /// is cleared to an empty container.
@@ -140,3 +140,3 @@
 		      /// Default constructor for ObserverBase.
-		      ///
 		      ///
 		      ObserverBase() : _notifier(0) {}
@@ -153,9 +153,9 @@
 		      /// Constructor which attach the obserever to the same notifier as
-		      /// the other observer is attached to.
 		      /// the other observer is attached to.
 		      ObserverBase(const ObserverBase& copy) {
-			if (copy.attached()) {
+		        if (copy.attached()) {
 		          attach(*copy.notifier());
+			}
+		        }
+		      }
 		      /// \brief Destructor
@@ -172,5 +172,5 @@
 		      void attach(AlterationNotifier& nf) {
-			nf.attach(*this);
+		        nf.attach(*this);
+		      }
 		      /// \brief Detaches the observer into an AlterationNotifier.
@@ -182,4 +182,4 @@
+		      }
 		      /// \brief Gives back a pointer to the notifier which the map
 		      /// \brief Gives back a pointer to the notifier which the map
 		      /// attached into.
@@ -190,3 +190,3 @@
 		      Notifier* notifier() const { return const_cast<Notifier*>(_notifier); }
 		      /// Gives back true when the observer is attached into a notifier.
@@ -199,3 +199,3 @@
 		    protected:
 		      Notifier* _notifier;
@@ -211,3 +211,3 @@
-		      /// \brief The member function to notificate the observer about
 		      /// \brief The member function to notificate the observer about
 		      /// more item is added to the container.
@@ -224,6 +224,6 @@
 		      /// item is erased from the container. It have to be overrided in
-		      /// the subclasses.
 		      /// the subclasses.
 		      virtual void erase(const Item&) = 0;
-		      /// \brief The member function to notificate the observer about
 		      /// \brief The member function to notificate the observer about
 		      /// more item is erased from the container.
@@ -249,3 +249,3 @@
 		      /// items are erased from the container. It have to be overrided in
-		      /// the subclasses.
 		      /// the subclasses.
 		      virtual void clear() = 0;
@@ -253,3 +253,3 @@
 		    };
 		  protected:
@@ -258,6 +258,6 @@
-		    typedef std::list<ObserverBase*> Observers;
 		    typedef std::list<ObserverBase*> Observers;
 		    Observers _observers;
 		  public:
@@ -266,5 +266,5 @@
 		    ///
-		    /// The default constructor of the AlterationNotifier.
 		    /// The default constructor of the AlterationNotifier.
 		    /// It creates an empty notifier.
-		    AlterationNotifier()
 		    AlterationNotifier()
 		      : container(0) {}
@@ -274,11 +274,11 @@
 		    /// Constructor with the observed container parameter.
-		    AlterationNotifier(const Container& _container)
 		    AlterationNotifier(const Container& _container)
 		      : container(&_container) {}
-		    /// \brief Copy Constructor of the AlterationNotifier.
 		    /// \brief Copy Constructor of the AlterationNotifier.
 		    ///
-		    /// Copy constructor of the AlterationNotifier.
 		    /// Copy constructor of the AlterationNotifier.
 		    /// It creates only an empty notifier because the copiable
 		    /// notifier's observers have to be registered still into that notifier.
-		    AlterationNotifier(const AlterationNotifier& _notifier)
 		    AlterationNotifier(const AlterationNotifier& _notifier)
 		      : container(_notifier.container) {}
@@ -286,3 +286,3 @@
 		    /// \brief Destructor.
-		    ///
 		    ///
 		    /// Destructor of the AlterationNotifier.
@@ -292,3 +292,3 @@
 		      for (it = _observers.begin(); it != _observers.end(); ++it) {
-			(*it)->_notifier = 0;
+		        (*it)->_notifier = 0;
+		      }
@@ -340,3 +340,3 @@
+		    }
 		  protected:
@@ -346,3 +346,3 @@
 		      observer._notifier = this;
+		    }
+		    }
@@ -355,9 +355,9 @@
 		  public:
 		    /// \brief Notifies all the registed observers about an item added to
 		    /// \brief Notifies all the registed observers about an item added to
 		    /// the container.
 		    ///
-		    /// It notifies all the registed observers about an item added to
 		    /// It notifies all the registed observers about an item added to
 		    /// the container.
-		    ///
 		    ///
 		    void add(const Item& item) {
@@ -375,10 +375,10 @@
+		      }
+		    }
+		    }
-		    /// \brief Notifies all the registed observers about more item added to
 		    /// \brief Notifies all the registed observers about more item added to
 		    /// the container.
 		    ///
-		    /// It notifies all the registed observers about more item added to
 		    /// It notifies all the registed observers about more item added to
 		    /// the container.
-		    ///
 		    ///
 		    void add(const std::vector<Item>& items) {
@@ -396,10 +396,10 @@
+		      }
+		    }
+		    }
-		    /// \brief Notifies all the registed observers about an item erased from
 		    /// \brief Notifies all the registed observers about an item erased from
 		    /// the container.
 		    ///
 		    /// It notifies all the registed observers about an item erased from
 		    ///
 		    /// It notifies all the registed observers about an item erased from
 		    /// the container.
-		    ///
 		    ///
 		    void erase(const Item& item) throw() {
@@ -418,8 +418,8 @@
-		    /// \brief Notifies all the registed observers about more item erased
 		    /// \brief Notifies all the registed observers about more item erased
 		    /// from the container.
 		    ///
 		    /// It notifies all the registed observers about more item erased from
 		    ///
 		    /// It notifies all the registed observers about more item erased from
 		    /// the container.
-		    ///
 		    ///
 		    void erase(const std::vector<Item>& items) {
@@ -438,5 +438,5 @@
-		    /// \brief Notifies all the registed observers about the container is
 		    /// \brief Notifies all the registed observers about the container is
 		    /// built.
-		    ///
 		    ///
 		    /// Notifies all the registed observers about the container is built
@@ -458,3 +458,3 @@
-		    /// \brief Notifies all the registed observers about all items are
 		    /// \brief Notifies all the registed observers about all items are
 		    /// erased.

lemon/bits/array_map.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -40,3 +40,3 @@
 		  /// automatically updates the map when a key is added to or erased from
-		  /// the map. This map uses the allocators to implement
 		  /// the map. This map uses the allocators to implement
 		  /// the container functionality.
@@ -46,6 +46,6 @@
 		  template <typename _Graph, typename _Item, typename _Value>
-		  class ArrayMap
 		  class ArrayMap
 		    : public ItemSetTraits<_Graph, _Item>::ItemNotifier::ObserverBase {
 		  public:
-		    /// The graph type of the maps.
 		    /// The graph type of the maps.
 		    typedef _Graph Graph;
@@ -71,3 +71,3 @@
 		    typedef typename Notifier::ObserverBase Parent;
 		  private:
@@ -86,10 +86,10 @@
 		      for (nf->first(it); it != INVALID; nf->next(it)) {
 			int id = nf->id(it);;
 			allocator.construct(&(values[id]), Value());
+		      }
+		        int id = nf->id(it);;
 		        allocator.construct(&(values[id]), Value());
+		      }
+		    }
-		    /// \brief Constructor to use default value to initialize the map.
 		    /// \brief Constructor to use default value to initialize the map.
 		    ///
-		    /// It constructs a map and initialize all of the the map.
 		    /// It constructs a map and initialize all of the the map.
 		    ArrayMap(const Graph& graph, const Value& value) {
@@ -100,5 +100,5 @@
 		      for (nf->first(it); it != INVALID; nf->next(it)) {
 			int id = nf->id(it);;
 			allocator.construct(&(values[id]), value);
+		      }
+		        int id = nf->id(it);;
 		        allocator.construct(&(values[id]), value);
+		      }
+		    }
@@ -107,6 +107,6 @@
 		    ///
-		    /// Constructor to copy a map of the same map type.
 		    /// Constructor to copy a map of the same map type.
 		    ArrayMap(const ArrayMap& copy) : Parent() {
 		      if (copy.attached()) {
-			attach(*copy.notifier());
+		        attach(*copy.notifier());
+		      }
@@ -118,4 +118,4 @@
 		      for (nf->first(it); it != INVALID; nf->next(it)) {
 			int id = nf->id(it);;
 			allocator.construct(&(values[id]), copy.values[id]);
 		        int id = nf->id(it);;
 		        allocator.construct(&(values[id]), copy.values[id]);
+		      }
@@ -126,6 +126,6 @@
 		    /// This operator assigns for each item in the map the
-		    /// value mapped to the same item in the copied map.
 		    /// value mapped to the same item in the copied map.
 		    /// The parameter map should be indiced with the same
 		    /// itemset because this assign operator does not change
-		    /// the container of the map.
 		    /// the container of the map.
 		    ArrayMap& operator=(const ArrayMap& cmap) {
@@ -140,3 +140,3 @@
 		    /// the NodeMap. In this case the value for each item
-		    /// is assigned by the value of the given ReadMap.
 		    /// is assigned by the value of the given ReadMap.
 		    template <typename CMap>
@@ -153,11 +153,11 @@
 		    /// \brief The destructor of the map.
-		    ///
 		    ///
 		    /// The destructor of the map.
-		    virtual ~ArrayMap() {
 		    virtual ~ArrayMap() {
 		      if (attached()) {
 			clear();
 			detach();
 		        clear();
 		        detach();
+		      }
+		    }
 		  protected:
@@ -170,6 +170,6 @@
-		    /// \brief The subscript operator.
 		    /// \brief The subscript operator.
 		    ///
 		    /// The subscript operator. The map can be subscripted by the
-		    /// actual keys of the graph.
 		    /// actual keys of the graph.
 		    Value& operator[](const Key& key) {
@@ -177,4 +177,4 @@
 		      return values[id];
+		    }
+		    }
 		    /// \brief The const subscript operator.
@@ -182,3 +182,3 @@
 		    /// The const subscript operator. The map can be subscripted by the
-		    /// actual keys of the graph.
 		    /// actual keys of the graph.
 		    const Value& operator[](const Key& key) const {
@@ -189,3 +189,3 @@
 		    /// \brief Setter function of the map.
-		    ///
 		    ///
 		    /// Setter function of the map. Equivalent with map[key] = val.
@@ -199,5 +199,5 @@
 		    /// \brief Adds a new key to the map.
-		    ///
 		    ///
 		    /// It adds a new key to the map. It called by the observer notifier
-		    /// and it overrides the add() member function of the observer base.
 		    /// and it overrides the add() member function of the observer base.
 		    virtual void add(const Key& key) {
@@ -206,18 +206,18 @@
 		      if (id >= capacity) {
 			int new_capacity = (capacity == 0 ? 1 : capacity);
 			while (new_capacity <= id) {
 			  new_capacity <<= 1;
+			}
 			Value* new_values = allocator.allocate(new_capacity);
 			Item it;
 			for (nf->first(it); it != INVALID; nf->next(it)) {
 			  int jd = nf->id(it);;
 			  if (id != jd) {
 			    allocator.construct(&(new_values[jd]), values[jd]);
 			    allocator.destroy(&(values[jd]));
+			  }
+			}
 			if (capacity != 0) allocator.deallocate(values, capacity);
 			values = new_values;
 			capacity = new_capacity;
 		        int new_capacity = (capacity == 0 ? 1 : capacity);
 		        while (new_capacity <= id) {
 		          new_capacity <<= 1;
+		        }
 		        Value* new_values = allocator.allocate(new_capacity);
 		        Item it;
 		        for (nf->first(it); it != INVALID; nf->next(it)) {
 		          int jd = nf->id(it);;
 		          if (id != jd) {
 		            allocator.construct(&(new_values[jd]), values[jd]);
 		            allocator.destroy(&(values[jd]));
+		          }
+		        }
 		        if (capacity != 0) allocator.deallocate(values, capacity);
 		        values = new_values;
 		        capacity = new_capacity;
+		      }
@@ -227,5 +227,5 @@
 		    /// \brief Adds more new keys to the map.
-		    ///
 		    ///
 		    /// It adds more new keys to the map. It called by the observer notifier
-		    /// and it overrides the add() member function of the observer base.
 		    /// and it overrides the add() member function of the observer base.
 		    virtual void add(const std::vector<Key>& keys) {
@@ -234,38 +234,38 @@
 		      for (int i = 0; i < int(keys.size()); ++i) {
 			int id = nf->id(keys[i]);
 			if (id > max_id) {
 			  max_id = id;
+			}
 		        int id = nf->id(keys[i]);
 		        if (id > max_id) {
 		          max_id = id;
+		        }
+		      }
 		      if (max_id >= capacity) {
 			int new_capacity = (capacity == 0 ? 1 : capacity);
 			while (new_capacity <= max_id) {
 			  new_capacity <<= 1;
+			}
 			Value* new_values = allocator.allocate(new_capacity);
 			Item it;
 			for (nf->first(it); it != INVALID; nf->next(it)) {
 			  int id = nf->id(it);
 			  bool found = false;
 			  for (int i = 0; i < int(keys.size()); ++i) {
 			    int jd = nf->id(keys[i]);
 			    if (id == jd) {
 			      found = true;
 			      break;
+			    }
+			  }
 			  if (found) continue;
 			  allocator.construct(&(new_values[id]), values[id]);
 			  allocator.destroy(&(values[id]));
+			}
 			if (capacity != 0) allocator.deallocate(values, capacity);
 			values = new_values;
-			capacity = new_capacity;
+		        int new_capacity = (capacity == 0 ? 1 : capacity);
 		        while (new_capacity <= max_id) {
 		          new_capacity <<= 1;
+		        }
 		        Value* new_values = allocator.allocate(new_capacity);
 		        Item it;
 		        for (nf->first(it); it != INVALID; nf->next(it)) {
 		          int id = nf->id(it);
 		          bool found = false;
 		          for (int i = 0; i < int(keys.size()); ++i) {
 		            int jd = nf->id(keys[i]);
 		            if (id == jd) {
 		              found = true;
 		              break;
+		            }
+		          }
 		          if (found) continue;
 		          allocator.construct(&(new_values[id]), values[id]);
 		          allocator.destroy(&(values[id]));
+		        }
 		        if (capacity != 0) allocator.deallocate(values, capacity);
 		        values = new_values;
 		        capacity = new_capacity;
+		      }
 		      for (int i = 0; i < int(keys.size()); ++i) {
 			int id = nf->id(keys[i]);
 			allocator.construct(&(values[id]), Value());
 		        int id = nf->id(keys[i]);
 		        allocator.construct(&(values[id]), Value());
+		      }
+		    }
 		    /// \brief Erase a key from the map.
@@ -273,3 +273,3 @@
 		    /// Erase a key from the map. It called by the observer notifier
-		    /// and it overrides the erase() member function of the observer base.
 		    /// and it overrides the erase() member function of the observer base.
 		    virtual void erase(const Key& key) {
@@ -282,7 +282,7 @@
 		    /// Erase more keys from the map. It called by the observer notifier
-		    /// and it overrides the erase() member function of the observer base.
 		    /// and it overrides the erase() member function of the observer base.
 		    virtual void erase(const std::vector<Key>& keys) {
 		      for (int i = 0; i < int(keys.size()); ++i) {
 			int id = Parent::notifier()->id(keys[i]);
 			allocator.destroy(&(values[id]));
 		        int id = Parent::notifier()->id(keys[i]);
 		        allocator.destroy(&(values[id]));
+		      }
@@ -291,5 +291,5 @@
 		    /// \brief Buildes the map.
-		    ///
 		    ///
 		    /// It buildes the map. It called by the observer notifier
-		    /// and it overrides the build() member function of the observer base.
 		    /// and it overrides the build() member function of the observer base.
 		    virtual void build() {
@@ -299,5 +299,5 @@
 		      for (nf->first(it); it != INVALID; nf->next(it)) {
 			int id = nf->id(it);;
 			allocator.construct(&(values[id]), Value());
+		      }
+		        int id = nf->id(it);;
 		        allocator.construct(&(values[id]), Value());
+		      }
+		    }
@@ -307,13 +307,13 @@
 		    /// It erase all items from the map. It called by the observer notifier
 		    /// and it overrides the clear() member function of the observer base.
 		    virtual void clear() {
 		    /// and it overrides the clear() member function of the observer base.
 		    virtual void clear() {
 		      Notifier* nf = Parent::notifier();
 		      if (capacity != 0) {
 			Item it;
 			for (nf->first(it); it != INVALID; nf->next(it)) {
 			  int id = nf->id(it);
 			  allocator.destroy(&(values[id]));
+			}
 			allocator.deallocate(values, capacity);
-			capacity = 0;
+		        Item it;
 		        for (nf->first(it); it != INVALID; nf->next(it)) {
 		          int id = nf->id(it);
 		          allocator.destroy(&(values[id]));
+		        }
 		        allocator.deallocate(values, capacity);
 		        capacity = 0;
+		      }
@@ -322,3 +322,3 @@
 		  private:
 		    void allocate_memory() {
@@ -326,5 +326,5 @@
 		      if (max_id == -1) {
 			capacity = 0;
 			values = 0;
-			return;
+		        capacity = 0;
 		        values = 0;
 		        return;
+		      }
@@ -332,6 +332,6 @@
 		      while (capacity <= max_id) {
-			capacity <<= 1;
+		        capacity <<= 1;
+		      }
 		      values = allocator.allocate(capacity);
+		    }
 		      values = allocator.allocate(capacity);
+		    }
@@ -341,3 +341,3 @@
-		  };
 		  };
@@ -345,2 +345,2 @@
-		#endif
 		#endif

lemon/bits/base_extender.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -65,10 +65,10 @@
 		      bool operator==(const Arc &that) const {
-			return forward==that.forward && Edge(*this)==Edge(that);
+		        return forward==that.forward && Edge(*this)==Edge(that);
+		      }
 		      bool operator!=(const Arc &that) const {
-			return forward!=that.forward || Edge(*this)!=Edge(that);
+		        return forward!=that.forward || Edge(*this)!=Edge(that);
+		      }
 		      bool operator<(const Arc &that) const {
 			return forward<that.forward ||
 			  (!(that.forward<forward) && Edge(*this)<Edge(that));
 		        return forward<that.forward ||
 		          (!(that.forward<forward) && Edge(*this)<Edge(that));
+		      }
@@ -119,7 +119,7 @@
 		      if( e.forward ) {
-			e.forward = false;
+		        e.forward = false;
+		      }
 		      else {
 			Parent::next(e);
 			e.forward = true;
 		        Parent::next(e);
 		        e.forward = true;
+		      }
@@ -130,7 +130,7 @@
 		      if( Edge(e) != INVALID ) {
-			e.forward = false;
+		        e.forward = false;
+		      }
 		      else {
 			Parent::firstOut(e,n);
 			e.forward = true;
 		        Parent::firstOut(e,n);
 		        e.forward = true;
+		      }
@@ -139,11 +139,11 @@
 		      if( ! e.forward ) {
 			Node n = Parent::target(e);
 			Parent::nextIn(e);
 			if( Edge(e) == INVALID ) {
 			  Parent::firstOut(e, n);
 			  e.forward = true;
+			}
 		        Node n = Parent::target(e);
 		        Parent::nextIn(e);
 		        if( Edge(e) == INVALID ) {
 		          Parent::firstOut(e, n);
 		          e.forward = true;
+		        }
+		      }
 		      else {
-			Parent::nextOut(e);
+		        Parent::nextOut(e);
+		      }
@@ -154,7 +154,7 @@
 		      if( Edge(e) != INVALID ) {
-			e.forward = false;
+		        e.forward = false;
+		      }
 		      else {
 			Parent::firstIn(e,n);
 			e.forward = true;
 		        Parent::firstIn(e,n);
 		        e.forward = true;
+		      }
@@ -163,11 +163,11 @@
 		      if( ! e.forward ) {
 			Node n = Parent::source(e);
 			Parent::nextOut(e);
 			if( Edge(e) == INVALID ) {
 			  Parent::firstIn(e, n);
 			  e.forward = true;
+			}
 		        Node n = Parent::source(e);
 		        Parent::nextOut(e);
 		        if( Edge(e) == INVALID ) {
 		          Parent::firstIn(e, n);
 		          e.forward = true;
+		        }
+		      }
 		      else {
-			Parent::nextIn(e);
+		        Parent::nextIn(e);
+		      }
@@ -185,9 +185,9 @@
 		      if (d) {
 			Node s = Parent::source(e);
 			Parent::nextOut(e);
 			if (e != INVALID) return;
 			d = false;
-			Parent::firstIn(e, s);
+		        Node s = Parent::source(e);
 		        Parent::nextOut(e);
 		        if (e != INVALID) return;
 		        d = false;
 		        Parent::firstIn(e, s);
 		      } else {
-			Parent::nextIn(e);
+		        Parent::nextIn(e);
+		      }
@@ -242,14 +242,14 @@
 		      if (p == INVALID) {
 			Edge arc = Parent::findArc(s, t);
 			if (arc != INVALID) return direct(arc, true);
 			arc = Parent::findArc(t, s);
 			if (arc != INVALID) return direct(arc, false);
 		        Edge arc = Parent::findArc(s, t);
 		        if (arc != INVALID) return direct(arc, true);
 		        arc = Parent::findArc(t, s);
 		        if (arc != INVALID) return direct(arc, false);
 		      } else if (direction(p)) {
 			Edge arc = Parent::findArc(s, t, p);
 			if (arc != INVALID) return direct(arc, true);
 			arc = Parent::findArc(t, s);
 			if (arc != INVALID) return direct(arc, false);
 		        Edge arc = Parent::findArc(s, t, p);
 		        if (arc != INVALID) return direct(arc, true);
 		        arc = Parent::findArc(t, s);
 		        if (arc != INVALID) return direct(arc, false);
 		      } else {
 			Edge arc = Parent::findArc(t, s, p);
 			if (arc != INVALID) return direct(arc, false);
 		        Edge arc = Parent::findArc(t, s, p);
 		        if (arc != INVALID) return direct(arc, false);
+		      }
@@ -269,6 +269,6 @@
 		          arc = Parent::findArc(t, s);
-		          if (arc != INVALID) return arc;
 		          if (arc != INVALID) return arc;
 		        } else {
 		          Edge arc = Parent::findArc(t, s, p);
-		          if (arc != INVALID) return arc;
 		          if (arc != INVALID) return arc;
+		        }
@@ -301,8 +301,8 @@
 		      Red(const Node& node) : Node(node) {
 			LEMON_ASSERT(Parent::red(node) || node == INVALID,
 				     typename Parent::NodeSetError());
 		        LEMON_ASSERT(Parent::red(node) || node == INVALID,
 		                     typename Parent::NodeSetError());
+		      }
 		      Red& operator=(const Node& node) {
 			LEMON_ASSERT(Parent::red(node) || node == INVALID,
 				     typename Parent::NodeSetError());
 		        LEMON_ASSERT(Parent::red(node) || node == INVALID,
 		                     typename Parent::NodeSetError());
 		        Node::operator=(node);
@@ -333,8 +333,8 @@
 		      Blue(const Node& node) : Node(node) {
 			LEMON_ASSERT(Parent::blue(node) || node == INVALID,
 				     typename Parent::NodeSetError());
 		        LEMON_ASSERT(Parent::blue(node) || node == INVALID,
 		                     typename Parent::NodeSetError());
+		      }
 		      Blue& operator=(const Node& node) {
 			LEMON_ASSERT(Parent::blue(node) || node == INVALID,
 				     typename Parent::NodeSetError());
 		        LEMON_ASSERT(Parent::blue(node) || node == INVALID,
 		                     typename Parent::NodeSetError());
 		        Node::operator=(node);
@@ -355,3 +355,3 @@
+		    }
 		    int id(const Blue& node) const {
@@ -369,7 +369,7 @@
 		      if (Parent::red(node)) {
 			Parent::firstFromRed(arc, node);
 			dir = true;
 		        Parent::firstFromRed(arc, node);
 		        dir = true;
 		      } else {
 			Parent::firstFromBlue(arc, node);
 			dir = static_cast<Edge&>(arc) == INVALID;
 		        Parent::firstFromBlue(arc, node);
 		        dir = static_cast<Edge&>(arc) == INVALID;
+		      }
@@ -378,6 +378,6 @@
 		      if (dir) {
-			Parent::nextFromRed(arc);
+		        Parent::nextFromRed(arc);
 		      } else {
 			Parent::nextFromBlue(arc);
 			if (arc == INVALID) dir = true;
 		        Parent::nextFromBlue(arc);
 		        if (arc == INVALID) dir = true;
+		      }
@@ -391,3 +391,3 @@
 		      Arc(const Edge& arc, bool _forward)
-			: Edge(arc), forward(_forward) {}
+		        : Edge(arc), forward(_forward) {}
@@ -397,10 +397,10 @@
 		      bool operator==(const Arc& i) const {
-			return Edge::operator==(i) && forward == i.forward;
+		        return Edge::operator==(i) && forward == i.forward;
+		      }
 		      bool operator!=(const Arc& i) const {
-			return Edge::operator!=(i) || forward != i.forward;
+		        return Edge::operator!=(i) || forward != i.forward;
+		      }
 		      bool operator<(const Arc& i) const {
 			return Edge::operator<(i) ||
 			  (!(i.forward<forward) && Edge(*this)<Edge(i));
 		        return Edge::operator<(i) ||
 		          (!(i.forward<forward) && Edge(*this)<Edge(i));
+		      }
@@ -415,3 +415,3 @@
 		      if (!arc.forward) {
-			Parent::next(static_cast<Edge&>(arc));
+		        Parent::next(static_cast<Edge&>(arc));
+		      }
@@ -422,7 +422,7 @@
 		      if (Parent::red(node)) {
 			Parent::firstFromRed(arc, node);
 			arc.forward = true;
 		        Parent::firstFromRed(arc, node);
 		        arc.forward = true;
 		      } else {
 			Parent::firstFromBlue(arc, node);
 			arc.forward = static_cast<Edge&>(arc) == INVALID;
 		        Parent::firstFromBlue(arc, node);
 		        arc.forward = static_cast<Edge&>(arc) == INVALID;
+		      }
@@ -431,5 +431,5 @@
 		      if (arc.forward) {
-			Parent::nextFromRed(arc);
+		        Parent::nextFromRed(arc);
 		      } else {
-			Parent::nextFromBlue(arc);
+		        Parent::nextFromBlue(arc);
 		        arc.forward = static_cast<Edge&>(arc) == INVALID;
@@ -440,7 +440,7 @@
 		      if (Parent::blue(node)) {
 			Parent::firstFromBlue(arc, node);
 			arc.forward = true;
 		        Parent::firstFromBlue(arc, node);
 		        arc.forward = true;
 		      } else {
 			Parent::firstFromRed(arc, node);
 			arc.forward = static_cast<Edge&>(arc) == INVALID;
 		        Parent::firstFromRed(arc, node);
 		        arc.forward = static_cast<Edge&>(arc) == INVALID;
+		      }
@@ -449,6 +449,6 @@
 		      if (arc.forward) {
-			Parent::nextFromBlue(arc);
+		        Parent::nextFromBlue(arc);
 		      } else {
 			Parent::nextFromRed(arc);
 			arc.forward = static_cast<Edge&>(arc) == INVALID;
 		        Parent::nextFromRed(arc);
 		        arc.forward = static_cast<Edge&>(arc) == INVALID;
+		      }
@@ -464,3 +464,3 @@
 		    int id(const Arc& arc) const {
-		      return (Parent::id(static_cast<const Edge&>(arc)) << 1) +
 		      return (Parent::id(static_cast<const Edge&>(arc)) << 1) +
 		        (arc.forward ? 0 : 1);

lemon/bits/bezier.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -46,3 +46,3 @@
 		  Bezier1(Point _p1, Point _p2) :p1(_p1), p2(_p2) {}
 		  Point operator()(double t) const
@@ -56,3 +56,3 @@
+		  }
 		  Bezier1 after(double t) const
@@ -89,3 +89,3 @@
+		  }
 		  Bezier2 after(double t) const
@@ -112,8 +112,8 @@
 		    : p1(_p1), p2(_p2), p3(_p3), p4(_p4) {}
 		  Bezier3(const Bezier1 &b) : p1(b.p1), p2(conv(b.p1,b.p2,1.0/3.0)),
 					      p3(conv(b.p1,b.p2,2.0/3.0)), p4(b.p2) {}
 		  Bezier3(const Bezier1 &b) : p1(b.p1), p2(conv(b.p1,b.p2,1.0/3.0)),
 		                              p3(conv(b.p1,b.p2,2.0/3.0)), p4(b.p2) {}
 		  Bezier3(const Bezier2 &b) : p1(b.p1), p2(conv(b.p1,b.p2,2.0/3.0)),
 					      p3(conv(b.p2,b.p3,1.0/3.0)), p4(b.p3) {}
-		  Point operator()(double t) const
+		                              p3(conv(b.p2,b.p3,1.0/3.0)), p4(b.p3) {}
 		  Point operator()(double t) const
+		    {
@@ -121,3 +121,3 @@
 		      return ((1-t)*(1-t)*(1-t))*p1+(3*t*(1-t)*(1-t))*p2+
-			(3*t*t*(1-t))*p3+(t*t*t)*p4;
+		        (3*t*t*(1-t))*p3+(t*t*t)*p4;
+		    }
@@ -133,3 +133,3 @@
+		    }
 		  Bezier3 after(double t) const
@@ -148,4 +148,4 @@
 		  Bezier2 norm() const { return Bezier2(3.0*rot90(p2-p1),
 .0*rot90(p3-p2),
 .0*rot90(p4-p3)); }
 .0*rot90(p3-p2),
 .0*rot90(p4-p3)); }
 		  Point grad(double t) const { return grad()(t); }
@@ -154,3 +154,3 @@
 		  template<class R,class F,class S,class D>
-		  R recSplit(F &_f,const S &_s,D _d) const
 		  R recSplit(F &_f,const S &_s,D _d) const
+		  {
@@ -166,3 +166,3 @@
+		  }
 		};

lemon/bits/default_map.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -31,4 +31,4 @@
 		namespace lemon {
 		  //#ifndef LEMON_USE_DEBUG_MAP
@@ -142,3 +142,3 @@
-		// #else
 		// #else
@@ -149,3 +149,3 @@
-		// #endif
 		// #endif
@@ -153,3 +153,3 @@
 		  template <typename _Graph, typename _Item, typename _Value>
-		  class DefaultMap
 		  class DefaultMap
 		    : public DefaultMapSelector<_Graph, _Item, _Value>::Map {
@@ -158,3 +158,3 @@
 		    typedef DefaultMap<_Graph, _Item, _Value> Map;
 		    typedef typename Parent::Graph Graph;
@@ -163,3 +163,3 @@
 		    explicit DefaultMap(const Graph& graph) : Parent(graph) {}
-		    DefaultMap(const Graph& graph, const Value& value)
 		    DefaultMap(const Graph& graph, const Value& value)
 		      : Parent(graph, value) {}

lemon/bits/graph_extender.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -68,7 +68,7 @@
 		      if (node == Parent::source(arc))
-			return Parent::target(arc);
+		        return Parent::target(arc);
 		      else if(node == Parent::target(arc))
-			return Parent::source(arc);
+		        return Parent::source(arc);
 		      else
-			return INVALID;
+		        return INVALID;
+		    }
@@ -91,3 +91,3 @@
+		    }
 		    ArcNotifier& notifier(Arc) const {
@@ -96,3 +96,3 @@
-		    class NodeIt : public Node {
 		    class NodeIt : public Node {
 		      const Digraph* _digraph;
@@ -105,11 +105,11 @@
 		      explicit NodeIt(const Digraph& digraph) : _digraph(&digraph) {
-			_digraph->first(static_cast<Node&>(*this));
+		        _digraph->first(static_cast<Node&>(*this));
+		      }
 		      NodeIt(const Digraph& digraph, const Node& node)
 			: Node(node), _digraph(&digraph) {}
 		      NodeIt(const Digraph& digraph, const Node& node)
 		        : Node(node), _digraph(&digraph) {}
 		      NodeIt& operator++() {
 			_digraph->next(*this);
-			return *this;
+		      NodeIt& operator++() {
 		        _digraph->next(*this);
 		        return *this;
+		      }
@@ -119,3 +119,3 @@
-		    class ArcIt : public Arc {
 		    class ArcIt : public Arc {
 		      const Digraph* _digraph;
@@ -128,11 +128,11 @@
 		      explicit ArcIt(const Digraph& digraph) : _digraph(&digraph) {
-			_digraph->first(static_cast<Arc&>(*this));
+		        _digraph->first(static_cast<Arc&>(*this));
+		      }
 		      ArcIt(const Digraph& digraph, const Arc& arc) :
 			Arc(arc), _digraph(&digraph) { }
 		      ArcIt(const Digraph& digraph, const Arc& arc) :
 		        Arc(arc), _digraph(&digraph) { }
 		      ArcIt& operator++() {
 			_digraph->next(*this);
-			return *this;
+		      ArcIt& operator++() {
 		        _digraph->next(*this);
 		        return *this;
+		      }
@@ -142,3 +142,3 @@
-		    class OutArcIt : public Arc {
 		    class OutArcIt : public Arc {
 		      const Digraph* _digraph;
@@ -150,13 +150,13 @@
 		      OutArcIt(const Digraph& digraph, const Node& node)
 			: _digraph(&digraph) {
-			_digraph->firstOut(*this, node);
+		      OutArcIt(const Digraph& digraph, const Node& node)
 		        : _digraph(&digraph) {
 		        _digraph->firstOut(*this, node);
+		      }
 		      OutArcIt(const Digraph& digraph, const Arc& arc)
 			: Arc(arc), _digraph(&digraph) {}
 		      OutArcIt(const Digraph& digraph, const Arc& arc)
 		        : Arc(arc), _digraph(&digraph) {}
 		      OutArcIt& operator++() {
 			_digraph->nextOut(*this);
-			return *this;
+		      OutArcIt& operator++() {
 		        _digraph->nextOut(*this);
 		        return *this;
+		      }
@@ -166,3 +166,3 @@
-		    class InArcIt : public Arc {
 		    class InArcIt : public Arc {
 		      const Digraph* _digraph;
@@ -174,13 +174,13 @@
 		      InArcIt(const Digraph& digraph, const Node& node)
 			: _digraph(&digraph) {
-			_digraph->firstIn(*this, node);
+		      InArcIt(const Digraph& digraph, const Node& node)
 		        : _digraph(&digraph) {
 		        _digraph->firstIn(*this, node);
+		      }
 		      InArcIt(const Digraph& digraph, const Arc& arc) :
 			Arc(arc), _digraph(&digraph) {}
 		      InArcIt(const Digraph& digraph, const Arc& arc) :
 		        Arc(arc), _digraph(&digraph) {}
 		      InArcIt& operator++() {
 			_digraph->nextIn(*this);
-			return *this;
+		      InArcIt& operator++() {
 		        _digraph->nextIn(*this);
 		        return *this;
+		      }
@@ -217,5 +217,5 @@
 		    template <typename _Value>
-		    class NodeMap
 		    class NodeMap
 		      : public MapExtender<DefaultMap<Digraph, Node, _Value> > {
@@ -225,9 +225,9 @@
 		      explicit NodeMap(const Digraph& digraph)
 			: Parent(digraph) {}
 		      NodeMap(const Digraph& digraph, const _Value& value)
 			: Parent(digraph, value) {}
 		      explicit NodeMap(const Digraph& digraph)
 		        : Parent(digraph) {}
 		      NodeMap(const Digraph& digraph, const _Value& value)
 		        : Parent(digraph, value) {}
 		      NodeMap& operator=(const NodeMap& cmap) {
-			return operator=<NodeMap>(cmap);
+		        return operator=<NodeMap>(cmap);
+		      }
@@ -237,3 +237,3 @@
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
@@ -243,3 +243,3 @@
 		    template <typename _Value>
-		    class ArcMap
 		    class ArcMap
 		      : public MapExtender<DefaultMap<Digraph, Arc, _Value> > {
@@ -249,9 +249,9 @@
 		      explicit ArcMap(const Digraph& digraph)
 			: Parent(digraph) {}
 		      ArcMap(const Digraph& digraph, const _Value& value)
 			: Parent(digraph, value) {}
 		      explicit ArcMap(const Digraph& digraph)
 		        : Parent(digraph) {}
 		      ArcMap(const Digraph& digraph, const _Value& value)
 		        : Parent(digraph, value) {}
 		      ArcMap& operator=(const ArcMap& cmap) {
-			return operator=<ArcMap>(cmap);
+		        return operator=<ArcMap>(cmap);
+		      }
@@ -261,3 +261,3 @@
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
@@ -271,3 +271,3 @@
+		    }
 		    Arc addArc(const Node& from, const Node& to) {
@@ -295,5 +295,5 @@
 		      while (arc != INVALID ) {
 			erase(arc);
 			Parent::firstOut(arc, node);
+		      }
+		        erase(arc);
 		        Parent::firstOut(arc, node);
+		      }
@@ -301,4 +301,4 @@
 		      while (arc != INVALID ) {
 			erase(arc);
 			Parent::firstIn(arc, node);
 		        erase(arc);
 		        Parent::firstIn(arc, node);
+		      }
@@ -308,3 +308,3 @@
+		    }
 		    void erase(const Arc& arc) {
@@ -317,4 +317,4 @@
 		      arc_notifier.setContainer(*this);
+		    }
+		    }
@@ -329,6 +329,6 @@
 		  /// \brief Extender for the Graphs
-		  template <typename Base>
 		  template <typename Base>
 		  class GraphExtender : public Base {
 		  public:
 		    typedef Base Parent;
@@ -342,3 +342,3 @@
-		    // Graph extension
 		    // Graph extension
@@ -370,7 +370,7 @@
 		      if( n == Parent::u(e))
-			return Parent::v(e);
+		        return Parent::v(e);
 		      else if( n == Parent::v(e))
-			return Parent::u(e);
+		        return Parent::u(e);
 		      else
-			return INVALID;
+		        return INVALID;
+		    }
@@ -404,3 +404,3 @@
+		    }
 		    ArcNotifier& notifier(Arc) const {
@@ -415,3 +415,3 @@
-		    class NodeIt : public Node {
 		    class NodeIt : public Node {
 		      const Graph* _graph;
@@ -424,11 +424,11 @@
 		      explicit NodeIt(const Graph& graph) : _graph(&graph) {
-			_graph->first(static_cast<Node&>(*this));
+		        _graph->first(static_cast<Node&>(*this));
+		      }
 		      NodeIt(const Graph& graph, const Node& node)
 			: Node(node), _graph(&graph) {}
 		      NodeIt(const Graph& graph, const Node& node)
 		        : Node(node), _graph(&graph) {}
 		      NodeIt& operator++() {
 			_graph->next(*this);
-			return *this;
+		      NodeIt& operator++() {
 		        _graph->next(*this);
 		        return *this;
+		      }
@@ -438,3 +438,3 @@
-		    class ArcIt : public Arc {
 		    class ArcIt : public Arc {
 		      const Graph* _graph;
@@ -447,11 +447,11 @@
 		      explicit ArcIt(const Graph& graph) : _graph(&graph) {
-			_graph->first(static_cast<Arc&>(*this));
+		        _graph->first(static_cast<Arc&>(*this));
+		      }
 		      ArcIt(const Graph& graph, const Arc& arc) :
 			Arc(arc), _graph(&graph) { }
 		      ArcIt(const Graph& graph, const Arc& arc) :
 		        Arc(arc), _graph(&graph) { }
 		      ArcIt& operator++() {
 			_graph->next(*this);
-			return *this;
+		      ArcIt& operator++() {
 		        _graph->next(*this);
 		        return *this;
+		      }
@@ -461,3 +461,3 @@
-		    class OutArcIt : public Arc {
 		    class OutArcIt : public Arc {
 		      const Graph* _graph;
@@ -469,13 +469,13 @@
 		      OutArcIt(const Graph& graph, const Node& node)
 			: _graph(&graph) {
-			_graph->firstOut(*this, node);
+		      OutArcIt(const Graph& graph, const Node& node)
 		        : _graph(&graph) {
 		        _graph->firstOut(*this, node);
+		      }
 		      OutArcIt(const Graph& graph, const Arc& arc)
 			: Arc(arc), _graph(&graph) {}
 		      OutArcIt(const Graph& graph, const Arc& arc)
 		        : Arc(arc), _graph(&graph) {}
 		      OutArcIt& operator++() {
 			_graph->nextOut(*this);
-			return *this;
+		      OutArcIt& operator++() {
 		        _graph->nextOut(*this);
 		        return *this;
+		      }
@@ -485,3 +485,3 @@
-		    class InArcIt : public Arc {
 		    class InArcIt : public Arc {
 		      const Graph* _graph;
@@ -493,13 +493,13 @@
 		      InArcIt(const Graph& graph, const Node& node)
 			: _graph(&graph) {
-			_graph->firstIn(*this, node);
+		      InArcIt(const Graph& graph, const Node& node)
 		        : _graph(&graph) {
 		        _graph->firstIn(*this, node);
+		      }
 		      InArcIt(const Graph& graph, const Arc& arc) :
 			Arc(arc), _graph(&graph) {}
 		      InArcIt(const Graph& graph, const Arc& arc) :
 		        Arc(arc), _graph(&graph) {}
 		      InArcIt& operator++() {
 			_graph->nextIn(*this);
-			return *this;
+		      InArcIt& operator++() {
 		        _graph->nextIn(*this);
 		        return *this;
+		      }
@@ -509,3 +509,3 @@
-		    class EdgeIt : public Parent::Edge {
 		    class EdgeIt : public Parent::Edge {
 		      const Graph* _graph;
@@ -518,11 +518,11 @@
 		      explicit EdgeIt(const Graph& graph) : _graph(&graph) {
-			_graph->first(static_cast<Edge&>(*this));
+		        _graph->first(static_cast<Edge&>(*this));
+		      }
 		      EdgeIt(const Graph& graph, const Edge& edge) :
 			Edge(edge), _graph(&graph) { }
 		      EdgeIt(const Graph& graph, const Edge& edge) :
 		        Edge(edge), _graph(&graph) { }
 		      EdgeIt& operator++() {
 			_graph->next(*this);
-			return *this;
+		      EdgeIt& operator++() {
 		        _graph->next(*this);
 		        return *this;
+		      }
@@ -542,3 +542,3 @@
 		      IncEdgeIt(const Graph& graph, const Node &node) : _graph(&graph) {
-			_graph->firstInc(*this, _direction, node);
+		        _graph->firstInc(*this, _direction, node);
+		      }
@@ -546,4 +546,4 @@
 		      IncEdgeIt(const Graph& graph, const Edge &edge, const Node &node)
 			: _graph(&graph), Edge(edge) {
 			_direction = (_graph->source(edge) == node);
 		        : _graph(&graph), Edge(edge) {
 		        _direction = (_graph->source(edge) == node);
+		      }
@@ -551,4 +551,4 @@
 		      IncEdgeIt& operator++() {
 			_graph->nextInc(*this, _direction);
 			return *this;
 		        _graph->nextInc(*this, _direction);
 		        return *this;
+		      }
@@ -600,3 +600,3 @@
 		    template <typename _Value>
-		    class NodeMap
 		    class NodeMap
 		      : public MapExtender<DefaultMap<Graph, Node, _Value> > {
@@ -606,9 +606,9 @@
 		      NodeMap(const Graph& graph)
 			: Parent(graph) {}
 		      NodeMap(const Graph& graph, const _Value& value)
 			: Parent(graph, value) {}
 		      NodeMap(const Graph& graph)
 		        : Parent(graph) {}
 		      NodeMap(const Graph& graph, const _Value& value)
 		        : Parent(graph, value) {}
 		      NodeMap& operator=(const NodeMap& cmap) {
-			return operator=<NodeMap>(cmap);
+		        return operator=<NodeMap>(cmap);
+		      }
@@ -618,3 +618,3 @@
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
@@ -624,3 +624,3 @@
 		    template <typename _Value>
-		    class ArcMap
 		    class ArcMap
 		      : public MapExtender<DefaultMap<Graph, Arc, _Value> > {
@@ -630,9 +630,9 @@
 		      ArcMap(const Graph& graph)
 			: Parent(graph) {}
 		      ArcMap(const Graph& graph, const _Value& value)
 			: Parent(graph, value) {}
 		      ArcMap(const Graph& graph)
 		        : Parent(graph) {}
 		      ArcMap(const Graph& graph, const _Value& value)
 		        : Parent(graph, value) {}
 		      ArcMap& operator=(const ArcMap& cmap) {
-			return operator=<ArcMap>(cmap);
+		        return operator=<ArcMap>(cmap);
+		      }
@@ -642,3 +642,3 @@
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
@@ -648,3 +648,3 @@
 		    template <typename _Value>
-		    class EdgeMap
 		    class EdgeMap
 		      : public MapExtender<DefaultMap<Graph, Edge, _Value> > {
@@ -654,10 +654,10 @@
 		      EdgeMap(const Graph& graph)
 			: Parent(graph) {}
 		      EdgeMap(const Graph& graph)
 		        : Parent(graph) {}
 		      EdgeMap(const Graph& graph, const _Value& value)
 			: Parent(graph, value) {}
 		      EdgeMap(const Graph& graph, const _Value& value)
 		        : Parent(graph, value) {}
 		      EdgeMap& operator=(const EdgeMap& cmap) {
-			return operator=<EdgeMap>(cmap);
+		        return operator=<EdgeMap>(cmap);
+		      }
@@ -667,3 +667,3 @@
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
@@ -685,3 +685,3 @@
 		      ev.push_back(Parent::direct(edge, true));
-		      ev.push_back(Parent::direct(edge, false));
 		      ev.push_back(Parent::direct(edge, false));
 		      notifier(Arc()).add(ev);
@@ -689,3 +689,3 @@
+		    }
 		    void clear() {
@@ -698,3 +698,3 @@
 		    template <typename Graph, typename NodeRefMap, typename EdgeRefMap>
-		    void build(const Graph& graph, NodeRefMap& nodeRef,
 		    void build(const Graph& graph, NodeRefMap& nodeRef,
 		               EdgeRefMap& edgeRef) {
@@ -710,5 +710,5 @@
 		      while (arc != INVALID ) {
 			erase(arc);
 			Parent::firstOut(arc, node);
+		      }
+		        erase(arc);
 		        Parent::firstOut(arc, node);
+		      }
@@ -716,4 +716,4 @@
 		      while (arc != INVALID ) {
 			erase(arc);
 			Parent::firstIn(arc, node);
 		        erase(arc);
 		        Parent::firstIn(arc, node);
+		      }
@@ -727,3 +727,3 @@
 		      av.push_back(Parent::direct(edge, true));
-		      av.push_back(Parent::direct(edge, false));
 		      av.push_back(Parent::direct(edge, false));
 		      notifier(Arc()).erase(av);
@@ -734,6 +734,6 @@
 		    GraphExtender() {
-		      node_notifier.setContainer(*this);
 		      node_notifier.setContainer(*this);
 		      arc_notifier.setContainer(*this);
 		      edge_notifier.setContainer(*this);
+		    }
+		    }
@@ -742,4 +742,4 @@
 		      arc_notifier.clear();
 		      node_notifier.clear();
+		    }
 		      node_notifier.clear();
+		    }

lemon/bits/invalid.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -36,3 +36,3 @@
 		  };
 		  /// \brief Invalid iterators.
@@ -54,2 +54,2 @@
 		#endif

lemon/bits/map_extender.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -34,3 +34,3 @@
 		  /// \ingroup graphbits
-		  ///
 		  ///
 		  /// \brief Extender for maps
@@ -58,6 +58,6 @@
-		    MapExtender(const Graph& graph)
 		    MapExtender(const Graph& graph)
 		      : Parent(graph) {}
-		    MapExtender(const Graph& graph, const Value& value)
 		    MapExtender(const Graph& graph, const Value& value)
 		      : Parent(graph, value) {}
@@ -72,3 +72,3 @@
 		      return *this;
+		    }
+		    }
@@ -76,6 +76,6 @@
 		    public:
 		      typedef Item Parent;
 		      typedef typename Map::Value Value;
 		      MapIt() {}
@@ -88,12 +88,12 @@
 		      MapIt(const Map& _map, const Item& item)
 			: Parent(item), map(_map) {}
 		      MapIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
 		      MapIt& operator++() {
 			map.notifier()->next(*this);
-			return *this;
+		      MapIt& operator++() {
 		        map.notifier()->next(*this);
 		        return *this;
+		      }
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
-			return map[*this];
+		        return map[*this];
+		      }
@@ -101,12 +101,12 @@
 		      typename MapTraits<Map>::ReturnValue operator*() {
-			return map[*this];
+		        return map[*this];
+		      }
 		      void set(const Value& value) {
-			map.set(*this, value);
+		        map.set(*this, value);
+		      }
 		    protected:
 		      Map& map;
 		    };
@@ -119,3 +119,3 @@
 		      typedef typename Map::Value Value;
 		      ConstMapIt() {}
@@ -128,8 +128,8 @@
 		      ConstMapIt(const Map& _map, const Item& item)
 			: Parent(item), map(_map) {}
 		      ConstMapIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
 		      ConstMapIt& operator++() {
 			map.notifier()->next(*this);
-			return *this;
+		      ConstMapIt& operator++() {
 		        map.notifier()->next(*this);
 		        return *this;
+		      }
@@ -137,3 +137,3 @@
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
-			return map[*this];
+		        return map[*this];
+		      }
@@ -146,5 +146,5 @@
 		    public:
 		      typedef Item Parent;
 		      ItemIt() {}
@@ -157,8 +157,8 @@
 		      ItemIt(const Map& _map, const Item& item)
 			: Parent(item), map(_map) {}
 		      ItemIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
 		      ItemIt& operator++() {
 			map.notifier()->next(*this);
-			return *this;
+		      ItemIt& operator++() {
 		        map.notifier()->next(*this);
 		        return *this;
+		      }
@@ -167,3 +167,3 @@
 		      const Map& map;
 		    };
@@ -172,3 +172,3 @@
 		  /// \ingroup graphbits
-		  ///
 		  ///
 		  /// \brief Extender for maps which use a subset of the items.
@@ -196,6 +196,6 @@
-		    SubMapExtender(const Graph& _graph)
 		    SubMapExtender(const Graph& _graph)
 		      : Parent(_graph), graph(_graph) {}
-		    SubMapExtender(const Graph& _graph, const Value& _value)
 		    SubMapExtender(const Graph& _graph, const Value& _value)
 		      : Parent(_graph, _value), graph(_graph) {}
@@ -214,3 +214,3 @@
 		      return *this;
+		    }
+		    }
@@ -218,6 +218,6 @@
 		    public:
 		      typedef Item Parent;
 		      typedef typename Map::Value Value;
 		      MapIt() {}
@@ -230,12 +230,12 @@
 		      MapIt(const Map& _map, const Item& item)
 			: Parent(item), map(_map) {}
 		      MapIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
 		      MapIt& operator++() {
 			map.graph.next(*this);
-			return *this;
+		      MapIt& operator++() {
 		        map.graph.next(*this);
 		        return *this;
+		      }
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
-			return map[*this];
+		        return map[*this];
+		      }
@@ -243,12 +243,12 @@
 		      typename MapTraits<Map>::ReturnValue operator*() {
-			return map[*this];
+		        return map[*this];
+		      }
 		      void set(const Value& value) {
-			map.set(*this, value);
+		        map.set(*this, value);
+		      }
 		    protected:
 		      Map& map;
 		    };
@@ -261,3 +261,3 @@
 		      typedef typename Map::Value Value;
 		      ConstMapIt() {}
@@ -270,8 +270,8 @@
 		      ConstMapIt(const Map& _map, const Item& item)
 			: Parent(item), map(_map) {}
 		      ConstMapIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
 		      ConstMapIt& operator++() {
 			map.graph.next(*this);
-			return *this;
+		      ConstMapIt& operator++() {
 		        map.graph.next(*this);
 		        return *this;
+		      }
@@ -279,3 +279,3 @@
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
-			return map[*this];
+		        return map[*this];
+		      }
@@ -288,5 +288,5 @@
 		    public:
 		      typedef Item Parent;
 		      ItemIt() {}
@@ -299,8 +299,8 @@
 		      ItemIt(const Map& _map, const Item& item)
 			: Parent(item), map(_map) {}
 		      ItemIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
 		      ItemIt& operator++() {
 			map.graph.next(*this);
-			return *this;
+		      ItemIt& operator++() {
 		        map.graph.next(*this);
 		        return *this;
+		      }
@@ -309,5 +309,5 @@
 		      const Map& map;
 		    };
 		  private:
@@ -315,3 +315,3 @@
 		    const Graph& graph;
 		  };

lemon/bits/path_dump.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -55,3 +55,3 @@
 		      RevArcIt(Invalid) : path(0), current(INVALID) {}
-		      RevArcIt(const PredMapPath& _path)
 		      RevArcIt(const PredMapPath& _path)
 		        : path(&_path), current(_path.target) {
@@ -70,4 +70,4 @@
 		      bool operator==(const RevArcIt& e) const {
 		        return current == e.current;
 		      bool operator==(const RevArcIt& e) const {
 		        return current == e.current;
+		      }
@@ -75,9 +75,9 @@
 		      bool operator!=(const RevArcIt& e) const {
-		        return current != e.current;
 		        return current != e.current;
+		      }
 		      bool operator<(const RevArcIt& e) const {
 		        return current < e.current;
 		      bool operator<(const RevArcIt& e) const {
 		        return current < e.current;
+		      }
 		    private:
@@ -103,7 +103,7 @@
-		    PredMatrixMapPath(const Digraph& _digraph,
 		    PredMatrixMapPath(const Digraph& _digraph,
 		                      const PredMatrixMap& _predMatrixMap,
-		                      typename Digraph::Node _source,
 		                      typename Digraph::Node _source,
 		                      typename Digraph::Node _target)
-		      : digraph(_digraph), predMatrixMap(_predMatrixMap),
 		      : digraph(_digraph), predMatrixMap(_predMatrixMap),
 		        source(_source), target(_target) {}
@@ -129,5 +129,5 @@
 		      RevArcIt(Invalid) : path(0), current(INVALID) {}
-		      RevArcIt(const PredMatrixMapPath& _path)
 		      RevArcIt(const PredMatrixMapPath& _path)
 		        : path(&_path), current(_path.target) {
-		        if (path->predMatrixMap(path->source, current) == INVALID)
 		        if (path->predMatrixMap(path->source, current) == INVALID)
 		          current = INVALID;
@@ -140,5 +140,5 @@
 		      RevArcIt& operator++() {
-		        current =
 		        current =
 		          path->digraph.source(path->predMatrixMap(path->source, current));
-		        if (path->predMatrixMap(path->source, current) == INVALID)
 		        if (path->predMatrixMap(path->source, current) == INVALID)
 		          current = INVALID;
@@ -147,4 +147,4 @@
 		      bool operator==(const RevArcIt& e) const {
 		        return current == e.current;
 		      bool operator==(const RevArcIt& e) const {
 		        return current == e.current;
+		      }
@@ -152,9 +152,9 @@
 		      bool operator!=(const RevArcIt& e) const {
-		        return current != e.current;
 		        return current != e.current;
+		      }
 		      bool operator<(const RevArcIt& e) const {
 		        return current < e.current;
 		      bool operator<(const RevArcIt& e) const {
 		        return current < e.current;
+		      }
 		    private:

lemon/bits/traits.h

Show inline comments

 		/* -*- C++ -*-
 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -31,3 +30,3 @@
 		  class ItemSetTraits {};
@@ -39,5 +38,5 @@
 		  struct NodeNotifierIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::NodeNotifier::Notifier, void>::type
-		  > {
 		  > {
 		    typedef typename Graph::NodeNotifier Type;
@@ -48,3 +47,3 @@
 		  public:
 		    typedef _Graph Graph;
@@ -59,4 +58,4 @@
 		    public:
 		      typedef typename Graph::template NodeMap<_Value> Parent;
 		      typedef typename Graph::template NodeMap<_Value> Type;
 		      typedef typename Graph::template NodeMap<_Value> Parent;
 		      typedef typename Graph::template NodeMap<_Value> Type;
 		      typedef typename Parent::Value Value;
@@ -64,4 +63,4 @@
 		      Map(const Graph& _digraph) : Parent(_digraph) {}
 		      Map(const Graph& _digraph, const Value& _value)
 			: Parent(_digraph, _value) {}
 		      Map(const Graph& _digraph, const Value& _value)
 		        : Parent(_digraph, _value) {}
@@ -77,5 +76,5 @@
 		  struct ArcNotifierIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::ArcNotifier::Notifier, void>::type
-		  > {
 		  > {
 		    typedef typename Graph::ArcNotifier Type;
@@ -86,3 +85,3 @@
 		  public:
 		    typedef _Graph Graph;
@@ -97,4 +96,4 @@
 		    public:
 		      typedef typename Graph::template ArcMap<_Value> Parent;
 		      typedef typename Graph::template ArcMap<_Value> Type;
 		      typedef typename Graph::template ArcMap<_Value> Parent;
 		      typedef typename Graph::template ArcMap<_Value> Type;
 		      typedef typename Parent::Value Value;
@@ -102,4 +101,4 @@
 		      Map(const Graph& _digraph) : Parent(_digraph) {}
 		      Map(const Graph& _digraph, const Value& _value)
 			: Parent(_digraph, _value) {}
 		      Map(const Graph& _digraph, const Value& _value)
 		        : Parent(_digraph, _value) {}
 		    };
@@ -114,5 +113,5 @@
 		  struct EdgeNotifierIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::EdgeNotifier::Notifier, void>::type
-		  > {
 		  > {
 		    typedef typename Graph::EdgeNotifier Type;
@@ -123,3 +122,3 @@
 		  public:
 		    typedef _Graph Graph;
@@ -134,4 +133,4 @@
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      typedef typename Graph::template EdgeMap<_Value> Type;
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      typedef typename Graph::template EdgeMap<_Value> Type;
 		      typedef typename Parent::Value Value;
@@ -139,4 +138,4 @@
 		      Map(const Graph& _digraph) : Parent(_digraph) {}
 		      Map(const Graph& _digraph, const Value& _value)
 			: Parent(_digraph, _value) {}
 		      Map(const Graph& _digraph, const Value& _value)
 		        : Parent(_digraph, _value) {}
 		    };
@@ -158,6 +157,6 @@
 		  struct MapTraits<
-		    Map, typename enable_if<typename Map::ReferenceMapTag, void>::type >
 		    Map, typename enable_if<typename Map::ReferenceMapTag, void>::type >
+		  {
 		    typedef True ReferenceMapTag;
 		    typedef typename Map::Key Key;
@@ -168,3 +167,3 @@
-		    typedef typename Map::ConstReference ConstReference;
 		    typedef typename Map::ConstReference ConstReference;
 		    typedef typename Map::Reference Reference;
@@ -186,7 +185,7 @@
 		  struct MatrixMapTraits<
 		    MatrixMap, typename enable_if<typename MatrixMap::ReferenceMapTag,
 		                                  void>::type >
 		    MatrixMap, typename enable_if<typename MatrixMap::ReferenceMapTag,
 		                                  void>::type >
+		  {
 		    typedef True ReferenceMapTag;
 		    typedef typename MatrixMap::FirstKey FirstKey;
@@ -198,3 +197,3 @@
-		    typedef typename MatrixMap::ConstReference ConstReference;
 		    typedef typename MatrixMap::ConstReference ConstReference;
 		    typedef typename MatrixMap::Reference Reference;
@@ -211,3 +210,3 @@
 		  struct NodeNumTagIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::NodeNumTag, void>::type
@@ -224,3 +223,3 @@
 		  struct EdgeNumTagIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::EdgeNumTag, void>::type
@@ -237,3 +236,3 @@
 		  struct FindEdgeTagIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::FindEdgeTag, void>::type
@@ -250,3 +249,3 @@
 		  struct UndirectedTagIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::UndirectedTag, void>::type
@@ -263,3 +262,3 @@
 		  struct BuildTagIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::BuildTag, void>::type

lemon/bits/utility.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -85,3 +85,3 @@
 		  /**************** enable_if from BOOST ****************/
 		  template <typename Type, typename T = void>
@@ -91,3 +91,3 @@
 		  template <bool B, class T = void>
@@ -100,3 +100,3 @@
-		  template <class Cond, class T = void>
 		  template <class Cond, class T = void>
 		  struct enable_if : public enable_if_c<Cond::value, T> {};
@@ -111,3 +111,3 @@
-		  template <class Cond, class T>
 		  template <class Cond, class T>
 		  struct lazy_enable_if : public lazy_enable_if_c<Cond::value, T> {};
@@ -123,3 +123,3 @@
-		  template <class Cond, class T = void>
 		  template <class Cond, class T = void>
 		  struct disable_if : public disable_if_c<Cond::value, T> {};
@@ -134,3 +134,3 @@
-		  template <class Cond, class T>
 		  template <class Cond, class T>
 		  struct lazy_disable_if : public lazy_disable_if_c<Cond::value, T> {};

lemon/bits/vector_map.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -51,8 +51,8 @@
 		  template <typename _Graph, typename _Item, typename _Value>
-		  class VectorMap
 		  class VectorMap
 		    : public ItemSetTraits<_Graph, _Item>::ItemNotifier::ObserverBase {
 		  private:
 		    /// The container type of the map.
-		    typedef std::vector<_Value> Container;
 		    typedef std::vector<_Value> Container;
@@ -60,3 +60,3 @@
-		    /// The graph type of the map.
 		    /// The graph type of the map.
 		    typedef _Graph Graph;
@@ -95,5 +95,5 @@
-		    /// \brief Constructor uses given value to initialize the map.
 		    /// \brief Constructor uses given value to initialize the map.
 		    ///
-		    /// It constructs a map uses a given value to initialize the map.
 		    /// It constructs a map uses a given value to initialize the map.
 		    /// It adds all the items of the graph to the map.
@@ -109,4 +109,4 @@
 		      if (_copy.attached()) {
 			Parent::attach(*_copy.notifier());
 			container = _copy.container;
 		        Parent::attach(*_copy.notifier());
 		        container = _copy.container;
+		      }
@@ -117,6 +117,6 @@
 		    /// This operator assigns for each item in the map the
-		    /// value mapped to the same item in the copied map.
 		    /// value mapped to the same item in the copied map.
 		    /// The parameter map should be indiced with the same
 		    /// itemset because this assign operator does not change
-		    /// the container of the map.
 		    /// the container of the map.
 		    VectorMap& operator=(const VectorMap& cmap) {
@@ -131,3 +131,3 @@
 		    /// the NodeMap. In this case the value for each item
-		    /// is assigned by the value of the given ReadMap.
 		    /// is assigned by the value of the given ReadMap.
 		    template <typename CMap>
@@ -142,3 +142,3 @@
+		    }
 		  public:
@@ -148,7 +148,7 @@
 		    /// The subscript operator. The map can be subscripted by the
-		    /// actual items of the graph.
 		    /// actual items of the graph.
 		    Reference operator[](const Key& key) {
 		      return container[Parent::notifier()->id(key)];
+		    }
+		    }
 		    /// \brief The const subcript operator.
@@ -156,3 +156,3 @@
 		    /// The const subscript operator. The map can be subscripted by the
-		    /// actual items of the graph.
 		    /// actual items of the graph.
 		    ConstReference operator[](const Key& key) const {
@@ -172,5 +172,5 @@
 		    /// \brief Adds a new key to the map.
-		    ///
 		    ///
 		    /// It adds a new key to the map. It called by the observer notifier
-		    /// and it overrides the add() member function of the observer base.
 		    /// and it overrides the add() member function of the observer base.
 		    virtual void add(const Key& key) {
@@ -178,3 +178,3 @@
 		      if (id >= int(container.size())) {
-			container.resize(id + 1);
+		        container.resize(id + 1);
+		      }
@@ -183,5 +183,5 @@
 		    /// \brief Adds more new keys to the map.
-		    ///
 		    ///
 		    /// It adds more new keys to the map. It called by the observer notifier
-		    /// and it overrides the add() member function of the observer base.
 		    /// and it overrides the add() member function of the observer base.
 		    virtual void add(const std::vector<Key>& keys) {
@@ -200,3 +200,3 @@
 		    /// Erase a key from the map. It called by the observer notifier
-		    /// and it overrides the erase() member function of the observer base.
 		    /// and it overrides the erase() member function of the observer base.
 		    virtual void erase(const Key& key) {
@@ -208,14 +208,14 @@
 		    /// Erase more keys from the map. It called by the observer notifier
-		    /// and it overrides the erase() member function of the observer base.
 		    /// and it overrides the erase() member function of the observer base.
 		    virtual void erase(const std::vector<Key>& keys) {
 		      for (int i = 0; i < int(keys.size()); ++i) {
-			container[Parent::notifier()->id(keys[i])] = Value();
+		        container[Parent::notifier()->id(keys[i])] = Value();
+		      }
+		    }
 		    /// \brief Buildes the map.
-		    ///
 		    ///
 		    /// It buildes the map. It called by the observer notifier
 		    /// and it overrides the build() member function of the observer base.
-		    virtual void build() {
 		    virtual void build() {
 		      int size = Parent::notifier()->maxId() + 1;
@@ -228,9 +228,9 @@
 		    /// It erase all items from the map. It called by the observer notifier
 		    /// and it overrides the clear() member function of the observer base.
 		    virtual void clear() {
 		    /// and it overrides the clear() member function of the observer base.
 		    virtual void clear() {
 		      container.clear();
+		    }
 		  private:
 		    Container container;

lemon/color.cc

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -26,3 +26,3 @@
 		  const Color WHITE(1,1,1);
 		  const Color BLACK(0,0,0);
@@ -42,3 +42,3 @@
 		  const Color DARK_CYAN(0,.5,.5);
 		} //namespace lemon

lemon/color.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -64,3 +64,3 @@
 		  /// White color constant
-		  extern const Color WHITE;
 		  extern const Color WHITE;
 		  /// Black color constant
@@ -132,3 +132,3 @@
 		        colors.push_back(Color(0,1,1));
 		        colors.push_back(Color(.5,0,0));
@@ -139,3 +139,3 @@
 		        colors.push_back(Color(0,.5,.5));
 		        colors.push_back(Color(.5,.5,.5));
@@ -147,3 +147,3 @@
 		        colors.push_back(Color(.5,1,1));
 		        colors.push_back(Color(1,.5,0));
@@ -173,3 +173,3 @@
 		    ///Adds a new color to the end of the color list.
-		    void add(const Color &c)
 		    void add(const Color &c)
+		    {
@@ -188,3 +188,3 @@
 		  ///as it is possible.
-		  inline Color distantColor(const Color &c)
 		  inline Color distantColor(const Color &c)
+		  {

lemon/concept_check.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -38,3 +38,3 @@
 		///
-		///\todo Are we still using BOOST concept checking utility?
 		///\todo Are we still using BOOST concept checking utility?
 		///Is the BOOST copyright notice necessary?

lemon/concepts/digraph.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -48,3 +48,3 @@
 		      ///Digraphs are \e not copy constructible. Use DigraphCopy() instead.
 		      ///Digraphs are \e not copy constructible. Use DigraphCopy() instead.
@@ -54,3 +54,3 @@
 		      ///\e not allowed. Use DigraphCopy() instead.
 		      ///Assignment of \ref Digraph "Digraph"s to another ones are
@@ -97,3 +97,3 @@
 		        /// Inequality operator
 		        /// \sa operator==(Node n)
@@ -102,14 +102,14 @@
 			/// Artificial ordering operator.
 			/// To allow the use of digraph descriptors as key type in std::map or
 			/// similar associative container we require this.
 			///
 			/// \note This operator only have to define some strict ordering of
 			/// the items; this order has nothing to do with the iteration
 			/// ordering of the items.
-			bool operator<(Node) const { return false; }
+		        /// Artificial ordering operator.
 		        /// To allow the use of digraph descriptors as key type in std::map or
 		        /// similar associative container we require this.
 		        ///
 		        /// \note This operator only have to define some strict ordering of
 		        /// the items; this order has nothing to do with the iteration
 		        /// ordering of the items.
 		        bool operator<(Node) const { return false; }
 		      };
 		      /// This iterator goes through each node.
@@ -131,3 +131,3 @@
 		        /// Copy constructor.
 		        /// Copy constructor.
@@ -147,5 +147,5 @@
 		        /// Sets the iterator to the node of \c the digraph pointed by
 			/// the trivial iterator.
-		        /// This feature necessitates that each time we
+		        /// Sets the iterator to the node of \c the digraph pointed by
 		        /// the trivial iterator.
 		        /// This feature necessitates that each time we
 		        /// iterate the arc-set, the iteration order is the same.
@@ -158,4 +158,4 @@
 		      };
 		      /// Class for identifying an arc of the digraph
@@ -193,13 +193,13 @@
 			/// Artificial ordering operator.
 			/// To allow the use of digraph descriptors as key type in std::map or
 			/// similar associative container we require this.
 			///
 			/// \note This operator only have to define some strict ordering of
 			/// the items; this order has nothing to do with the iteration
 			/// ordering of the items.
-			bool operator<(Arc) const { return false; }
+		        /// Artificial ordering operator.
 		        /// To allow the use of digraph descriptors as key type in std::map or
 		        /// similar associative container we require this.
 		        ///
 		        /// \note This operator only have to define some strict ordering of
 		        /// the items; this order has nothing to do with the iteration
 		        /// ordering of the items.
 		        bool operator<(Arc) const { return false; }
 		      };
 		      /// This iterator goes trough the outgoing arcs of a node.
@@ -215,3 +215,3 @@
 		      ///\endcode
 		      class OutArcIt : public Arc {
@@ -234,3 +234,3 @@
 		        /// This constructor sets the iterator to the first outgoing arc.
 		        /// This constructor sets the iterator to the first outgoing arc of
@@ -241,3 +241,3 @@
 		        /// Sets the iterator to the value of the trivial iterator.
-			/// This feature necessitates that each time we
+		        /// This feature necessitates that each time we
 		        /// iterate the arc-set, the iteration order is the same.
@@ -245,4 +245,4 @@
 		        ///Next outgoing arc
 		        /// Assign the iterator to the next
 		        /// Assign the iterator to the next
 		        /// outgoing arc of the corresponding node.
@@ -281,3 +281,3 @@
 		        /// This constructor sets the iterator to first incoming arc.
 		        /// This constructor set the iterator to the first incoming arc of
@@ -288,3 +288,3 @@
 		        /// Sets the iterator to the value of the trivial iterator \c e.
-		        /// This feature necessitates that each time we
 		        /// This feature necessitates that each time we
 		        /// iterate the arc-set, the iteration order is the same.
@@ -324,3 +324,3 @@
 		        /// This constructor sets the iterator to the first arc.
 		        /// This constructor sets the iterator to the first arc of \c g.
@@ -331,7 +331,7 @@
 		        /// Sets the iterator to the value of the trivial iterator \c e.
-		        /// This feature necessitates that each time we
 		        /// This feature necessitates that each time we
 		        /// iterate the arc-set, the iteration order is the same.
-		        ArcIt(const Digraph&, const Arc&) { }
 		        ArcIt(const Digraph&, const Arc&) { }
 		        ///Next arc
 		        /// Assign the iterator to the next arc.
@@ -351,6 +351,6 @@
 		      /// \brief Returns the ID of the node.
-		      int id(Node) const { return -1; }
 		      int id(Node) const { return -1; }
 		      /// \brief Returns the ID of the arc.
-		      int id(Arc) const { return -1; }
 		      int id(Arc) const { return -1; }
@@ -359,3 +359,3 @@
 		      /// \pre The argument should be a valid node ID in the graph.
-		      Node nodeFromId(int) const { return INVALID; }
 		      Node nodeFromId(int) const { return INVALID; }
@@ -364,9 +364,9 @@
 		      /// \pre The argument should be a valid arc ID in the graph.
-		      Arc arcFromId(int) const { return INVALID; }
 		      Arc arcFromId(int) const { return INVALID; }
 		      /// \brief Returns an upper bound on the node IDs.
-		      int maxNodeId() const { return -1; }
 		      int maxNodeId() const { return -1; }
 		      /// \brief Returns an upper bound on the arc IDs.
-		      int maxArcId() const { return -1; }
 		      int maxArcId() const { return -1; }
@@ -391,5 +391,5 @@
 		      // Dummy parameter.
-		      int maxId(Node) const { return -1; }
 		      int maxId(Node) const { return -1; }
 		      // Dummy parameter.
-		      int maxId(Arc) const { return -1; }
 		      int maxId(Arc) const { return -1; }
@@ -425,6 +425,6 @@
 		      /// \brief Read write map of the nodes to type \c T.
-		      ///
 		      ///
 		      /// ReadWrite map of the nodes to type \c T.
 		      /// \sa Reference
-		      template<class T>
 		      template<class T>
 		      class NodeMap : public ReadWriteMap< Node, T > {
@@ -441,5 +441,5 @@
 		        template <typename CMap>
-		        NodeMap& operator=(const CMap&) {
 		        NodeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Node, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
@@ -451,3 +451,3 @@
 		      /// \sa Reference
-		      template<class T>
 		      template<class T>
 		      class ArcMap : public ReadWriteMap<Arc,T> {
@@ -463,5 +463,5 @@
 		        template <typename CMap>
-		        ArcMap& operator=(const CMap&) {
 		        ArcMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Arc, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
@@ -473,3 +473,3 @@
 		          checkConcept<IterableDigraphComponent<>, _Digraph>();
-			  checkConcept<IDableDigraphComponent<>, _Digraph>();
+		          checkConcept<IDableDigraphComponent<>, _Digraph>();
 		          checkConcept<MappableDigraphComponent<>, _Digraph>();
@@ -479,4 +479,4 @@
 		    };
 		  } //namespace concepts
 		  } //namespace concepts
 		} //namespace lemon

lemon/concepts/graph.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -67,3 +67,3 @@
 		    /// as the OutArcIt and InArcIt but it is not convertible to Arc just
-		    /// to Edge.
 		    /// to Edge.
 		    class Graph {
@@ -74,7 +74,7 @@
 		      /// The undirected graph should be tagged by the UndirectedTag. This
 		      /// tag helps the enable_if technics to make compile time
 		      /// specializations for undirected graphs.
 		      /// tag helps the enable_if technics to make compile time
 		      /// specializations for undirected graphs.
 		      typedef True UndirectedTag;
-		      /// \brief The base type of node iterators,
 		      /// \brief The base type of node iterators,
 		      /// or in other words, the trivial node iterator.
@@ -83,3 +83,3 @@
 		      /// thus each kind of node iterator converts to this.
-		      /// More precisely each kind of node iterator should be inherited
 		      /// More precisely each kind of node iterator should be inherited
 		      /// from the trivial node iterator.
@@ -110,3 +110,3 @@
 		        /// Inequality operator
 		        /// \sa operator==(Node n)
@@ -115,14 +115,14 @@
 			/// Artificial ordering operator.
 			/// To allow the use of graph descriptors as key type in std::map or
 			/// similar associative container we require this.
 			///
 			/// \note This operator only have to define some strict ordering of
 			/// the items; this order has nothing to do with the iteration
 			/// ordering of the items.
-			bool operator<(Node) const { return false; }
+		        /// Artificial ordering operator.
 		        /// To allow the use of graph descriptors as key type in std::map or
 		        /// similar associative container we require this.
 		        ///
 		        /// \note This operator only have to define some strict ordering of
 		        /// the items; this order has nothing to do with the iteration
 		        /// ordering of the items.
 		        bool operator<(Node) const { return false; }
 		      };
 		      /// This iterator goes through each node.
@@ -144,3 +144,3 @@
 		        /// Copy constructor.
 		        /// Copy constructor.
@@ -160,5 +160,5 @@
 		        /// Sets the iterator to the node of \c the graph pointed by
 			/// the trivial iterator.
-		        /// This feature necessitates that each time we
+		        /// Sets the iterator to the node of \c the graph pointed by
 		        /// the trivial iterator.
 		        /// This feature necessitates that each time we
 		        /// iterate the arc-set, the iteration order is the same.
@@ -171,4 +171,4 @@
 		      };
 		      /// The base type of the edge iterators.
@@ -205,11 +205,11 @@
 			/// Artificial ordering operator.
 			/// To allow the use of graph descriptors as key type in std::map or
 			/// similar associative container we require this.
 			///
 			/// \note This operator only have to define some strict ordering of
 			/// the items; this order has nothing to do with the iteration
 			/// ordering of the items.
-			bool operator<(Edge) const { return false; }
+		        /// Artificial ordering operator.
 		        /// To allow the use of graph descriptors as key type in std::map or
 		        /// similar associative container we require this.
 		        ///
 		        /// \note This operator only have to define some strict ordering of
 		        /// the items; this order has nothing to do with the iteration
 		        /// ordering of the items.
 		        bool operator<(Edge) const { return false; }
 		      };
@@ -243,3 +243,3 @@
 		        /// This constructor sets the iterator to the first edge.
 		        /// This constructor sets the iterator to the first edge.
@@ -250,7 +250,7 @@
 		        /// This feature necessitates that each time we
 		        /// iterate the edge-set, the iteration order is the
 			/// same.
-		        EdgeIt(const Graph&, const Edge&) { }
+		        /// iterate the edge-set, the iteration order is the
 		        /// same.
 		        EdgeIt(const Graph&, const Edge&) { }
 		        /// Next edge
 		        /// Assign the iterator to the next edge.
@@ -259,3 +259,3 @@
-		      /// \brief This iterator goes trough the incident undirected
 		      /// \brief This iterator goes trough the incident undirected
 		      /// arcs of a node.
@@ -263,8 +263,8 @@
 		      /// This iterator goes trough the incident edges
-		      /// of a certain node of a graph. You should assume that the
 		      /// of a certain node of a graph. You should assume that the
 		      /// loop arcs will be iterated twice.
-		      ///
 		      ///
 		      /// Its usage is quite simple, for example you can compute the
 		      /// degree (i.e. count the number of incident arcs of a node \c n
-		      /// in graph \c g of type \c Graph as follows.
 		      /// in graph \c g of type \c Graph as follows.
 		      ///
@@ -292,3 +292,3 @@
 		        /// This constructor sets the iterator to first incident arc.
 		        /// This constructor set the iterator to the first incident arc of
@@ -299,3 +299,3 @@
 		        /// Sets the iterator to the value of the trivial iterator \c e.
-		        /// This feature necessitates that each time we
 		        /// This feature necessitates that each time we
 		        /// iterate the arc-set, the iteration order is the same.
@@ -305,3 +305,3 @@
 		        /// Assign the iterator to the next incident arc
-			/// of the corresponding node.
+		        /// of the corresponding node.
 		        IncEdgeIt& operator++() { return *this; }
@@ -342,13 +342,13 @@
 			/// Artificial ordering operator.
 			/// To allow the use of graph descriptors as key type in std::map or
 			/// similar associative container we require this.
 			///
 			/// \note This operator only have to define some strict ordering of
 			/// the items; this order has nothing to do with the iteration
 			/// ordering of the items.
 			bool operator<(Arc) const { return false; }
-		      };
+		        /// Artificial ordering operator.
 		        /// To allow the use of graph descriptors as key type in std::map or
 		        /// similar associative container we require this.
 		        ///
 		        /// \note This operator only have to define some strict ordering of
 		        /// the items; this order has nothing to do with the iteration
 		        /// ordering of the items.
 		        bool operator<(Arc) const { return false; }
 		      };
 		      /// This iterator goes through each directed arc.
@@ -380,3 +380,3 @@
 		        /// This constructor sets the iterator to the first arc.
 		        /// This constructor sets the iterator to the first arc of \c g.
@@ -387,7 +387,7 @@
 		        /// Sets the iterator to the value of the trivial iterator \c e.
-		        /// This feature necessitates that each time we
 		        /// This feature necessitates that each time we
 		        /// iterate the arc-set, the iteration order is the same.
-		        ArcIt(const Graph&, const Arc&) { }
 		        ArcIt(const Graph&, const Arc&) { }
 		        ///Next arc
 		        /// Assign the iterator to the next arc.
@@ -395,3 +395,3 @@
 		      };
 		      /// This iterator goes trough the outgoing directed arcs of a node.
@@ -407,3 +407,3 @@
 		      ///\endcode
 		      class OutArcIt : public Arc {
@@ -426,3 +426,3 @@
 		        /// This constructor sets the iterator to the first outgoing arc.
 		        /// This constructor sets the iterator to the first outgoing arc of
@@ -432,5 +432,5 @@
 		        OutArcIt(const Graph& n, const Node& g) {
 			  ignore_unused_variable_warning(n);
 			  ignore_unused_variable_warning(g);
+			}
+		          ignore_unused_variable_warning(n);
 		          ignore_unused_variable_warning(g);
+		        }
 		        /// Arc -> OutArcIt conversion
@@ -438,3 +438,3 @@
 		        /// Sets the iterator to the value of the trivial iterator.
-			/// This feature necessitates that each time we
+		        /// This feature necessitates that each time we
 		        /// iterate the arc-set, the iteration order is the same.
@@ -442,4 +442,4 @@
 		        ///Next outgoing arc
 		        /// Assign the iterator to the next
 		        /// Assign the iterator to the next
 		        /// outgoing arc of the corresponding node.
@@ -478,3 +478,3 @@
 		        /// This constructor sets the iterator to first incoming arc.
 		        /// This constructor set the iterator to the first incoming arc of
@@ -483,6 +483,6 @@
 		        ///@param g the graph
 		        InArcIt(const Graph& g, const Node& n) {
 			  ignore_unused_variable_warning(n);
 			  ignore_unused_variable_warning(g);
+			}
 		        InArcIt(const Graph& g, const Node& n) {
 		          ignore_unused_variable_warning(n);
 		          ignore_unused_variable_warning(g);
+		        }
 		        /// Arc -> InArcIt conversion
@@ -490,3 +490,3 @@
 		        /// Sets the iterator to the value of the trivial iterator \c e.
-		        /// This feature necessitates that each time we
 		        /// This feature necessitates that each time we
 		        /// iterate the arc-set, the iteration order is the same.
@@ -501,6 +501,6 @@
 		      /// \brief Read write map of the nodes to type \c T.
-		      ///
 		      ///
 		      /// ReadWrite map of the nodes to type \c T.
 		      /// \sa Reference
-		      template<class T>
 		      template<class T>
 		      class NodeMap : public ReadWriteMap< Node, T >
@@ -518,5 +518,5 @@
 		        template <typename CMap>
-		        NodeMap& operator=(const CMap&) {
 		        NodeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Node, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
@@ -528,3 +528,3 @@
 		      /// \sa Reference
-		      template<class T>
 		      template<class T>
 		      class ArcMap : public ReadWriteMap<Arc,T>
@@ -541,5 +541,5 @@
 		        template <typename CMap>
-		        ArcMap& operator=(const CMap&) {
 		        ArcMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Arc, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
@@ -551,3 +551,3 @@
 		      /// \sa Reference
-		      template<class T>
 		      template<class T>
 		      class EdgeMap : public ReadWriteMap<Edge,T>
@@ -564,5 +564,5 @@
 		        template <typename CMap>
-		        EdgeMap& operator=(const CMap&) {
 		        EdgeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Edge, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
@@ -575,3 +575,3 @@
 		      Arc direct(const Edge&, const Node&) const {
-			return INVALID;
+		        return INVALID;
+		      }
@@ -585,3 +585,3 @@
 		      Arc direct(const Edge&, bool) const {
-			return INVALID;
+		        return INVALID;
+		      }
@@ -627,9 +627,9 @@
 		      /// \brief Returns the id of the node.
-		      int id(Node) const { return -1; }
 		      int id(Node) const { return -1; }
 		      /// \brief Returns the id of the edge.
-		      int id(Edge) const { return -1; }
 		      int id(Edge) const { return -1; }
 		      /// \brief Returns the id of the arc.
-		      int id(Arc) const { return -1; }
 		      int id(Arc) const { return -1; }
@@ -638,3 +638,3 @@
 		      /// \pre The argument should be a valid node id in the graph.
-		      Node nodeFromId(int) const { return INVALID; }
 		      Node nodeFromId(int) const { return INVALID; }
@@ -643,3 +643,3 @@
 		      /// \pre The argument should be a valid edge id in the graph.
-		      Edge edgeFromId(int) const { return INVALID; }
 		      Edge edgeFromId(int) const { return INVALID; }
@@ -648,12 +648,12 @@
 		      /// \pre The argument should be a valid arc id in the graph.
-		      Arc arcFromId(int) const { return INVALID; }
 		      Arc arcFromId(int) const { return INVALID; }
 		      /// \brief Returns an upper bound on the node IDs.
-		      int maxNodeId() const { return -1; }
 		      int maxNodeId() const { return -1; }
 		      /// \brief Returns an upper bound on the edge IDs.
-		      int maxEdgeId() const { return -1; }
 		      int maxEdgeId() const { return -1; }
 		      /// \brief Returns an upper bound on the arc IDs.
-		      int maxArcId() const { return -1; }
 		      int maxArcId() const { return -1; }
@@ -685,7 +685,7 @@
 		      // Dummy parameter.
-		      int maxId(Node) const { return -1; }
 		      int maxId(Node) const { return -1; }
 		      // Dummy parameter.
-		      int maxId(Edge) const { return -1; }
 		      int maxId(Edge) const { return -1; }
 		      // Dummy parameter.
-		      int maxId(Arc) const { return -1; }
 		      int maxId(Arc) const { return -1; }
@@ -695,3 +695,3 @@
 		      Node baseNode(OutArcIt e) const {
-			return source(e);
+		        return source(e);
+		      }
@@ -702,3 +702,3 @@
 		      Node runningNode(OutArcIt e) const {
-			return target(e);
+		        return target(e);
+		      }
@@ -709,3 +709,3 @@
 		      Node baseNode(InArcIt e) const {
-			return target(e);
+		        return target(e);
+		      }
@@ -716,3 +716,3 @@
 		      Node runningNode(InArcIt e) const {
-			return source(e);
+		        return source(e);
+		      }
@@ -723,5 +723,5 @@
 		      Node baseNode(IncEdgeIt) const {
-			return INVALID;
+		        return INVALID;
+		      }
 		      /// \brief Running node of the iterator
@@ -730,3 +730,3 @@
 		      Node runningNode(IncEdgeIt) const {
-			return INVALID;
+		        return INVALID;
+		      }
@@ -735,7 +735,7 @@
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<IterableGraphComponent<>, _Graph>();
 			  checkConcept<IDableGraphComponent<>, _Graph>();
 			  checkConcept<MappableGraphComponent<>, _Graph>();
+			}
+		        void constraints() {
 		          checkConcept<IterableGraphComponent<>, _Graph>();
 		          checkConcept<IDableGraphComponent<>, _Graph>();
 		          checkConcept<MappableGraphComponent<>, _Graph>();
+		        }
 		      };

lemon/concepts/graph_components.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -51,3 +51,3 @@
 		      /// \brief Default constructor.
-		      ///
 		      ///
 		      /// \warning The default constructor is not required to set
@@ -68,3 +68,3 @@
 		      ///
-		      /// The nodes are assignable.
 		      /// The nodes are assignable.
 		      ///
@@ -94,18 +94,18 @@
 		      struct Constraints {
 			void constraints() {
 			  _GraphItem i1;
 			  _GraphItem i2 = i1;
 			  _GraphItem i3 = INVALID;
 			  i1 = i2 = i3;
 		        void constraints() {
 		          _GraphItem i1;
 		          _GraphItem i2 = i1;
 		          _GraphItem i3 = INVALID;
 			  bool b;
 			  //	  b = (ia == ib) && (ia != ib) && (ia < ib);
 			  b = (ia == ib) && (ia != ib);
 			  b = (ia == INVALID) && (ib != INVALID);
 		          i1 = i2 = i3;
 		          bool b;
 		          //          b = (ia == ib) && (ia != ib) && (ia < ib);
 		          b = (ia == ib) && (ia != ib);
 		          b = (ia == INVALID) && (ib != INVALID);
 		          b = (ia < ib);
+			}
+		        }
 			const _GraphItem &ia;
 			const _GraphItem &ib;
 		        const _GraphItem &ia;
 		        const _GraphItem &ib;
 		      };
@@ -114,3 +114,3 @@
 		    /// \brief An empty base directed graph class.
-		    ///
 		    ///
 		    /// This class provides the minimal set of features needed for a
@@ -124,6 +124,6 @@
 		      typedef BaseDigraphComponent Digraph;
 		      /// \brief Node class of the digraph.
 		      ///
-		      /// This class represents the Nodes of the digraph.
 		      /// This class represents the Nodes of the digraph.
 		      ///
@@ -133,3 +133,3 @@
 		      ///
-		      /// This class represents the Arcs of the digraph.
 		      /// This class represents the Arcs of the digraph.
 		      ///
@@ -158,18 +158,18 @@
 		      struct Constraints {
 			typedef typename _Digraph::Node Node;
 			typedef typename _Digraph::Arc Arc;
 			void constraints() {
 			  checkConcept<GraphItem<'n'>, Node>();
 			  checkConcept<GraphItem<'a'>, Arc>();
+			  {
 			    Node n;
 			    Arc e(INVALID);
 			    n = digraph.source(e);
-			    n = digraph.target(e);
+		        typedef typename _Digraph::Node Node;
 		        typedef typename _Digraph::Arc Arc;
 		        void constraints() {
 		          checkConcept<GraphItem<'n'>, Node>();
 		          checkConcept<GraphItem<'a'>, Arc>();
+		          {
 		            Node n;
 		            Arc e(INVALID);
 		            n = digraph.source(e);
 		            n = digraph.target(e);
 		            n = digraph.oppositeNode(n, e);
+			  }
+			}
 			const _Digraph& digraph;
+		          }
+		        }
 		        const _Digraph& digraph;
 		      };
@@ -178,3 +178,3 @@
 		    /// \brief An empty base undirected graph class.
-		    ///
 		    ///
 		    /// This class provides the minimal set of features needed for an
@@ -201,3 +201,3 @@
 		        /// \brief Default constructor.
-		        ///
 		        ///
 		        /// \warning The default constructor is not required to set
@@ -219,3 +219,3 @@
 		        /// Besides the core graph item functionality each arc should
-		        /// be convertible to the represented edge.
 		        /// be convertible to the represented edge.
 		        Edge(const Arc&) {}
@@ -224,3 +224,3 @@
 		        /// Besides the core graph item functionality each arc should
-		        /// be convertible to the represented edge.
 		        /// be convertible to the represented edge.
 		        Edge& operator=(const Arc&) { return *this; }
@@ -239,3 +239,3 @@
 		      /// represented edge.
-		      Arc direct(const Edge&, bool) const { return INVALID;}
 		      Arc direct(const Edge&, bool) const { return INVALID;}
@@ -245,3 +245,3 @@
 		      /// represented edge.
-		      Arc direct(const Edge&, const Node&) const { return INVALID;}
 		      Arc direct(const Edge&, const Node&) const { return INVALID;}
@@ -262,18 +262,18 @@
 		      Node v(const Edge&) const { return INVALID;}
 		      template <typename _Graph>
 		      struct Constraints {
 			typedef typename _Graph::Node Node;
 			typedef typename _Graph::Arc Arc;
 			typedef typename _Graph::Edge Edge;
-			void constraints() {
+		        typedef typename _Graph::Node Node;
 		        typedef typename _Graph::Arc Arc;
 		        typedef typename _Graph::Edge Edge;
 		        void constraints() {
 		          checkConcept<BaseDigraphComponent, _Graph>();
 			  checkConcept<GraphItem<'u'>, Edge>();
+			  {
 			    Node n;
 			    Edge ue(INVALID);
 		          checkConcept<GraphItem<'u'>, Edge>();
+		          {
 		            Node n;
 		            Edge ue(INVALID);
 		            Arc e;
 			    n = graph.u(ue);
 			    n = graph.v(ue);
 		            n = graph.u(ue);
 		            n = graph.v(ue);
 		            e = graph.direct(ue, true);
@@ -284,6 +284,6 @@
 		            ignore_unused_variable_warning(d);
+			  }
+			}
 			const _Graph& graph;
+		          }
+		        }
 		        const _Graph& graph;
 		      };
@@ -293,3 +293,3 @@
 		    /// \brief An empty idable base digraph class.
-		    ///
 		    ///
 		    /// This class provides beside the core digraph features
@@ -306,5 +306,5 @@
-		      /// \brief Gives back an unique integer id for the Node.
 		      /// \brief Gives back an unique integer id for the Node.
 		      ///
-		      /// Gives back an unique integer id for the Node.
 		      /// Gives back an unique integer id for the Node.
 		      ///
@@ -316,8 +316,8 @@
 		      /// If the digraph does not contain node with the given id
-		      /// then the result of the function is undetermined.
 		      /// then the result of the function is undetermined.
 		      Node nodeFromId(int) const { return INVALID;}
-		      /// \brief Gives back an unique integer id for the Arc.
 		      /// \brief Gives back an unique integer id for the Arc.
 		      ///
-		      /// Gives back an unique integer id for the Arc.
 		      /// Gives back an unique integer id for the Arc.
 		      ///
@@ -329,3 +329,3 @@
 		      /// If the digraph does not contain arc with the given id
-		      /// then the result of the function is undetermined.
 		      /// then the result of the function is undetermined.
 		      Arc arcFromId(int) const { return INVALID;}
@@ -349,20 +349,20 @@
 			void constraints() {
 			  checkConcept<Base, _Digraph >();
 			  typename _Digraph::Node node;
 			  int nid = digraph.id(node);
 			  nid = digraph.id(node);
 			  node = digraph.nodeFromId(nid);
 			  typename _Digraph::Arc arc;
 			  int eid = digraph.id(arc);
 			  eid = digraph.id(arc);
 			  arc = digraph.arcFromId(eid);
 		        void constraints() {
 		          checkConcept<Base, _Digraph >();
 		          typename _Digraph::Node node;
 		          int nid = digraph.id(node);
 		          nid = digraph.id(node);
 		          node = digraph.nodeFromId(nid);
 		          typename _Digraph::Arc arc;
 		          int eid = digraph.id(arc);
 		          eid = digraph.id(arc);
 		          arc = digraph.arcFromId(eid);
 			  nid = digraph.maxNodeId();
 			  ignore_unused_variable_warning(nid);
 			  eid = digraph.maxArcId();
 			  ignore_unused_variable_warning(eid);
+			}
+		          nid = digraph.maxNodeId();
 		          ignore_unused_variable_warning(nid);
 		          eid = digraph.maxArcId();
 		          ignore_unused_variable_warning(eid);
+		        }
-			const _Digraph& digraph;
+		        const _Digraph& digraph;
 		      };
@@ -371,3 +371,3 @@
 		    /// \brief An empty idable base undirected graph class.
-		    ///
 		    ///
 		    /// This class provides beside the core undirected graph features
@@ -385,5 +385,5 @@
-		      /// \brief Gives back an unique integer id for the Edge.
 		      /// \brief Gives back an unique integer id for the Edge.
 		      ///
-		      /// Gives back an unique integer id for the Edge.
 		      /// Gives back an unique integer id for the Edge.
 		      ///
@@ -408,14 +408,14 @@
 			void constraints() {
 			  checkConcept<Base, _Graph >();
 			  checkConcept<IDableDigraphComponent<Base>, _Graph >();
 			  typename _Graph::Edge edge;
 			  int ueid = graph.id(edge);
 			  ueid = graph.id(edge);
 			  edge = graph.edgeFromId(ueid);
 			  ueid = graph.maxEdgeId();
 			  ignore_unused_variable_warning(ueid);
+			}
 		        void constraints() {
 		          checkConcept<Base, _Graph >();
 		          checkConcept<IDableDigraphComponent<Base>, _Graph >();
 		          typename _Graph::Edge edge;
 		          int ueid = graph.id(edge);
 		          ueid = graph.id(edge);
 		          edge = graph.edgeFromId(ueid);
 		          ueid = graph.maxEdgeId();
 		          ignore_unused_variable_warning(ueid);
+		        }
-			const _Graph& graph;
+		        const _Graph& graph;
 		      };
@@ -452,7 +452,7 @@
 		      ///
-		      /// The items are assignable.
 		      /// The items are assignable.
 		      ///
-		      GraphItemIt& operator=(const GraphItemIt&) { return *this; }
 		      GraphItemIt& operator=(const GraphItemIt&) { return *this; }
 		      /// \brief Next item.
-		      ///
 		      ///
 		      /// Assign the iterator to the next item.
@@ -461,3 +461,3 @@
 		      /// \brief Equality operator
-		      ///
 		      ///
 		      /// Two iterators are equal if and only if they point to the
@@ -466,3 +466,3 @@
 		      /// \brief Inequality operator
-		      ///
 		      ///
 		      /// \sa operator==(Node n)
@@ -470,17 +470,17 @@
 		      bool operator!=(const GraphItemIt&) const { return true;}
 		      template<typename _GraphItemIt>
 		      struct Constraints {
 			void constraints() {
 			  _GraphItemIt it1(g);
-			  _GraphItemIt it2;
+		        void constraints() {
 		          _GraphItemIt it1(g);
 		          _GraphItemIt it2;
 			  it2 = ++it1;
 			  ++it2 = it1;
-			  ++(++it1);
+		          it2 = ++it1;
 		          ++it2 = it1;
 		          ++(++it1);
 			  _Item bi = it1;
 			  bi = it2;
+			}
 			_Graph& g;
 		          _Item bi = it1;
 		          bi = it2;
+		        }
 		        _Graph& g;
 		      };
@@ -491,9 +491,9 @@
 		    /// \note Because InArcIt and OutArcIt may not inherit from the same
 		    /// base class, the _selector is a additional template parameter. For
 		    /// InArcIt you should instantiate it with character 'i' and for
 		    /// base class, the _selector is a additional template parameter. For
 		    /// InArcIt you should instantiate it with character 'i' and for
 		    /// OutArcIt with 'o'.
 		    template <typename _Graph,
 			      typename _Item = typename _Graph::Arc,
 		              typename _Base = typename _Graph::Node,
-			      char _selector = '0'>
+		              typename _Item = typename _Graph::Arc,
 		              typename _Base = typename _Graph::Node,
 		              char _selector = '0'>
 		    class GraphIncIt : public _Item {
@@ -510,6 +510,6 @@
 		      GraphIncIt(GraphIncIt const& gi) : _Item(gi) {}
-		      /// \brief Sets the iterator to the first arc incoming into or outgoing
 		      /// \brief Sets the iterator to the first arc incoming into or outgoing
 		      /// from the node.
 		      ///
-		      /// Sets the iterator to the first arc incoming into or outgoing
 		      /// Sets the iterator to the first arc incoming into or outgoing
 		      /// from the node.
@@ -524,5 +524,5 @@
 		      ///
-		      /// The iterators are assignable.
 		      /// The iterators are assignable.
 		      ///
-		      GraphIncIt& operator=(GraphIncIt const&) { return *this; }
 		      GraphIncIt& operator=(GraphIncIt const&) { return *this; }
 		      /// \brief Next item.
@@ -547,19 +547,19 @@
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<GraphItem<_selector>, _GraphIncIt>();
 			  _GraphIncIt it1(graph, node);
 			  _GraphIncIt it2;
 		        void constraints() {
 		          checkConcept<GraphItem<_selector>, _GraphIncIt>();
 		          _GraphIncIt it1(graph, node);
 		          _GraphIncIt it2;
 			  it2 = ++it1;
 			  ++it2 = it1;
 			  ++(++it1);
 			  _Item e = it1;
-			  e = it2;
+		          it2 = ++it1;
 		          ++it2 = it1;
 		          ++(++it1);
 		          _Item e = it1;
 		          e = it2;
+			}
+		        }
 			_Item arc;
 			_Base node;
 			_Graph graph;
 			_GraphIncIt it;
 		        _Item arc;
 		        _Base node;
 		        _Graph graph;
 		        _GraphIncIt it;
 		      };
@@ -577,3 +577,3 @@
 		    public:
 		      typedef _Base Base;
@@ -585,11 +585,11 @@
 		      /// \name Base iteration
-		      ///
 		      ///
 		      /// This interface provides functions for iteration on digraph items
 		      ///
-		      /// @{
 		      /// @{
 		      /// \brief Gives back the first node in the iterating order.
-		      ///
 		      ///
 		      /// Gives back the first node in the iterating order.
-		      ///
 		      ///
 		      void first(Node&) const {}
@@ -599,3 +599,3 @@
 		      /// Gives back the next node in the iterating order.
-		      ///
 		      ///
 		      void next(Node&) const {}
@@ -605,3 +605,3 @@
 		      /// Gives back the first arc in the iterating order.
-		      ///
 		      ///
 		      void first(Arc&) const {}
@@ -611,3 +611,3 @@
 		      /// Gives back the next arc in the iterating order.
-		      ///
 		      ///
 		      void next(Arc&) const {}
@@ -619,3 +619,3 @@
 		      /// Gives back the first of the arcs point to the given node.
-		      ///
 		      ///
 		      void firstIn(Arc&, const Node&) const {}
@@ -631,5 +631,5 @@
 		      /// given node.
-		      ///
 		      ///
 		      /// Gives back the first of the arcs start from the given node.
-		      ///
 		      ///
 		      void firstOut(Arc&, const Node&) const {}
@@ -640,3 +640,3 @@
 		      /// Gives back the next of the arcs start from the given node.
-		      ///
 		      ///
 		      void nextOut(Arc&) const {}
@@ -646,3 +646,3 @@
 		      /// \name Class based iteration
-		      ///
 		      ///
 		      /// This interface provides functions for iteration on digraph items
@@ -701,9 +701,9 @@
-		      template <typename _Digraph>
 		      template <typename _Digraph>
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<Base, _Digraph>();
 		        void constraints() {
 		          checkConcept<Base, _Digraph>();
+		          {
-		            typename _Digraph::Node node(INVALID);
 		            typename _Digraph::Node node(INVALID);
 		            typename _Digraph::Arc arc(INVALID);
@@ -725,3 +725,3 @@
+		            }
+		          }
+		          }
@@ -732,5 +732,5 @@
 		              typename _Digraph::NodeIt >();
-		            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
 		            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
 		              typename _Digraph::Node, 'i'>, typename _Digraph::InArcIt>();
-		            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
 		            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
 		              typename _Digraph::Node, 'o'>, typename _Digraph::OutArcIt>();
@@ -747,5 +747,5 @@
+		        }
 			const _Digraph& digraph;
 		        const _Digraph& digraph;
 		      };
@@ -767,3 +767,3 @@
 		      typedef IterableGraphComponent Graph;
@@ -771,5 +771,5 @@
 		      /// \name Base iteration
-		      ///
 		      ///
 		      /// This interface provides functions for iteration on graph items
-		      /// @{
 		      /// @{
@@ -782,3 +782,3 @@
 		      /// Gives back the first edge in the iterating order.
-		      ///
 		      ///
 		      void first(Edge&) const {}
@@ -789,3 +789,3 @@
 		      /// Gives back the next edge in the iterating order.
-		      ///
 		      ///
 		      void next(Edge&) const {}
@@ -816,3 +816,3 @@
 		      /// \name Class based iteration
-		      ///
 		      ///
 		      /// This interface provides functions for iteration on graph items
@@ -843,6 +843,6 @@
-		      template <typename _Graph>
 		      template <typename _Graph>
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<IterableDigraphComponent<Base>, _Graph>();
 		        void constraints() {
 		          checkConcept<IterableDigraphComponent<Base>, _Graph>();
@@ -860,5 +860,5 @@
+		            }
+		          }
+		          }
+		          {
@@ -866,5 +866,5 @@
 		              typename _Graph::EdgeIt >();
-		            checkConcept<GraphIncIt<_Graph, typename _Graph::Edge,
 		            checkConcept<GraphIncIt<_Graph, typename _Graph::Edge,
 		              typename _Graph::Node, 'u'>, typename _Graph::IncEdgeIt>();
 		            typename _Graph::Node n;
@@ -875,5 +875,5 @@
+		        }
 			const _Graph& graph;
 		        const _Graph& graph;
 		      };
@@ -882,3 +882,3 @@
 		    /// \brief An empty alteration notifier digraph class.
-		    ///
 		    ///
 		    /// This class provides beside the core digraph features alteration
@@ -899,8 +899,8 @@
 		      /// The node observer registry.
-		      typedef AlterationNotifier<AlterableDigraphComponent, Node>
 		      typedef AlterationNotifier<AlterableDigraphComponent, Node>
 		      NodeNotifier;
 		      /// The arc observer registry.
-		      typedef AlterationNotifier<AlterableDigraphComponent, Arc>
 		      typedef AlterationNotifier<AlterableDigraphComponent, Arc>
 		      ArcNotifier;
 		      /// \brief Gives back the node alteration notifier.
@@ -909,5 +909,5 @@
 		      NodeNotifier& notifier(Node) const {
-			return NodeNotifier();
+		        return NodeNotifier();
+		      }
 		      /// \brief Gives back the arc alteration notifier.
@@ -916,23 +916,23 @@
 		      ArcNotifier& notifier(Arc) const {
-			return ArcNotifier();
+		        return ArcNotifier();
+		      }
-		      template <typename _Digraph>
 		      template <typename _Digraph>
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<Base, _Digraph>();
-		          typename _Digraph::NodeNotifier& nn
+		        void constraints() {
 		          checkConcept<Base, _Digraph>();
 		          typename _Digraph::NodeNotifier& nn
 		            = digraph.notifier(typename _Digraph::Node());
-		          typename _Digraph::ArcNotifier& en
 		          typename _Digraph::ArcNotifier& en
 		            = digraph.notifier(typename _Digraph::Arc());
 		          ignore_unused_variable_warning(nn);
 		          ignore_unused_variable_warning(en);
+			}
 			const _Digraph& digraph;
+		        }
 		        const _Digraph& digraph;
 		      };
 		    };
@@ -940,3 +940,3 @@
 		    /// \brief An empty alteration notifier undirected graph class.
-		    ///
 		    ///
 		    /// This class provides beside the core graph features alteration
@@ -956,5 +956,5 @@
 		      /// The arc observer registry.
-		      typedef AlterationNotifier<AlterableGraphComponent, Edge>
 		      typedef AlterationNotifier<AlterableGraphComponent, Edge>
 		      EdgeNotifier;
 		      /// \brief Gives back the arc alteration notifier.
@@ -963,18 +963,18 @@
 		      EdgeNotifier& notifier(Edge) const {
-			return EdgeNotifier();
+		        return EdgeNotifier();
+		      }
-		      template <typename _Graph>
 		      template <typename _Graph>
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<AlterableGraphComponent<Base>, _Graph>();
-		          typename _Graph::EdgeNotifier& uen
+		        void constraints() {
 		          checkConcept<AlterableGraphComponent<Base>, _Graph>();
 		          typename _Graph::EdgeNotifier& uen
 		            = graph.notifier(typename _Graph::Edge());
 		          ignore_unused_variable_warning(uen);
+			}
 			const _Graph& graph;
+		        }
 		        const _Graph& graph;
 		      };
 		    };
@@ -982,3 +982,3 @@
 		    /// \brief Class describing the concept of graph maps
-		    ///
 		    ///
 		    /// This class describes the common interface of the graph maps
@@ -1011,3 +1011,3 @@
 		      GraphMap(const GraphMap&) : Parent() {}
 		      /// \brief Assign operator.
@@ -1016,5 +1016,5 @@
 		      /// it just iterates on the current item set and set the  map
-		      /// with the value returned by the assigned map.
 		      /// with the value returned by the assigned map.
 		      template <typename CMap>
-		      GraphMap& operator=(const CMap&) {
 		      GraphMap& operator=(const CMap&) {
 		        checkConcept<ReadMap<Key, Value>, CMap>();
@@ -1025,11 +1025,11 @@
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<ReadWriteMap<Key, Value>, _Map >();
 			  // Construction with a graph parameter
 			  _Map a(g);
 			  // Constructor with a graph and a default value parameter
 			  _Map a2(g,t);
 			  // Copy constructor.
 			  _Map b(c);
+		        void constraints() {
 		          checkConcept<ReadWriteMap<Key, Value>, _Map >();
 		          // Construction with a graph parameter
 		          _Map a(g);
 		          // Constructor with a graph and a default value parameter
 		          _Map a2(g,t);
 		          // Copy constructor.
 		          _Map b(c);
 		          ReadMap<Key, Value> cmap;
@@ -1037,9 +1037,9 @@
 			  ignore_unused_variable_warning(a2);
 			  ignore_unused_variable_warning(b);
+			}
+		          ignore_unused_variable_warning(a2);
 		          ignore_unused_variable_warning(b);
+		        }
 			const _Map &c;
 			const Graph &g;
-			const typename GraphMap::Value &t;
+		        const _Map &c;
 		        const Graph &g;
 		        const typename GraphMap::Value &t;
 		      };
@@ -1072,24 +1072,24 @@
 			/// \brief Construct a new map.
 			///
 			/// Construct a new map for the digraph.
 			explicit NodeMap(const MappableDigraphComponent& digraph)
 		        /// \brief Construct a new map.
 		        ///
 		        /// Construct a new map for the digraph.
 		        explicit NodeMap(const MappableDigraphComponent& digraph)
 		          : Parent(digraph) {}
 			/// \brief Construct a new map with default value.
 			///
 			/// Construct a new map for the digraph and initalise the values.
 			NodeMap(const MappableDigraphComponent& digraph, const _Value& value)
 		        /// \brief Construct a new map with default value.
 		        ///
 		        /// Construct a new map for the digraph and initalise the values.
 		        NodeMap(const MappableDigraphComponent& digraph, const _Value& value)
 		          : Parent(digraph, value) {}
 			/// \brief Copy constructor.
 			///
 			/// Copy Constructor.
 			NodeMap(const NodeMap& nm) : Parent(nm) {}
 		        /// \brief Copy constructor.
 		        ///
 		        /// Copy Constructor.
 		        NodeMap(const NodeMap& nm) : Parent(nm) {}
 			/// \brief Assign operator.
 			///
-			/// Assign operator.
+		        /// \brief Assign operator.
 		        ///
 		        /// Assign operator.
 		        template <typename CMap>
-		        NodeMap& operator=(const CMap&) {
 		        NodeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Node, _Value>, CMap>();
@@ -1109,24 +1109,24 @@
 			/// \brief Construct a new map.
 			///
 			/// Construct a new map for the digraph.
 			explicit ArcMap(const MappableDigraphComponent& digraph)
 		        /// \brief Construct a new map.
 		        ///
 		        /// Construct a new map for the digraph.
 		        explicit ArcMap(const MappableDigraphComponent& digraph)
 		          : Parent(digraph) {}
 			/// \brief Construct a new map with default value.
 			///
 			/// Construct a new map for the digraph and initalise the values.
 			ArcMap(const MappableDigraphComponent& digraph, const _Value& value)
 		        /// \brief Construct a new map with default value.
 		        ///
 		        /// Construct a new map for the digraph and initalise the values.
 		        ArcMap(const MappableDigraphComponent& digraph, const _Value& value)
 		          : Parent(digraph, value) {}
 			/// \brief Copy constructor.
 			///
 			/// Copy Constructor.
 			ArcMap(const ArcMap& nm) : Parent(nm) {}
 		        /// \brief Copy constructor.
 		        ///
 		        /// Copy Constructor.
 		        ArcMap(const ArcMap& nm) : Parent(nm) {}
 			/// \brief Assign operator.
 			///
-			/// Assign operator.
+		        /// \brief Assign operator.
 		        ///
 		        /// Assign operator.
 		        template <typename CMap>
-		        ArcMap& operator=(const CMap&) {
 		        ArcMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Arc, _Value>, CMap>();
@@ -1141,40 +1141,40 @@
 			struct Dummy {
 			  int value;
 			  Dummy() : value(0) {}
 			  Dummy(int _v) : value(_v) {}
-			};
+		        struct Dummy {
 		          int value;
 		          Dummy() : value(0) {}
 		          Dummy(int _v) : value(_v) {}
 		        };
 			void constraints() {
 			  checkConcept<Base, _Digraph>();
 			  { // int map test
 			    typedef typename _Digraph::template NodeMap<int> IntNodeMap;
 			    checkConcept<GraphMap<_Digraph, typename _Digraph::Node, int>,
 			      IntNodeMap >();
 			  } { // bool map test
 			    typedef typename _Digraph::template NodeMap<bool> BoolNodeMap;
 			    checkConcept<GraphMap<_Digraph, typename _Digraph::Node, bool>,
 			      BoolNodeMap >();
 			  } { // Dummy map test
 			    typedef typename _Digraph::template NodeMap<Dummy> DummyNodeMap;
 			    checkConcept<GraphMap<_Digraph, typename _Digraph::Node, Dummy>,
 			      DummyNodeMap >();
+			  }
+		        void constraints() {
 		          checkConcept<Base, _Digraph>();
 		          { // int map test
 		            typedef typename _Digraph::template NodeMap<int> IntNodeMap;
 		            checkConcept<GraphMap<_Digraph, typename _Digraph::Node, int>,
 		              IntNodeMap >();
 		          } { // bool map test
 		            typedef typename _Digraph::template NodeMap<bool> BoolNodeMap;
 		            checkConcept<GraphMap<_Digraph, typename _Digraph::Node, bool>,
 		              BoolNodeMap >();
 		          } { // Dummy map test
 		            typedef typename _Digraph::template NodeMap<Dummy> DummyNodeMap;
 		            checkConcept<GraphMap<_Digraph, typename _Digraph::Node, Dummy>,
 		              DummyNodeMap >();
+		          }
 			  { // int map test
 			    typedef typename _Digraph::template ArcMap<int> IntArcMap;
 			    checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, int>,
 			      IntArcMap >();
 			  } { // bool map test
 			    typedef typename _Digraph::template ArcMap<bool> BoolArcMap;
 			    checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, bool>,
 			      BoolArcMap >();
 			  } { // Dummy map test
 			    typedef typename _Digraph::template ArcMap<Dummy> DummyArcMap;
 			    checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, Dummy>,
 			      DummyArcMap >();
+			  }
+			}
 		          { // int map test
 		            typedef typename _Digraph::template ArcMap<int> IntArcMap;
 		            checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, int>,
 		              IntArcMap >();
 		          } { // bool map test
 		            typedef typename _Digraph::template ArcMap<bool> BoolArcMap;
 		            checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, bool>,
 		              BoolArcMap >();
 		          } { // Dummy map test
 		            typedef typename _Digraph::template ArcMap<Dummy> DummyArcMap;
 		            checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, Dummy>,
 		              DummyArcMap >();
+		          }
+		        }
-			_Digraph& digraph;
+		        _Digraph& digraph;
 		      };
@@ -1201,3 +1201,3 @@
 		      template <typename _Value>
-		      class EdgeMap : public GraphMap<Graph, Edge, _Value> {
 		      class EdgeMap : public GraphMap<Graph, Edge, _Value> {
 		      public:
@@ -1205,24 +1205,24 @@
 			/// \brief Construct a new map.
 			///
 			/// Construct a new map for the graph.
 			explicit EdgeMap(const MappableGraphComponent& graph)
 		        /// \brief Construct a new map.
 		        ///
 		        /// Construct a new map for the graph.
 		        explicit EdgeMap(const MappableGraphComponent& graph)
 		          : Parent(graph) {}
 			/// \brief Construct a new map with default value.
 			///
 			/// Construct a new map for the graph and initalise the values.
 			EdgeMap(const MappableGraphComponent& graph, const _Value& value)
 		        /// \brief Construct a new map with default value.
 		        ///
 		        /// Construct a new map for the graph and initalise the values.
 		        EdgeMap(const MappableGraphComponent& graph, const _Value& value)
 		          : Parent(graph, value) {}
 			/// \brief Copy constructor.
 			///
 			/// Copy Constructor.
 			EdgeMap(const EdgeMap& nm) : Parent(nm) {}
 		        /// \brief Copy constructor.
 		        ///
 		        /// Copy Constructor.
 		        EdgeMap(const EdgeMap& nm) : Parent(nm) {}
 			/// \brief Assign operator.
 			///
-			/// Assign operator.
+		        /// \brief Assign operator.
 		        ///
 		        /// Assign operator.
 		        template <typename CMap>
-		        EdgeMap& operator=(const CMap&) {
 		        EdgeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Edge, _Value>, CMap>();
@@ -1237,27 +1237,27 @@
 			struct Dummy {
 			  int value;
 			  Dummy() : value(0) {}
 			  Dummy(int _v) : value(_v) {}
-			};
+		        struct Dummy {
 		          int value;
 		          Dummy() : value(0) {}
 		          Dummy(int _v) : value(_v) {}
 		        };
 			void constraints() {
 			  checkConcept<MappableGraphComponent<Base>, _Graph>();
 		        void constraints() {
 		          checkConcept<MappableGraphComponent<Base>, _Graph>();
 			  { // int map test
 			    typedef typename _Graph::template EdgeMap<int> IntEdgeMap;
 			    checkConcept<GraphMap<_Graph, typename _Graph::Edge, int>,
 			      IntEdgeMap >();
 			  } { // bool map test
 			    typedef typename _Graph::template EdgeMap<bool> BoolEdgeMap;
 			    checkConcept<GraphMap<_Graph, typename _Graph::Edge, bool>,
 			      BoolEdgeMap >();
 			  } { // Dummy map test
 			    typedef typename _Graph::template EdgeMap<Dummy> DummyEdgeMap;
 			    checkConcept<GraphMap<_Graph, typename _Graph::Edge, Dummy>,
 			      DummyEdgeMap >();
+			  }
+			}
 		          { // int map test
 		            typedef typename _Graph::template EdgeMap<int> IntEdgeMap;
 		            checkConcept<GraphMap<_Graph, typename _Graph::Edge, int>,
 		              IntEdgeMap >();
 		          } { // bool map test
 		            typedef typename _Graph::template EdgeMap<bool> BoolEdgeMap;
 		            checkConcept<GraphMap<_Graph, typename _Graph::Edge, bool>,
 		              BoolEdgeMap >();
 		          } { // Dummy map test
 		            typedef typename _Graph::template EdgeMap<Dummy> DummyEdgeMap;
 		            checkConcept<GraphMap<_Graph, typename _Graph::Edge, Dummy>,
 		              DummyEdgeMap >();
+		          }
+		        }
-			_Graph& graph;
+		        _Graph& graph;
 		      };
@@ -1284,5 +1284,5 @@
 		      Node addNode() {
-			return INVALID;
+		        return INVALID;
+		      }
 		      /// \brief Adds a new arc connects the given two nodes.
@@ -1291,3 +1291,3 @@
 		      Arc addArc(const Node&, const Node&) {
-			return INVALID;
+		        return INVALID;
+		      }
@@ -1296,12 +1296,12 @@
 		      struct Constraints {
-			void constraints() {
+		        void constraints() {
 		          checkConcept<Base, _Digraph>();
 			  typename _Digraph::Node node_a, node_b;
 			  node_a = digraph.addNode();
 			  node_b = digraph.addNode();
 			  typename _Digraph::Arc arc;
 			  arc = digraph.addArc(node_a, node_b);
+			}
 		          typename _Digraph::Node node_a, node_b;
 		          node_a = digraph.addNode();
 		          node_b = digraph.addNode();
 		          typename _Digraph::Arc arc;
 		          arc = digraph.addArc(node_a, node_b);
+		        }
-			_Digraph& digraph;
+		        _Digraph& digraph;
 		      };
@@ -1329,5 +1329,5 @@
 		      Node addNode() {
-			return INVALID;
+		        return INVALID;
+		      }
 		      /// \brief Adds a new arc connects the given two nodes.
@@ -1336,3 +1336,3 @@
 		      Edge addArc(const Node&, const Node&) {
-			return INVALID;
+		        return INVALID;
+		      }
@@ -1341,12 +1341,12 @@
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<Base, _Graph>();
 			  typename _Graph::Node node_a, node_b;
 			  node_a = graph.addNode();
 			  node_b = graph.addNode();
 			  typename _Graph::Edge edge;
 			  edge = graph.addEdge(node_a, node_b);
+			}
 		        void constraints() {
 		          checkConcept<Base, _Graph>();
 		          typename _Graph::Node node_a, node_b;
 		          node_a = graph.addNode();
 		          node_b = graph.addNode();
 		          typename _Graph::Edge edge;
 		          edge = graph.addEdge(node_a, node_b);
+		        }
-			_Graph& graph;
+		        _Graph& graph;
 		      };
@@ -1355,3 +1355,3 @@
 		    /// \brief An empty erasable digraph class.
-		    ///
 		    ///
 		    /// This class provides beside the core digraph features core erase
@@ -1370,5 +1370,5 @@
 		      ///
-		      /// Erase a node from the digraph. This function should
 		      /// Erase a node from the digraph. This function should
 		      /// erase all arcs connecting to the node.
-		      void erase(const Node&) {}
 		      void erase(const Node&) {}
@@ -1382,11 +1382,11 @@
 		      struct Constraints {
-			void constraints() {
+		        void constraints() {
 		          checkConcept<Base, _Digraph>();
 			  typename _Digraph::Node node;
 			  digraph.erase(node);
 			  typename _Digraph::Arc arc;
 			  digraph.erase(arc);
+			}
+		          typename _Digraph::Node node;
 		          digraph.erase(node);
 		          typename _Digraph::Arc arc;
 		          digraph.erase(arc);
+		        }
-			_Digraph& digraph;
+		        _Digraph& digraph;
 		      };
@@ -1395,3 +1395,3 @@
 		    /// \brief An empty erasable base undirected graph class.
-		    ///
 		    ///
 		    /// This class provides beside the core undirected graph features
@@ -1412,3 +1412,3 @@
 		      /// arcs connecting to the node.
-		      void erase(const Node&) {}
 		      void erase(const Node&) {}
@@ -1422,11 +1422,11 @@
 		      struct Constraints {
-			void constraints() {
+		        void constraints() {
 		          checkConcept<Base, _Graph>();
 			  typename _Graph::Node node;
 			  graph.erase(node);
 			  typename _Graph::Edge edge;
 			  graph.erase(edge);
+			}
+		          typename _Graph::Node node;
 		          graph.erase(node);
 		          typename _Graph::Edge edge;
 		          graph.erase(edge);
+		        }
-			_Graph& graph;
+		        _Graph& graph;
 		      };
@@ -1450,3 +1450,3 @@
 		      ///
-		      void clear() {}
 		      void clear() {}
@@ -1454,8 +1454,8 @@
 		      struct Constraints {
-			void constraints() {
+		        void constraints() {
 		          checkConcept<Base, _Digraph>();
 			  digraph.clear();
+			}
 		          digraph.clear();
+		        }
-			_Digraph digraph;
+		        _Digraph digraph;
 		      };
@@ -1477,7 +1477,7 @@
 		      struct Constraints {
-			void constraints() {
+		        void constraints() {
 		          checkConcept<ClearableGraphComponent<Base>, _Graph>();
+			}
+		        }
-			_Graph graph;
+		        _Graph graph;
 		      };

lemon/concepts/heap.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -54,10 +54,10 @@
 		      ///
-		      /// The \c ItemIntMap must be initialized in such a way, that it
 		      /// The \c ItemIntMap must be initialized in such a way, that it
 		      /// assigns \c PRE_HEAP (<tt>-1</tt>) to every item.
 		      enum State {
 			IN_HEAP = 0,
 			PRE_HEAP = -1,
-			POST_HEAP = -2
+		        IN_HEAP = 0,
 		        PRE_HEAP = -1,
 		        POST_HEAP = -2
 		      };
 		      /// \brief The constructor.
@@ -87,4 +87,4 @@
 		      /// \brief Inserts an item into the heap with the given priority.
 		      ///
 		      /// Inserts the given item into the heap with the given priority.
 		      ///
 		      /// Inserts the given item into the heap with the given priority.
 		      /// \param i The item to insert.
@@ -114,3 +114,3 @@
 		      /// Removes the given item from the heap if it is already stored.
-		      /// \param i The item to delete.
 		      /// \param i The item to delete.
 		      void erase(const Item &i) {}
@@ -119,3 +119,3 @@
 		      ///
-		      /// Returns the priority of the given item.
 		      /// Returns the priority of the given item.
 		      /// \pre \c i must be in the heap.
@@ -135,3 +135,3 @@
 		      void set(const Item &i, const Prio &p) {}
 		      /// \brief Decreases the priority of an item to the given value.
@@ -176,65 +176,65 @@
 		      public:
 			void constraints() {
 			  typedef typename _Heap::Item OwnItem;
 			  typedef typename _Heap::Prio OwnPrio;
 			  typedef typename _Heap::State OwnState;
 		        void constraints() {
 		          typedef typename _Heap::Item OwnItem;
 		          typedef typename _Heap::Prio OwnPrio;
 		          typedef typename _Heap::State OwnState;
 			  Item item;
 			  Prio prio;
 			  item=Item();
 			  prio=Prio();
 			  ignore_unused_variable_warning(item);
 			  ignore_unused_variable_warning(prio);
 		          Item item;
 		          Prio prio;
 		          item=Item();
 		          prio=Prio();
 		          ignore_unused_variable_warning(item);
 		          ignore_unused_variable_warning(prio);
 			  OwnItem own_item;
 			  OwnPrio own_prio;
 			  OwnState own_state;
 			  own_item=Item();
 			  own_prio=Prio();
 			  ignore_unused_variable_warning(own_item);
 			  ignore_unused_variable_warning(own_prio);
 			  ignore_unused_variable_warning(own_state);
 		          OwnItem own_item;
 		          OwnPrio own_prio;
 		          OwnState own_state;
 		          own_item=Item();
 		          own_prio=Prio();
 		          ignore_unused_variable_warning(own_item);
 		          ignore_unused_variable_warning(own_prio);
 		          ignore_unused_variable_warning(own_state);
 			  _Heap heap1(map);
 			  _Heap heap2 = heap1;
 			  ignore_unused_variable_warning(heap1);
 			  ignore_unused_variable_warning(heap2);
 			  int s = heap.size();
 			  ignore_unused_variable_warning(s);
 			  bool e = heap.empty();
-			  ignore_unused_variable_warning(e);
+		          _Heap heap1(map);
 		          _Heap heap2 = heap1;
 		          ignore_unused_variable_warning(heap1);
 		          ignore_unused_variable_warning(heap2);
 			  prio = heap.prio();
 			  item = heap.top();
 			  prio = heap[item];
 			  own_prio = heap.prio();
 			  own_item = heap.top();
 			  own_prio = heap[own_item];
 		          int s = heap.size();
 		          ignore_unused_variable_warning(s);
 		          bool e = heap.empty();
 		          ignore_unused_variable_warning(e);
 			  heap.push(item, prio);
 			  heap.push(own_item, own_prio);
-			  heap.pop();
+		          prio = heap.prio();
 		          item = heap.top();
 		          prio = heap[item];
 		          own_prio = heap.prio();
 		          own_item = heap.top();
 		          own_prio = heap[own_item];
 			  heap.set(item, prio);
 			  heap.decrease(item, prio);
 			  heap.increase(item, prio);
 			  heap.set(own_item, own_prio);
 			  heap.decrease(own_item, own_prio);
 			  heap.increase(own_item, own_prio);
 		          heap.push(item, prio);
 		          heap.push(own_item, own_prio);
 		          heap.pop();
 			  heap.erase(item);
 			  heap.erase(own_item);
-			  heap.clear();
+		          heap.set(item, prio);
 		          heap.decrease(item, prio);
 		          heap.increase(item, prio);
 		          heap.set(own_item, own_prio);
 		          heap.decrease(own_item, own_prio);
 		          heap.increase(own_item, own_prio);
 			  own_state = heap.state(own_item);
 			  heap.state(own_item, own_state);
 		          heap.erase(item);
 		          heap.erase(own_item);
 		          heap.clear();
 			  own_state = _Heap::PRE_HEAP;
 			  own_state = _Heap::IN_HEAP;
 			  own_state = _Heap::POST_HEAP;
+			}
 		          own_state = heap.state(own_item);
 		          heap.state(own_item, own_state);
 			_Heap& heap;
 			ItemIntMap& map;
 		          own_state = _Heap::PRE_HEAP;
 		          own_state = _Heap::IN_HEAP;
 		          own_state = _Heap::POST_HEAP;
+		        }
 		        _Heap& heap;
 		        ItemIntMap& map;
 		      };

lemon/concepts/maps.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -49,3 +49,3 @@
 		      /// Returns the value associated with the given key.
-		      Value operator[](const Key &) const {
 		      Value operator[](const Key &) const {
 		        return *static_cast<Value *>(0);
@@ -55,16 +55,16 @@
 		      struct Constraints {
 			void constraints() {
 			  Value val = m[key];
 			  val = m[key];
 			  typename _ReadMap::Value own_val = m[own_key];
-			  own_val = m[own_key];
+		        void constraints() {
 		          Value val = m[key];
 		          val = m[key];
 		          typename _ReadMap::Value own_val = m[own_key];
 		          own_val = m[own_key];
 			  ignore_unused_variable_warning(key);
 			  ignore_unused_variable_warning(val);
 			  ignore_unused_variable_warning(own_key);
 			  ignore_unused_variable_warning(own_val);
+			}
 			const Key& key;
 			const typename _ReadMap::Key& own_key;
 			const _ReadMap& m;
 		          ignore_unused_variable_warning(key);
 		          ignore_unused_variable_warning(val);
 		          ignore_unused_variable_warning(own_key);
 		          ignore_unused_variable_warning(own_val);
+		        }
 		        const Key& key;
 		        const typename _ReadMap::Key& own_key;
 		        const _ReadMap& m;
 		      };
@@ -95,16 +95,16 @@
 		      struct Constraints {
 			void constraints() {
 			  m.set(key, val);
-			  m.set(own_key, own_val);
+		        void constraints() {
 		          m.set(key, val);
 		          m.set(own_key, own_val);
 			  ignore_unused_variable_warning(key);
 			  ignore_unused_variable_warning(val);
 			  ignore_unused_variable_warning(own_key);
 			  ignore_unused_variable_warning(own_val);
+			}
 			const Key& key;
 			const Value& val;
 			const typename _WriteMap::Key& own_key;
 			const typename _WriteMap::Value& own_val;
 			_WriteMap& m;
 		          ignore_unused_variable_warning(key);
 		          ignore_unused_variable_warning(val);
 		          ignore_unused_variable_warning(own_key);
 		          ignore_unused_variable_warning(own_val);
+		        }
 		        const Key& key;
 		        const Value& val;
 		        const typename _WriteMap::Key& own_key;
 		        const typename _WriteMap::Value& own_val;
 		        _WriteMap& m;
 		      };
@@ -118,3 +118,3 @@
 		    class ReadWriteMap : public ReadMap<K,T>,
-					 public WriteMap<K,T>
+		                         public WriteMap<K,T>
+		    {
@@ -127,3 +127,3 @@
 		      /// Returns the value associated with the given key.
-		      Value operator[](const Key &) const {
 		      Value operator[](const Key &) const {
 		        return *static_cast<Value *>(0);
@@ -136,6 +136,6 @@
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<ReadMap<K, T>, _ReadWriteMap >();
 			  checkConcept<WriteMap<K, T>, _ReadWriteMap >();
+			}
 		        void constraints() {
 		          checkConcept<ReadMap<K, T>, _ReadWriteMap >();
 		          checkConcept<WriteMap<K, T>, _ReadWriteMap >();
+		        }
 		      };
@@ -166,3 +166,3 @@
 		      /// Returns a reference to the value associated with the given key.
-		      Reference operator[](const Key &) {
 		      Reference operator[](const Key &) {
 		        return *static_cast<Value *>(0);
@@ -180,24 +180,24 @@
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<ReadWriteMap<K, T>, _ReferenceMap >();
 			  ref = m[key];
 			  m[key] = val;
 			  m[key] = ref;
 			  m[key] = cref;
 			  own_ref = m[own_key];
 			  m[own_key] = own_val;
 			  m[own_key] = own_ref;
 			  m[own_key] = own_cref;
 			  m[key] = m[own_key];
 			  m[own_key] = m[key];
+			}
 			const Key& key;
 			Value& val;
 			Reference ref;
 			ConstReference cref;
 			const typename _ReferenceMap::Key& own_key;
 			typename _ReferenceMap::Value& own_val;
 			typename _ReferenceMap::Reference own_ref;
 			typename _ReferenceMap::ConstReference own_cref;
 			_ReferenceMap& m;
 		        void constraints() {
 		          checkConcept<ReadWriteMap<K, T>, _ReferenceMap >();
 		          ref = m[key];
 		          m[key] = val;
 		          m[key] = ref;
 		          m[key] = cref;
 		          own_ref = m[own_key];
 		          m[own_key] = own_val;
 		          m[own_key] = own_ref;
 		          m[own_key] = own_cref;
 		          m[key] = m[own_key];
 		          m[own_key] = m[key];
+		        }
 		        const Key& key;
 		        Value& val;
 		        Reference ref;
 		        ConstReference cref;
 		        const typename _ReferenceMap::Key& own_key;
 		        typename _ReferenceMap::Value& own_val;
 		        typename _ReferenceMap::Reference own_ref;
 		        typename _ReferenceMap::ConstReference own_cref;
 		        _ReferenceMap& m;
 		      };

lemon/concepts/path.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -41,3 +41,3 @@
 		    /// A skeleton structure for representing directed paths in a
-		    /// digraph.
 		    /// digraph.
 		    /// \tparam _Digraph The digraph type in which the path is.
@@ -85,21 +85,21 @@
 		      public:
 			/// Default constructor
 			ArcIt() {}
 			/// Invalid constructor
 			ArcIt(Invalid) {}
 			/// Constructor for first arc
 			ArcIt(const Path &) {}
 		        /// Default constructor
 		        ArcIt() {}
 		        /// Invalid constructor
 		        ArcIt(Invalid) {}
 		        /// Constructor for first arc
 		        ArcIt(const Path &) {}
 		        /// Conversion to Arc
-			operator Arc() const { return INVALID; }
+		        operator Arc() const { return INVALID; }
 			/// Next arc
 			ArcIt& operator++() {return *this;}
 		        /// Next arc
 		        ArcIt& operator++() {return *this;}
 			/// Comparison operator
 			bool operator==(const ArcIt&) const {return true;}
 			/// 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 true;}
 		        /// Comparison operator
 		        bool operator!=(const ArcIt&) const {return true;}
 		         /// Comparison operator
 		         bool operator<(const ArcIt&) const {return false;}
@@ -139,3 +139,3 @@
 		    namespace _path_bits {
 		      template <typename _Digraph, typename _Path, typename RevPathTag = void>
@@ -164,3 +164,3 @@
 		      struct PathDumperConstraints<
-		        _Digraph, _Path,
 		        _Digraph, _Path,
 		        typename enable_if<typename _Path::RevPathTag, void>::type
@@ -186,3 +186,3 @@
 		      };
+		    }
@@ -211,3 +211,3 @@
 		    /// template constructor or a template assignment operator.
-		    ///
 		    ///
 		    template <typename _Digraph>
@@ -240,21 +240,21 @@
 		      public:
 			/// Default constructor
 			ArcIt() {}
 			/// Invalid constructor
 			ArcIt(Invalid) {}
 			/// Constructor for first arc
 			ArcIt(const PathDumper&) {}
 		        /// Default constructor
 		        ArcIt() {}
 		        /// Invalid constructor
 		        ArcIt(Invalid) {}
 		        /// Constructor for first arc
 		        ArcIt(const PathDumper&) {}
 		        /// Conversion to Arc
-			operator Arc() const { return INVALID; }
+		        operator Arc() const { return INVALID; }
 			/// Next arc
 			ArcIt& operator++() {return *this;}
 		        /// Next arc
 		        ArcIt& operator++() {return *this;}
 			/// Comparison operator
 			bool operator==(const ArcIt&) const {return true;}
 			/// 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 true;}
 		        /// Comparison operator
 		        bool operator!=(const ArcIt&) const {return true;}
 		         /// Comparison operator
 		         bool operator<(const ArcIt&) const {return false;}
@@ -268,21 +268,21 @@
 		      public:
 			/// Default constructor
 			RevArcIt() {}
 			/// Invalid constructor
 			RevArcIt(Invalid) {}
 			/// Constructor for first arc
 			RevArcIt(const PathDumper &) {}
 		        /// Default constructor
 		        RevArcIt() {}
 		        /// Invalid constructor
 		        RevArcIt(Invalid) {}
 		        /// Constructor for first arc
 		        RevArcIt(const PathDumper &) {}
 		        /// Conversion to Arc
-			operator Arc() const { return INVALID; }
+		        operator Arc() const { return INVALID; }
 			/// Next arc
 			RevArcIt& operator++() {return *this;}
 		        /// Next arc
 		        RevArcIt& operator++() {return *this;}
 			/// Comparison operator
 			bool operator==(const RevArcIt&) const {return true;}
 			/// 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 true;}
 		        /// Comparison operator
 		        bool operator!=(const RevArcIt&) const {return true;}
 		         /// Comparison operator
 		         bool operator<(const RevArcIt&) const {return false;}

lemon/counter.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -28,3 +28,3 @@
-		namespace lemon
 		namespace lemon
+		{
@@ -34,3 +34,3 @@
 		  template<class P>
-		  class _SubCounter
 		  class _SubCounter
+		  {
@@ -51,3 +51,3 @@
 		      : _parent(parent), _title(title), _os(os), count(0) {}
-		    ~_SubCounter() {
 		    ~_SubCounter() {
 		      _os << _title << count <<std::endl;
@@ -65,3 +65,3 @@
 		  template<class P>
-		  class _NoSubCounter
 		  class _NoSubCounter
+		  {
@@ -71,7 +71,7 @@
 		    typedef _NoSubCounter<_NoSubCounter<P> > NoSubCounter;
 		    _NoSubCounter(P &parent) :_parent(parent) {}
-		    _NoSubCounter(P &parent,std::string,std::ostream &)
 		    _NoSubCounter(P &parent,std::string,std::ostream &)
 		      :_parent(parent) {}
-		    _NoSubCounter(P &parent,std::string)
 		    _NoSubCounter(P &parent,std::string)
 		      :_parent(parent) {}
@@ -104,3 +104,3 @@
 		  /// A report containing the given title and the value of the counter
-		  /// is automatically printed on destruction.
 		  /// is automatically printed on destruction.
 		  ///
@@ -135,3 +135,3 @@
 		  /// \sa NoCounter
-		  class Counter
 		  class Counter
+		  {
@@ -143,3 +143,3 @@
 		    /// SubCounter class
 		    /// This class can be used to setup subcounters for a \ref Counter
@@ -149,3 +149,3 @@
 		    /// Subcounters can also have subcounters.
-		    ///
 		    ///
 		    /// The parent counter must be given as the first parameter of the
@@ -158,3 +158,3 @@
 		    /// instead.
-		    ///
 		    ///
 		    /// \sa NoSubCounter
@@ -162,4 +162,4 @@
 		    /// SubCounter class without printing report on destruction
 		    /// SubCounter class without printing report on destruction
 		    /// This class can be used to setup subcounters for a \ref Counter.
@@ -170,3 +170,3 @@
 		    /// Replacing \ref SubCounter "SubCounter"s with \ref NoSubCounter
-		    /// "NoSubCounter"s makes it possible to turn off reporting
 		    /// "NoSubCounter"s makes it possible to turn off reporting
 		    /// subcounter values without actually removing the definitions
@@ -180,3 +180,3 @@
 		    /// Constructor.
-		    Counter(std::string title,std::ostream &os=std::cerr)
 		    Counter(std::string title,std::ostream &os=std::cerr)
 		      : _title(title), _os(os), count(0) {}
@@ -206,3 +206,3 @@
 		    /// \ref SubCounter "SubCounter"s but it resets \ref NoSubCounter
-		    /// "NoSubCounter"s along with the main counter.
 		    /// "NoSubCounter"s along with the main counter.
 		    void reset(int c=0) {count=c;}

lemon/dfs.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -36,3 +36,3 @@
 		  ///Default traits class of Dfs class.
@@ -44,3 +44,3 @@
+		  {
-		    ///The digraph type the algorithm runs on.
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
@@ -48,3 +48,3 @@
 		    ///arcs of the %DFS paths.
-		    ///
 		    ///
 		    ///The type of the map that stores the last
@@ -55,7 +55,7 @@
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param G is the digraph, to which we would like to define the PredMap.
 		    ///\todo The digraph alone may be insufficient to initialize
-		    static PredMap *createPredMap(const GR &G)
 		    static PredMap *createPredMap(const GR &G)
+		    {
@@ -65,3 +65,3 @@
 		    ///The type of the map that indicates which nodes are processed.
 		    ///The type of the map that indicates which nodes are processed.
@@ -71,4 +71,4 @@
 		    ///Instantiates a ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///\param g is the digraph, to which
@@ -84,3 +84,3 @@
 		    ///The type of the map that indicates which nodes are reached.
 		    ///The type of the map that indicates which nodes are reached.
@@ -90,4 +90,4 @@
 		    ///Instantiates a ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///\param G is the digraph, to which
@@ -99,3 +99,3 @@
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
@@ -105,4 +105,4 @@
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param G is the digraph, to which we would like to define the \ref DistMap
@@ -113,5 +113,5 @@
 		  };
 		  ///%DFS algorithm class.
 		  ///\ingroup search
@@ -129,6 +129,6 @@
 		  template <typename GR,
-			    typename TR>
+		            typename TR>
 		#else
 		  template <typename GR=ListDigraph,
-			    typename TR=DfsDefaultTraits<GR> >
+		            typename TR=DfsDefaultTraits<GR> >
 		#endif
@@ -145,3 +145,3 @@
 		      virtual const char* what() const throw() {
-			return "lemon::Dfs::UninitializedParameter";
+		        return "lemon::Dfs::UninitializedParameter";
+		      }
@@ -160,3 +160,3 @@
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///\brief The type of the map that stores the last
@@ -194,21 +194,21 @@
 		    ///Creates the maps if necessary.
 		    ///\todo Better memory allocation (instead of new).
-		    void create_maps()
 		    void create_maps()
+		    {
 		      if(!_pred) {
 			local_pred = true;
 			_pred = Traits::createPredMap(*G);
 		        local_pred = true;
 		        _pred = Traits::createPredMap(*G);
+		      }
 		      if(!_dist) {
 			local_dist = true;
 			_dist = Traits::createDistMap(*G);
 		        local_dist = true;
 		        _dist = Traits::createDistMap(*G);
+		      }
 		      if(!_reached) {
 			local_reached = true;
 			_reached = Traits::createReachedMap(*G);
 		        local_reached = true;
 		        _reached = Traits::createReachedMap(*G);
+		      }
 		      if(!_processed) {
 			local_processed = true;
 			_processed = Traits::createProcessedMap(*G);
 		        local_processed = true;
 		        _processed = Traits::createProcessedMap(*G);
+		      }
@@ -219,3 +219,3 @@
 		    Dfs() {}
 		  public:
@@ -231,5 +231,5 @@
 		      typedef T PredMap;
-		      static PredMap *createPredMap(const Digraph &G)
 		      static PredMap *createPredMap(const Digraph &G)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -245,4 +245,4 @@
 		    };
 		    template <class T>
@@ -250,5 +250,5 @@
 		      typedef T DistMap;
-		      static DistMap *createDistMap(const Digraph &)
 		      static DistMap *createDistMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -264,3 +264,3 @@
 		    };
 		    template <class T>
@@ -268,5 +268,5 @@
 		      typedef T ReachedMap;
-		      static ReachedMap *createReachedMap(const Digraph &)
 		      static ReachedMap *createReachedMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -286,5 +286,5 @@
 		      typedef T ProcessedMap;
-		      static ProcessedMap *createProcessedMap(const Digraph &)
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -297,11 +297,11 @@
 		    template <class T>
-		    struct DefProcessedMap : public Dfs< Digraph, DefProcessedMapTraits<T> > {
 		    struct DefProcessedMap : public Dfs< Digraph, DefProcessedMapTraits<T> > {
 		      typedef Dfs< Digraph, DefProcessedMapTraits<T> > Create;
 		    };
 		    struct DefDigraphProcessedMapTraits : public Traits {
 		      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
-		      static ProcessedMap *createProcessedMap(const Digraph &G)
 		      static ProcessedMap *createProcessedMap(const Digraph &G)
+		      {
-			return new ProcessedMap(G);
+		        return new ProcessedMap(G);
+		      }
@@ -316,12 +316,12 @@
 		    class DefProcessedMapToBeDefaultMap :
-		      public Dfs< Digraph, DefDigraphProcessedMapTraits> {
 		      public Dfs< Digraph, DefDigraphProcessedMapTraits> {
 		      typedef Dfs< Digraph, DefDigraphProcessedMapTraits> Create;
 		    };
 		    ///@}
 		  public:
 		  public:
 		    ///Constructor.
 		    ///\param _G the digraph the algorithm will run on.
@@ -335,5 +335,5 @@
 		    { }
 		    ///Destructor.
-		    ~Dfs()
 		    ~Dfs()
+		    {
@@ -352,7 +352,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Dfs &predMap(PredMap &m)
 		    Dfs &predMap(PredMap &m)
+		    {
 		      if(local_pred) {
 			delete _pred;
 			local_pred=false;
 		        delete _pred;
 		        local_pred=false;
+		      }
@@ -369,7 +369,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Dfs &distMap(DistMap &m)
 		    Dfs &distMap(DistMap &m)
+		    {
 		      if(local_dist) {
 			delete _dist;
 			local_dist=false;
 		        delete _dist;
 		        local_dist=false;
+		      }
@@ -386,7 +386,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Dfs &reachedMap(ReachedMap &m)
 		    Dfs &reachedMap(ReachedMap &m)
+		    {
 		      if(local_reached) {
 			delete _reached;
 			local_reached=false;
 		        delete _reached;
 		        local_reached=false;
+		      }
@@ -403,7 +403,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Dfs &processedMap(ProcessedMap &m)
 		    Dfs &processedMap(ProcessedMap &m)
+		    {
 		      if(local_processed) {
 			delete _processed;
 			local_processed=false;
 		        delete _processed;
 		        local_processed=false;
+		      }
@@ -436,9 +436,9 @@
 		      for ( NodeIt u(*G) ; u!=INVALID ; ++u ) {
 			_pred->set(u,INVALID);
 			// _predNode->set(u,INVALID);
 			_reached->set(u,false);
 			_processed->set(u,false);
 		        _pred->set(u,INVALID);
 		        // _predNode->set(u,INVALID);
 		        _reached->set(u,false);
 		        _processed->set(u,false);
+		      }
+		    }
 		    ///Adds a new source node.
@@ -452,17 +452,17 @@
 		      if(!(*_reached)[s])
+			{
 			  _reached->set(s,true);
 			  _pred->set(s,INVALID);
 			  OutArcIt e(*G,s);
 			  if(e!=INVALID) {
 			    _stack[++_stack_head]=e;
 			    _dist->set(s,_stack_head);
+			  }
 			  else {
 			    _processed->set(s,true);
 			    _dist->set(s,0);
+			  }
+			}
+		        {
 		          _reached->set(s,true);
 		          _pred->set(s,INVALID);
 		          OutArcIt e(*G,s);
 		          if(e!=INVALID) {
 		            _stack[++_stack_head]=e;
 		            _dist->set(s,_stack_head);
+		          }
 		          else {
 		            _processed->set(s,true);
 		            _dist->set(s,0);
+		          }
+		        }
+		    }
 		    ///Processes the next arc.
@@ -475,3 +475,3 @@
 		    Arc processNextArc()
+		    {
+		    {
 		      Node m;
@@ -479,19 +479,19 @@
 		      if(!(*_reached)[m=G->target(e)]) {
 			_pred->set(m,e);
 			_reached->set(m,true);
 			++_stack_head;
 			_stack[_stack_head] = OutArcIt(*G, m);
-			_dist->set(m,_stack_head);
+		        _pred->set(m,e);
 		        _reached->set(m,true);
 		        ++_stack_head;
 		        _stack[_stack_head] = OutArcIt(*G, m);
 		        _dist->set(m,_stack_head);
+		      }
 		      else {
 			m=G->source(e);
 			++_stack[_stack_head];
 		        m=G->source(e);
 		        ++_stack[_stack_head];
+		      }
 		      while(_stack_head>=0 && _stack[_stack_head]==INVALID) {
 			_processed->set(m,true);
 			--_stack_head;
 			if(_stack_head>=0) {
 			  m=G->source(_stack[_stack_head]);
 			  ++_stack[_stack_head];
+			}
 		        _processed->set(m,true);
 		        --_stack_head;
 		        if(_stack_head>=0) {
 		          m=G->source(_stack[_stack_head]);
 		          ++_stack[_stack_head];
+		        }
+		      }
@@ -506,3 +506,3 @@
 		    OutArcIt nextArc()
+		    {
+		    {
 		      return _stack_head>=0?_stack[_stack_head]:INVALID;
@@ -517,6 +517,6 @@
 		    ///Returns the number of the nodes to be processed.
 		    ///Returns the number of the nodes to be processed in the queue.
 		    int queueSize() { return _stack_head+1; }
 		    ///Executes the algorithm.
@@ -539,3 +539,3 @@
+		    }
 		    ///Executes the algorithm until \c dest is reached.
@@ -556,6 +556,6 @@
+		    {
 		      while ( !emptyQueue() && G->target(_stack[_stack_head])!=dest )
 			processNextArc();
 		      while ( !emptyQueue() && G->target(_stack[_stack_head])!=dest )
 		        processNextArc();
+		    }
 		    ///Executes the algorithm until a condition is met.
@@ -584,3 +584,3 @@
 		    ///Runs %DFS algorithm to visit all nodes in the digraph.
 		    ///This method runs the %DFS algorithm in order to
@@ -612,3 +612,3 @@
 		    ///Runs %DFS algorithm from node \c s.
 		    ///This method runs the %DFS algorithm from a root node \c s
@@ -631,5 +631,5 @@
+		    }
 		    ///Finds the %DFS path between \c s and \c t.
 		    ///Finds the %DFS path between \c s and \c t.
@@ -651,3 +651,3 @@
+		    }
 		    ///@}
@@ -659,3 +659,3 @@
 		    ///either run() or start() must be called.
 		    ///@{
@@ -665,6 +665,6 @@
 		    ///Gives back the shortest path.
 		    ///Gives back the shortest path.
 		    ///\pre The \c t should be reachable from the source.
-		    Path path(Node t)
 		    Path path(Node t)
+		    {
@@ -677,3 +677,3 @@
 		    ///\pre \ref run() must be called before using this function.
-		    ///\warning If node \c v is unreachable from the root(s) then the return
 		    ///\warning If node \c v is unreachable from the root(s) then the return
 		    ///value of this funcion is undefined.
@@ -707,4 +707,4 @@
 		    Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
 						  G->source((*_pred)[v]); }
 		                                  G->source((*_pred)[v]); }
 		    ///Returns a reference to the NodeMap of distances.
@@ -715,3 +715,3 @@
 		    const DistMap &distMap() const { return *_dist;}
 		    ///Returns a reference to the %DFS arc-tree map.
@@ -723,3 +723,3 @@
 		    const PredMap &predMap() const { return *_pred;}
 		    ///Checks if a node is reachable from the root.
@@ -732,3 +732,3 @@
 		    bool reached(Node v) { return (*_reached)[v]; }
 		    ///@}
@@ -743,3 +743,3 @@
+		  {
-		    ///The digraph type the algorithm runs on.
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
@@ -747,3 +747,3 @@
 		    ///arcs of the %DFS paths.
-		    ///
 		    ///
 		    ///The type of the map that stores the last
@@ -754,4 +754,4 @@
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param g is the digraph, to which we would like to define the PredMap.
@@ -759,5 +759,5 @@
 		#ifdef DOXYGEN
-		    static PredMap *createPredMap(const GR &g)
 		    static PredMap *createPredMap(const GR &g)
 		#else
-		    static PredMap *createPredMap(const GR &)
 		    static PredMap *createPredMap(const GR &)
 		#endif
@@ -768,3 +768,3 @@
 		    ///The type of the map that indicates which nodes are processed.
 		    ///The type of the map that indicates which nodes are processed.
@@ -774,4 +774,4 @@
 		    ///Instantiates a ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///\param g is the digraph, to which
@@ -787,3 +787,3 @@
 		    ///The type of the map that indicates which nodes are reached.
 		    ///The type of the map that indicates which nodes are reached.
@@ -793,4 +793,4 @@
 		    ///Instantiates a ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///\param G is the digraph, to which
@@ -802,3 +802,3 @@
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
@@ -808,4 +808,4 @@
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param g is the digraph, to which we would like to define the \ref DistMap
@@ -820,3 +820,3 @@
 		  };
 		  /// Default traits used by \ref DfsWizard
@@ -850,6 +850,6 @@
 		    Node _source;
 		    public:
 		    /// Constructor.
 		    /// This constructor does not require parameters, therefore it initiates
@@ -857,6 +857,6 @@
 		    DfsWizardBase() : _g(0), _reached(0), _processed(0), _pred(0),
-					   _dist(0), _source(INVALID) {}
+		                           _dist(0), _source(INVALID) {}
 		    /// Constructor.
 		    /// This constructor requires some parameters,
@@ -867,3 +867,3 @@
 		    DfsWizardBase(const GR &g, Node s=INVALID) :
-		      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
 		      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
 		      _reached(0), _processed(0), _pred(0), _dist(0), _source(s) {}
@@ -871,3 +871,3 @@
 		  };
 		  /// A class to make the usage of the Dfs algorithm easier
@@ -906,3 +906,3 @@
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///\brief The type of the map that stores
@@ -936,3 +936,3 @@
 		    ///Runs Dfs algorithm from a given node.
 		    ///Runs Dfs algorithm from a given node.
@@ -943,9 +943,9 @@
 		      Dfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
-		      if(Base::_reached)
 		      if(Base::_reached)
 		        alg.reachedMap(*reinterpret_cast<ReachedMap*>(Base::_reached));
-		      if(Base::_processed)
 		      if(Base::_processed)
 		        alg.processedMap(*reinterpret_cast<ProcessedMap*>(Base::_processed));
-		      if(Base::_pred)
 		      if(Base::_pred)
 		        alg.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
-		      if(Base::_dist)
 		      if(Base::_dist)
 		        alg.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
@@ -970,3 +970,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -978,3 +978,3 @@
 		    template<class T>
-		    DfsWizard<DefPredMapBase<T> > predMap(const T &t)
 		    DfsWizard<DefPredMapBase<T> > predMap(const T &t)
+		    {
@@ -983,4 +983,4 @@
+		    }
 		    template<class T>
@@ -991,3 +991,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -999,3 +999,3 @@
 		    template<class T>
-		    DfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
 		    DfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
+		    {
@@ -1004,3 +1004,3 @@
+		    }
@@ -1012,3 +1012,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -1020,3 +1020,3 @@
 		    template<class T>
-		    DfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
 		    DfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
+		    {
@@ -1025,3 +1025,3 @@
+		    }
 		    template<class T>
@@ -1032,3 +1032,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -1040,3 +1040,3 @@
 		    template<class T>
-		    DfsWizard<DefDistMapBase<T> > distMap(const T &t)
 		    DfsWizard<DefDistMapBase<T> > distMap(const T &t)
+		    {
@@ -1045,3 +1045,3 @@
+		    }
 		    /// Sets the source node, from which the Dfs algorithm runs.
@@ -1050,3 +1050,3 @@
 		    /// \param s is the source node.
-		    DfsWizard<TR> &source(Node s)
 		    DfsWizard<TR> &source(Node s)
+		    {
@@ -1055,5 +1055,5 @@
+		    }
 		  };
 		  ///Function type interface for Dfs algorithm.
@@ -1084,5 +1084,5 @@
 		  /// \brief Visitor class for dfs.
 		  ///
 		  /// It gives a simple interface for a functional interface for dfs
-		  /// traversal. The traversal on a linear data structure.
 		  ///
 		  /// It gives a simple interface for a functional interface for dfs
 		  /// traversal. The traversal on a linear data structure.
 		  template <typename _Digraph>
@@ -1093,3 +1093,3 @@
 		    /// \brief Called when the arc reach a node.
-		    ///
 		    ///
 		    /// It is called when the dfs find an arc which target is not
@@ -1098,3 +1098,3 @@
 		    /// \brief Called when the node reached first time.
-		    ///
 		    ///
 		    /// It is Called when the node reached first time.
@@ -1102,3 +1102,3 @@
 		    /// \brief Called when we step back on an arc.
-		    ///
 		    ///
 		    /// It is called when the dfs should step back on the arc.
@@ -1106,9 +1106,9 @@
 		    /// \brief Called when we step back from the node.
-		    ///
 		    ///
 		    /// It is called when we step back from the node.
 		    void leave(const Node& node) {}
-		    /// \brief Called when the arc examined but target of the arc
 		    /// \brief Called when the arc examined but target of the arc
 		    /// already discovered.
 		    ///
 		    /// It called when the arc examined but the target of the arc
 		    ///
 		    /// It called when the arc examined but the target of the arc
 		    /// already discovered.
@@ -1116,3 +1116,3 @@
 		    /// \brief Called for the source node of the dfs.
-		    ///
 		    ///
 		    /// It is called for the source node of the dfs.
@@ -1120,3 +1120,3 @@
 		    /// \brief Called when we leave the source node of the dfs.
-		    ///
 		    ///
 		    /// It is called when we leave the source node of the dfs.
@@ -1142,11 +1142,11 @@
 		      void constraints() {
 			Arc arc;
 			Node node;
 			visitor.discover(arc);
 			visitor.reach(node);
 			visitor.backtrack(arc);
 			visitor.leave(node);
 			visitor.examine(arc);
 			visitor.start(node);
-			visitor.stop(arc);
+		        Arc arc;
 		        Node node;
 		        visitor.discover(arc);
 		        visitor.reach(node);
 		        visitor.backtrack(arc);
 		        visitor.leave(node);
 		        visitor.examine(arc);
 		        visitor.start(node);
 		        visitor.stop(arc);
+		      }
@@ -1164,3 +1164,3 @@
-		    /// \brief The digraph type the algorithm runs on.
 		    /// \brief The digraph type the algorithm runs on.
 		    typedef _Digraph Digraph;
@@ -1168,3 +1168,3 @@
 		    /// \brief The type of the map that indicates which nodes are reached.
-		    ///
 		    ///
 		    /// The type of the map that indicates which nodes are reached.
@@ -1176,3 +1176,3 @@
 		    ///
-		    /// This function instantiates a \ref ReachedMap.
 		    /// This function instantiates a \ref ReachedMap.
 		    /// \param digraph is the digraph, to which
@@ -1184,5 +1184,5 @@
 		  };
 		  /// %DFS Visit algorithm class.
 		  /// \ingroup search
@@ -1193,3 +1193,3 @@
 		  /// class. It works with callback mechanism, the DfsVisit object calls
-		  /// on every dfs event the \c Visitor class member functions.
 		  /// on every dfs event the \c Visitor class member functions.
 		  ///
@@ -1198,3 +1198,3 @@
 		  /// is only passed to \ref DfsDefaultTraits.
-		  /// \tparam _Visitor The Visitor object for the algorithm. The
 		  /// \tparam _Visitor The Visitor object for the algorithm. The
 		  /// \ref DfsVisitor "DfsVisitor<_Digraph>" is an empty Visitor which
@@ -1202,3 +1202,3 @@
 		  /// events you should implement your own Visitor class.
-		  /// \tparam _Traits Traits class to set various data types used by the
 		  /// \tparam _Traits Traits class to set various data types used by the
 		  /// algorithm. The default traits class is
@@ -1213,4 +1213,4 @@
 		  template <typename _Digraph = ListDigraph,
 			    typename _Visitor = DfsVisitor<_Digraph>,
 			    typename _Traits = DfsDefaultTraits<_Digraph> >
 		            typename _Visitor = DfsVisitor<_Digraph>,
 		            typename _Traits = DfsDefaultTraits<_Digraph> >
 		#endif
@@ -1218,3 +1218,3 @@
 		  public:
 		    /// \brief \ref Exception for uninitialized parameters.
@@ -1225,5 +1225,5 @@
 		    public:
-		      virtual const char* what() const throw()
 		      virtual const char* what() const throw()
+		      {
-			return "lemon::DfsVisit::UninitializedParameter";
+		        return "lemon::DfsVisit::UninitializedParameter";
+		      }
@@ -1264,4 +1264,4 @@
 		      if(!_reached) {
 			local_reached = true;
 			_reached = Traits::createReachedMap(*_digraph);
 		        local_reached = true;
 		        _reached = Traits::createReachedMap(*_digraph);
+		      }
@@ -1272,3 +1272,3 @@
 		    DfsVisit() {}
 		  public:
@@ -1284,6 +1284,6 @@
 		      static ReachedMap *createReachedMap(const Digraph &digraph) {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
 		    };
-		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// ReachedMap type
@@ -1293,3 +1293,3 @@
 		    struct DefReachedMap : public DfsVisit< Digraph, Visitor,
-							    DefReachedMapTraits<T> > {
+		                                            DefReachedMapTraits<T> > {
 		      typedef DfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
@@ -1298,4 +1298,4 @@
 		  public:
 		  public:
 		    /// \brief Constructor.
@@ -1307,6 +1307,6 @@
 		    ///
-		    DfsVisit(const Digraph& digraph, Visitor& visitor)
 		    DfsVisit(const Digraph& digraph, Visitor& visitor)
 		      : _digraph(&digraph), _visitor(&visitor),
 			_reached(0), local_reached(false) {}
 		        _reached(0), local_reached(false) {}
 		    /// \brief Destructor.
@@ -1327,4 +1327,4 @@
 		      if(local_reached) {
 			delete _reached;
 			local_reached=false;
 		        delete _reached;
 		        local_reached=false;
+		      }
@@ -1355,6 +1355,6 @@
 		      for (NodeIt u(*_digraph) ; u != INVALID ; ++u) {
-			_reached->set(u, false);
+		        _reached->set(u, false);
+		      }
+		    }
 		    /// \brief Adds a new source node.
@@ -1364,15 +1364,15 @@
 		      if(!(*_reached)[s]) {
 			  _reached->set(s,true);
 			  _visitor->start(s);
 			  _visitor->reach(s);
 			  Arc e;
 			  _digraph->firstOut(e, s);
 			  if (e != INVALID) {
 			    _stack[++_stack_head] = e;
 			  } else {
 			    _visitor->leave(s);
+			  }
+			}
+		          _reached->set(s,true);
 		          _visitor->start(s);
 		          _visitor->reach(s);
 		          Arc e;
 		          _digraph->firstOut(e, s);
 		          if (e != INVALID) {
 		            _stack[++_stack_head] = e;
 		          } else {
 		            _visitor->leave(s);
+		          }
+		        }
+		    }
 		    /// \brief Processes the next arc.
@@ -1384,3 +1384,3 @@
 		    /// \pre The stack must not be empty!
-		    Arc processNextArc() {
 		    Arc processNextArc() {
 		      Arc e = _stack[_stack_head];
@@ -1388,21 +1388,21 @@
 		      if(!(*_reached)[m]) {
 			_visitor->discover(e);
 			_visitor->reach(m);
 			_reached->set(m, true);
 			_digraph->firstOut(_stack[++_stack_head], m);
 		        _visitor->discover(e);
 		        _visitor->reach(m);
 		        _reached->set(m, true);
 		        _digraph->firstOut(_stack[++_stack_head], m);
 		      } else {
 			_visitor->examine(e);
 			m = _digraph->source(e);
-			_digraph->nextOut(_stack[_stack_head]);
+		        _visitor->examine(e);
 		        m = _digraph->source(e);
 		        _digraph->nextOut(_stack[_stack_head]);
+		      }
 		      while (_stack_head>=0 && _stack[_stack_head] == INVALID) {
 			_visitor->leave(m);
 			--_stack_head;
 			if (_stack_head >= 0) {
 			  _visitor->backtrack(_stack[_stack_head]);
 			  m = _digraph->source(_stack[_stack_head]);
 			  _digraph->nextOut(_stack[_stack_head]);
 			} else {
 			  _visitor->stop(m);
+			}
+		        _visitor->leave(m);
 		        --_stack_head;
 		        if (_stack_head >= 0) {
 		          _visitor->backtrack(_stack[_stack_head]);
 		          m = _digraph->source(_stack[_stack_head]);
 		          _digraph->nextOut(_stack[_stack_head]);
 		        } else {
 		          _visitor->stop(m);
+		        }
+		      }
@@ -1417,3 +1417,3 @@
 		    /// empty.
-		    Arc nextArc() {
 		    Arc nextArc() {
 		      return _stack_head >= 0 ? _stack[_stack_head] : INVALID;
@@ -1432,3 +1432,3 @@
 		    int queueSize() { return _stack_head + 1; }
 		    /// \brief Executes the algorithm.
@@ -1442,3 +1442,3 @@
+		    }
 		    /// \brief Executes the algorithm until \c dest is reached.
@@ -1450,6 +1450,6 @@
 		    void start(Node dest) {
 		      while ( !emptyQueue() && _digraph->target(_stack[_stack_head]) != dest )
 			processNextArc();
 		      while ( !emptyQueue() && _digraph->target(_stack[_stack_head]) != dest )
 		        processNextArc();
+		    }
 		    /// \brief Executes the algorithm until a condition is met.
@@ -1492,3 +1492,3 @@
 		    /// \brief Runs %DFSVisit algorithm to visit all nodes in the digraph.
 		    /// This method runs the %DFS algorithm in order to

lemon/dijkstra.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -36,3 +36,3 @@
 		  /// \brief Default OperationTraits for the Dijkstra algorithm class.
-		  ///
 		  ///
 		  /// It defines all computational operations and constants which are
@@ -56,3 +56,3 @@
 		  /// \brief Widest path OperationTraits for the Dijkstra algorithm class.
-		  ///
 		  ///
 		  /// It defines all computational operations and constants which are
@@ -74,3 +74,3 @@
 		  };
 		  ///Default traits class of Dijkstra class.
@@ -83,3 +83,3 @@
+		  {
-		    ///The digraph type the algorithm runs on.
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
@@ -105,6 +105,6 @@
 		    ///This function instantiates a \c HeapCrossRef.
 		    /// \param G is the digraph, to which we would like to define the
 		    ///This function instantiates a \c HeapCrossRef.
 		    /// \param G is the digraph, to which we would like to define the
 		    /// HeapCrossRef.
-		    static HeapCrossRef *createHeapCrossRef(const GR &G)
 		    static HeapCrossRef *createHeapCrossRef(const GR &G)
+		    {
@@ -112,3 +112,3 @@
+		    }
 		    ///The heap type used by Dijkstra algorithm.
@@ -121,3 +121,3 @@
-		    static Heap *createHeap(HeapCrossRef& R)
 		    static Heap *createHeap(HeapCrossRef& R)
+		    {
@@ -128,3 +128,3 @@
 		    ///arcs of the shortest paths.
-		    ///
 		    ///
 		    ///The type of the map that stores the last
@@ -135,7 +135,7 @@
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \c PredMap.
 		    ///This function instantiates a \c PredMap.
 		    ///\param G is the digraph, to which we would like to define the PredMap.
 		    ///\todo The digraph alone may be insufficient for the initialization
-		    static PredMap *createPredMap(const GR &G)
 		    static PredMap *createPredMap(const GR &G)
+		    {
@@ -145,3 +145,3 @@
 		    ///The type of the map that stores whether a nodes is processed.
 		    ///The type of the map that stores whether a nodes is processed.
@@ -154,4 +154,4 @@
 		    ///Instantiates a ProcessedMap.
 		    ///This function instantiates a \c ProcessedMap.
 		    ///This function instantiates a \c ProcessedMap.
 		    ///\param g is the digraph, to which
@@ -167,3 +167,3 @@
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
@@ -173,4 +173,4 @@
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param G is the digraph, to which we would like to define the \ref DistMap
@@ -181,5 +181,5 @@
 		  };
 		  ///%Dijkstra algorithm class.
 		  /// \ingroup shortest_path
@@ -204,3 +204,3 @@
 		  ///of LM is not used directly by Dijkstra, it is only passed to \ref
-		  ///DijkstraDefaultTraits.
 		  ///DijkstraDefaultTraits.
 		  ///\tparam TR Traits class to set
@@ -216,4 +216,4 @@
 		  template <typename GR=ListDigraph,
 			    typename LM=typename GR::template ArcMap<int>,
 			    typename TR=DijkstraDefaultTraits<GR,LM> >
 		            typename LM=typename GR::template ArcMap<int>,
 		            typename TR=DijkstraDefaultTraits<GR,LM> >
 		#endif
@@ -230,3 +230,3 @@
 		      virtual const char* what() const throw() {
-			return "lemon::Dijkstra::UninitializedParameter";
+		        return "lemon::Dijkstra::UninitializedParameter";
+		      }
@@ -245,3 +245,3 @@
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///The type of the length of the arcs.
@@ -290,28 +290,28 @@
 		    ///Creates the maps if necessary.
 		    ///\todo Better memory allocation (instead of new).
-		    void create_maps()
 		    void create_maps()
+		    {
 		      if(!_pred) {
 			local_pred = true;
 			_pred = Traits::createPredMap(*G);
 		        local_pred = true;
 		        _pred = Traits::createPredMap(*G);
+		      }
 		      if(!_dist) {
 			local_dist = true;
 			_dist = Traits::createDistMap(*G);
 		        local_dist = true;
 		        _dist = Traits::createDistMap(*G);
+		      }
 		      if(!_processed) {
 			local_processed = true;
 			_processed = Traits::createProcessedMap(*G);
 		        local_processed = true;
 		        _processed = Traits::createProcessedMap(*G);
+		      }
 		      if (!_heap_cross_ref) {
 			local_heap_cross_ref = true;
 			_heap_cross_ref = Traits::createHeapCrossRef(*G);
 		        local_heap_cross_ref = true;
 		        _heap_cross_ref = Traits::createHeapCrossRef(*G);
+		      }
 		      if (!_heap) {
 			local_heap = true;
 			_heap = Traits::createHeap(*_heap_cross_ref);
 		        local_heap = true;
 		        _heap = Traits::createHeap(*_heap_cross_ref);
+		      }
+		    }
 		  public :
@@ -319,3 +319,3 @@
 		    typedef Dijkstra Create;
 		    ///\name Named template parameters
@@ -329,3 +329,3 @@
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -337,7 +337,7 @@
 		    template <class T>
 		    struct DefPredMap
 		      : public Dijkstra< Digraph,	LengthMap, DefPredMapTraits<T> > {
-		      typedef Dijkstra< Digraph,	LengthMap, DefPredMapTraits<T> > Create;
+		    struct DefPredMap
 		      : public Dijkstra< Digraph,        LengthMap, DefPredMapTraits<T> > {
 		      typedef Dijkstra< Digraph,        LengthMap, DefPredMapTraits<T> > Create;
 		    };
 		    template <class T>
@@ -347,3 +347,3 @@
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -355,7 +355,7 @@
 		    template <class T>
 		    struct DefDistMap
 		      : public Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > {
 		    struct DefDistMap
 		      : public Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > {
 		      typedef Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > Create;
 		    };
 		    template <class T>
@@ -363,5 +363,5 @@
 		      typedef T ProcessedMap;
-		      static ProcessedMap *createProcessedMap(const Digraph &G)
 		      static ProcessedMap *createProcessedMap(const Digraph &G)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -373,12 +373,12 @@
 		    template <class T>
 		    struct DefProcessedMap
 		      : public Dijkstra< Digraph,	LengthMap, DefProcessedMapTraits<T> > {
-		      typedef Dijkstra< Digraph,	LengthMap, DefProcessedMapTraits<T> > Create;
+		    struct DefProcessedMap
 		      : public Dijkstra< Digraph,        LengthMap, DefProcessedMapTraits<T> > {
 		      typedef Dijkstra< Digraph,        LengthMap, DefProcessedMapTraits<T> > Create;
 		    };
 		    struct DefDigraphProcessedMapTraits : public Traits {
 		      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
-		      static ProcessedMap *createProcessedMap(const Digraph &G)
 		      static ProcessedMap *createProcessedMap(const Digraph &G)
+		      {
-			return new ProcessedMap(G);
+		        return new ProcessedMap(G);
+		      }
@@ -392,3 +392,3 @@
 		    template <class T>
-		    struct DefProcessedMapToBeDefaultMap
 		    struct DefProcessedMapToBeDefaultMap
 		      : public Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> {
@@ -402,7 +402,7 @@
 		      static HeapCrossRef *createHeapCrossRef(const Digraph &) {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
-		      static Heap *createHeap(HeapCrossRef &)
 		      static Heap *createHeap(HeapCrossRef &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
@@ -412,3 +412,3 @@
 		    ///
-		    ///\ref named-templ-param "Named parameter" for setting heap and cross
 		    ///\ref named-templ-param "Named parameter" for setting heap and cross
 		    ///reference type
@@ -417,4 +417,4 @@
 		    struct DefHeap
 		      : public Dijkstra< Digraph,	LengthMap, DefHeapTraits<H, CR> > {
 		      typedef Dijkstra< Digraph,	LengthMap, DefHeapTraits<H, CR> > Create;
 		      : public Dijkstra< Digraph,        LengthMap, DefHeapTraits<H, CR> > {
 		      typedef Dijkstra< Digraph,        LengthMap, DefHeapTraits<H, CR> > Create;
 		    };
@@ -426,7 +426,7 @@
 		      static HeapCrossRef *createHeapCrossRef(const Digraph &G) {
-			return new HeapCrossRef(G);
+		        return new HeapCrossRef(G);
+		      }
-		      static Heap *createHeap(HeapCrossRef &R)
 		      static Heap *createHeap(HeapCrossRef &R)
+		      {
-			return new Heap(R);
+		        return new Heap(R);
+		      }
@@ -436,5 +436,5 @@
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting heap and cross
 		    ///reference type. It can allocate the heap and the cross reference
-		    ///object if the cross reference's constructor waits for the digraph as
+		    ///\ref named-templ-param "Named parameter" for setting heap and cross
 		    ///reference type. It can allocate the heap and the cross reference
 		    ///object if the cross reference's constructor waits for the digraph as
 		    ///parameter and the heap's constructor waits for the cross reference.
@@ -442,4 +442,4 @@
 		    struct DefStandardHeap
 		      : public Dijkstra< Digraph,	LengthMap, DefStandardHeapTraits<H, CR> > {
 		      typedef Dijkstra< Digraph,	LengthMap, DefStandardHeapTraits<H, CR> >
 		      : public Dijkstra< Digraph,        LengthMap, DefStandardHeapTraits<H, CR> > {
 		      typedef Dijkstra< Digraph,        LengthMap, DefStandardHeapTraits<H, CR> >
 		      Create;
@@ -451,4 +451,4 @@
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// OperationTraits type
@@ -463,3 +463,3 @@
 		    };
 		    ///@}
@@ -471,6 +471,6 @@
 		  public:
 		  public:
 		    ///Constructor.
 		    ///\param _G the digraph the algorithm will run on.
@@ -485,5 +485,5 @@
 		    { }
 		    ///Destructor.
-		    ~Dijkstra()
 		    ~Dijkstra()
+		    {
@@ -500,3 +500,3 @@
 		    ///\return <tt> (*this) </tt>
-		    Dijkstra &lengthMap(const LengthMap &m)
 		    Dijkstra &lengthMap(const LengthMap &m)
+		    {
@@ -513,7 +513,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Dijkstra &predMap(PredMap &m)
 		    Dijkstra &predMap(PredMap &m)
+		    {
 		      if(local_pred) {
 			delete _pred;
 			local_pred=false;
 		        delete _pred;
 		        local_pred=false;
+		      }
@@ -530,7 +530,7 @@
 		    ///\return <tt> (*this) </tt>
-		    Dijkstra &distMap(DistMap &m)
 		    Dijkstra &distMap(DistMap &m)
+		    {
 		      if(local_dist) {
 			delete _dist;
 			local_dist=false;
 		        delete _dist;
 		        local_dist=false;
+		      }
@@ -550,4 +550,4 @@
 		      if(local_heap_cross_ref) {
 			delete _heap_cross_ref;
 			local_heap_cross_ref=false;
 		        delete _heap_cross_ref;
 		        local_heap_cross_ref=false;
+		      }
@@ -555,4 +555,4 @@
 		      if(local_heap) {
 			delete _heap;
 			local_heap=false;
 		        delete _heap;
 		        local_heap=false;
+		      }
@@ -594,8 +594,8 @@
 		      for ( NodeIt u(*G) ; u!=INVALID ; ++u ) {
 			_pred->set(u,INVALID);
 			_processed->set(u,false);
-			_heap_cross_ref->set(u,Heap::PRE_HEAP);
+		        _pred->set(u,INVALID);
 		        _processed->set(u,false);
 		        _heap_cross_ref->set(u,Heap::PRE_HEAP);
+		      }
+		    }
 		    ///Adds a new source node.
@@ -612,9 +612,9 @@
 		      if(_heap->state(s) != Heap::IN_HEAP) {
-			_heap->push(s,dst);
+		        _heap->push(s,dst);
 		      } else if(OperationTraits::less((*_heap)[s], dst)) {
 			_heap->set(s,dst);
 			_pred->set(s,INVALID);
 		        _heap->set(s,dst);
 		        _pred->set(s,INVALID);
+		      }
+		    }
 		    ///Processes the next node in the priority heap
@@ -628,3 +628,3 @@
+		    {
-		      Node v=_heap->top();
 		      Node v=_heap->top();
 		      Value oldvalue=_heap->prio();
@@ -632,22 +632,22 @@
 		      finalizeNodeData(v,oldvalue);
 		      for(OutArcIt e(*G,v); e!=INVALID; ++e) {
 			Node w=G->target(e);
 			switch(_heap->state(w)) {
 			case Heap::PRE_HEAP:
 			  _heap->push(w,OperationTraits::plus(oldvalue, (*length)[e]));
 			  _pred->set(w,e);
 			  break;
 			case Heap::IN_HEAP:
+			  {
 			    Value newvalue = OperationTraits::plus(oldvalue, (*length)[e]);
 			    if ( OperationTraits::less(newvalue, (*_heap)[w]) ) {
 			      _heap->decrease(w, newvalue);
 			      _pred->set(w,e);
+			    }
+			  }
 			  break;
 			case Heap::POST_HEAP:
 			  break;
+			}
 		        Node w=G->target(e);
 		        switch(_heap->state(w)) {
 		        case Heap::PRE_HEAP:
 		          _heap->push(w,OperationTraits::plus(oldvalue, (*length)[e]));
 		          _pred->set(w,e);
 		          break;
 		        case Heap::IN_HEAP:
+		          {
 		            Value newvalue = OperationTraits::plus(oldvalue, (*length)[e]);
 		            if ( OperationTraits::less(newvalue, (*_heap)[w]) ) {
 		              _heap->decrease(w, newvalue);
 		              _pred->set(w,e);
+		            }
+		          }
 		          break;
 		        case Heap::POST_HEAP:
 		          break;
+		        }
+		      }
@@ -657,3 +657,3 @@
 		    ///Next node to be processed.
 		    ///Next node to be processed.
@@ -663,6 +663,6 @@
 		    Node nextNode()
+		    {
+		    {
 		      return !_heap->empty()?_heap->top():INVALID;
+		    }
 		    ///\brief Returns \c false if there are nodes
@@ -678,3 +678,3 @@
 		    int queueSize() { return _heap->size(); }
 		    ///Executes the algorithm.
@@ -697,3 +697,3 @@
+		    }
 		    ///Executes the algorithm until \c dest is reached.
@@ -717,3 +717,3 @@
+		    }
 		    ///Executes the algorithm until a condition is met.
@@ -738,5 +738,5 @@
+		    }
 		    ///Runs %Dijkstra algorithm from node \c s.
 		    ///This method runs the %Dijkstra algorithm from a root node \c s
@@ -759,5 +759,5 @@
+		    }
 		    ///Finds the shortest path between \c s and \c t.
 		    ///Finds the shortest path between \c s and \c t.
@@ -779,3 +779,3 @@
+		    }
 		    ///@}
@@ -787,3 +787,3 @@
 		    ///either run() or start() must be called.
 		    ///@{
@@ -791,6 +791,6 @@
 		    ///Gives back the shortest path.
 		    ///Gives back the shortest path.
 		    ///\pre The \c t should be reachable from the source.
-		    Path path(Node t)
 		    Path path(Node t)
+		    {
@@ -834,4 +834,4 @@
 		    Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
 						  G->source((*_pred)[v]); }
 		                                  G->source((*_pred)[v]); }
 		    ///Returns a reference to the NodeMap of distances.
@@ -841,3 +841,3 @@
 		    const DistMap &distMap() const { return *_dist;}
 		    ///Returns a reference to the shortest path tree map.
@@ -848,3 +848,3 @@
 		    const PredMap &predMap() const { return *_pred;}
 		    ///Checks if a node is reachable from the root.
@@ -864,3 +864,3 @@
 		    bool processed(Node v) { return (*_heap_cross_ref)[v] == Heap::POST_HEAP; }
 		    ///@}
@@ -871,3 +871,3 @@
 		  ///Default traits class of Dijkstra function.
@@ -880,3 +880,3 @@
+		  {
-		    ///The digraph type the algorithm runs on.
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
@@ -903,7 +903,7 @@
 		    ///This function instantiates a \ref HeapCrossRef.
 		    /// \param G is the digraph, to which we would like to define the
 		    ///This function instantiates a \ref HeapCrossRef.
 		    /// \param G is the digraph, to which we would like to define the
 		    /// HeapCrossRef.
 		    /// \todo The digraph alone may be insufficient for the initialization
-		    static HeapCrossRef *createHeapCrossRef(const GR &G)
 		    static HeapCrossRef *createHeapCrossRef(const GR &G)
+		    {
@@ -911,3 +911,3 @@
+		    }
 		    ///The heap type used by Dijkstra algorithm.
@@ -919,5 +919,5 @@
 		    typedef BinHeap<typename LM::Value, typename GR::template NodeMap<int>,
-				    std::less<Value> > Heap;
+		                    std::less<Value> > Heap;
-		    static Heap *createHeap(HeapCrossRef& R)
 		    static Heap *createHeap(HeapCrossRef& R)
+		    {
@@ -928,3 +928,3 @@
 		    ///arcs of the shortest paths.
-		    ///
 		    ///
 		    ///The type of the map that stores the last
@@ -935,4 +935,4 @@
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param g is the digraph, to which we would like to define the PredMap.
@@ -940,5 +940,5 @@
 		#ifdef DOXYGEN
-		    static PredMap *createPredMap(const GR &g)
 		    static PredMap *createPredMap(const GR &g)
 		#else
-		    static PredMap *createPredMap(const GR &)
 		    static PredMap *createPredMap(const GR &)
 		#endif
@@ -948,3 +948,3 @@
 		    ///The type of the map that stores whether a nodes is processed.
 		    ///The type of the map that stores whether a nodes is processed.
@@ -957,4 +957,4 @@
 		    ///Instantiates a ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///\param g is the digraph, to which
@@ -970,3 +970,3 @@
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
@@ -976,4 +976,4 @@
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param g is the digraph, to which we would like to define the \ref DistMap
@@ -988,3 +988,3 @@
 		  };
 		  /// Default traits used by \ref DijkstraWizard
@@ -1020,3 +1020,3 @@
 		    /// Constructor.
 		    /// This constructor does not require parameters, therefore it initiates
@@ -1024,6 +1024,6 @@
 		    DijkstraWizardBase() : _g(0), _length(0), _pred(0),
-					   _dist(0), _source(INVALID) {}
+		                           _dist(0), _source(INVALID) {}
 		    /// Constructor.
 		    /// This constructor requires some parameters,
@@ -1035,4 +1035,4 @@
 		    DijkstraWizardBase(const GR &g,const LM &l, Node s=INVALID) :
 		      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
 		      _length(reinterpret_cast<void*>(const_cast<LM*>(&l))),
 		      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
 		      _length(reinterpret_cast<void*>(const_cast<LM*>(&l))),
 		      _pred(0), _dist(0), _source(s) {}
@@ -1040,3 +1040,3 @@
 		  };
 		  /// A class to make the usage of Dijkstra algorithm easier
@@ -1058,3 +1058,3 @@
 		  /// It does not have own \ref run method. When its \ref run method is called
-		  /// it initiates a plain \ref Dijkstra class, and calls the \ref
 		  /// it initiates a plain \ref Dijkstra class, and calls the \ref
 		  /// Dijkstra::run method of it.
@@ -1075,3 +1075,3 @@
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///The type of the map that stores the arc lengths.
@@ -1104,3 +1104,3 @@
 		    ///Runs Dijkstra algorithm from a given node.
 		    ///Runs Dijkstra algorithm from a given node.
@@ -1110,4 +1110,4 @@
 		      if(Base::_source==INVALID) throw UninitializedParameter();
 		      Dijkstra<Digraph,LengthMap,TR>
 			dij(*reinterpret_cast<const Digraph*>(Base::_g),
 		      Dijkstra<Digraph,LengthMap,TR>
 		        dij(*reinterpret_cast<const Digraph*>(Base::_g),
 		            *reinterpret_cast<const LengthMap*>(Base::_length));
@@ -1134,3 +1134,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -1142,3 +1142,3 @@
 		    template<class T>
-		    DijkstraWizard<DefPredMapBase<T> > predMap(const T &t)
 		    DijkstraWizard<DefPredMapBase<T> > predMap(const T &t)
+		    {
@@ -1147,3 +1147,3 @@
+		    }
 		    template<class T>
@@ -1154,3 +1154,3 @@
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
@@ -1162,3 +1162,3 @@
 		    template<class T>
-		    DijkstraWizard<DefDistMapBase<T> > distMap(const T &t)
 		    DijkstraWizard<DefDistMapBase<T> > distMap(const T &t)
+		    {
@@ -1167,3 +1167,3 @@
+		    }
 		    /// Sets the source node, from which the Dijkstra algorithm runs.
@@ -1172,3 +1172,3 @@
 		    /// \param s is the source node.
-		    DijkstraWizard<TR> &source(Node s)
 		    DijkstraWizard<TR> &source(Node s)
+		    {
@@ -1177,5 +1177,5 @@
+		    }
 		  };
 		  ///Function type interface for Dijkstra algorithm.

lemon/dim2.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
@@ -26,3 +26,3 @@
 		///\file
-		///\brief A simple two dimensional vector and a bounding box implementation
 		///\brief A simple two dimensional vector and a bounding box implementation
 		///
@@ -61,4 +61,4 @@
 		      ///Second coordinate
 		      T y;
 		      T y;
 		      ///Default constructor
@@ -72,3 +72,3 @@
 		      ///The dimension of the vector.
-		      ///This function always returns 2.
 		      ///This function always returns 2.
 		      int size() const { return 2; }
@@ -94,3 +94,3 @@
+		      }
 		      ///Increment the left hand side by \c u
@@ -101,3 +101,3 @@
+		      }
 		      ///Decrement the left hand side by \c u
@@ -122,3 +122,3 @@
+		      }
 		      ///Return the scalar product of two vectors
@@ -127,3 +127,3 @@
+		      }
 		      ///Return the sum of two vectors
@@ -171,3 +171,3 @@
-		  ///Return a Point
 		  ///Return a Point
@@ -261,3 +261,3 @@
@@ -272,3 +272,3 @@
 		    public:
 		      ///Default constructor: creates an empty bounding box
@@ -278,5 +278,5 @@
 		      BoundingBox(Point<T> a) { bottom_left=top_right=a; _empty = false; }
 		      ///Construct an instance from two points
 		      ///Construct an instance from two points.
@@ -288,7 +288,7 @@
+		      {
 			bottom_left=a;
 			top_right=b;
-			_empty = false;
+		        bottom_left=a;
 		        top_right=b;
 		        _empty = false;
+		      }
 		      ///Construct an instance from four numbers
@@ -301,12 +301,12 @@
 		      ///\warning The left side must be no more than the right side and
-		      ///bottom must be no more than the top.
 		      ///bottom must be no more than the top.
 		      BoundingBox(T l,T b,T r,T t)
+		      {
 			bottom_left=Point<T>(l,b);
 			top_right=Point<T>(r,t);
-			_empty = false;
+		        bottom_left=Point<T>(l,b);
 		        top_right=Point<T>(r,t);
 		        _empty = false;
+		      }
 		      ///Return \c true if the bounding box is empty.
 		      ///Return \c true if the bounding box is empty (i.e. return \c false
@@ -315,3 +315,3 @@
 		      ///
-		      ///The coordinates of an empty bounding box are not defined.
 		      ///The coordinates of an empty bounding box are not defined.
 		      bool empty() const {
@@ -319,3 +319,3 @@
+		      }
 		      ///Make the BoundingBox empty
@@ -338,3 +338,3 @@
 		      void bottomLeft(Point<T> p) {
-			bottom_left = p;
+		        bottom_left = p;
+		      }
@@ -354,3 +354,3 @@
 		      void topRight(Point<T> p) {
-			top_right = p;
+		        top_right = p;
+		      }
@@ -370,6 +370,6 @@
 		      void bottomRight(Point<T> p) {
 			top_right.x = p.x;
 			bottom_left.y = p.y;
 		        top_right.x = p.x;
 		        bottom_left.y = p.y;
+		      }
 		      ///Give back the top left corner of the box
@@ -387,4 +387,4 @@
 		      void topLeft(Point<T> p) {
 			top_right.y = p.y;
 			bottom_left.x = p.x;
 		        top_right.y = p.y;
 		        bottom_left.x = p.x;
+		      }
@@ -404,3 +404,3 @@
 		      void bottom(T t) {
-			bottom_left.y = t;
+		        bottom_left.y = t;
+		      }
@@ -420,3 +420,3 @@
 		      void top(T t) {
-			top_right.y = t;
+		        top_right.y = t;
+		      }
@@ -430,3 +430,3 @@
+		      }
 		      ///Set the left side of the box
@@ -436,3 +436,3 @@
 		      void left(T t) {
-			bottom_left.x = t;
+		        bottom_left.x = t;
+		      }
@@ -452,3 +452,3 @@
 		      void right(T t) {
-			top_right.x = t;
+		        top_right.x = t;
+		      }
@@ -480,3 +480,3 @@
+		      }
 		      ///Increments a bounding box with a point
@@ -498,5 +498,5 @@
+		      }
 		      ///Increments a bounding box to contain another bounding box
 		      ///Increments a bounding box to contain another bounding box.
@@ -506,3 +506,3 @@
 		          this->add(u.bottomLeft());
-			  this->add(u.topRight());
+		          this->add(u.topRight());
+		        }
@@ -510,3 +510,3 @@
+		      }
 		      ///Intersection of two bounding boxes
@@ -518,11 +518,11 @@
 		        if (this->_empty || u._empty) {
 			  b._empty = true;
 			} else {
 			  b.bottom_left.x = std::max(this->bottom_left.x,u.bottom_left.x);
 			  b.bottom_left.y = std::max(this->bottom_left.y,u.bottom_left.y);
 			  b.top_right.x = std::min(this->top_right.x,u.top_right.x);
 			  b.top_right.y = std::min(this->top_right.y,u.top_right.y);
 			  b._empty = b.bottom_left.x > b.top_right.x ||
 			             b.bottom_left.y > b.top_right.y;
+			}
+		          b._empty = true;
 		        } else {
 		          b.bottom_left.x = std::max(this->bottom_left.x,u.bottom_left.x);
 		          b.bottom_left.y = std::max(this->bottom_left.y,u.bottom_left.y);
 		          b.top_right.x = std::min(this->top_right.x,u.top_right.x);
 		          b.top_right.y = std::min(this->top_right.y,u.top_right.y);
 		          b._empty = b.bottom_left.x > b.top_right.x ||
 		                     b.bottom_left.y > b.top_right.y;
+		        }
 		        return b;
@@ -539,3 +539,3 @@
 		  template<class M>
-		  class XMap
 		  class XMap
+		  {
@@ -551,3 +551,3 @@
 		  };
 		  ///Returns an \ref XMap class
@@ -558,4 +558,4 @@
 		  ///\relates XMap
 		  template<class M>
 		  inline XMap<M> xMap(M &m)
 		  template<class M>
 		  inline XMap<M> xMap(M &m)
+		  {
@@ -564,4 +564,4 @@
 		  template<class M>
 		  inline XMap<M> xMap(const M &m)
 		  template<class M>
 		  inline XMap<M> xMap(const M &m)
+		  {
@@ -576,3 +576,3 @@
 		  template<class M>
-		  class ConstXMap
 		  class ConstXMap
+		  {
@@ -587,3 +587,3 @@
 		  };
 		  ///Returns a \ref ConstXMap class
@@ -594,4 +594,4 @@
 		  ///\relates ConstXMap
 		  template<class M>
 		  inline ConstXMap<M> xMap(const M &m)
 		  template<class M>
 		  inline ConstXMap<M> xMap(const M &m)
+		  {
@@ -601,3 +601,3 @@
 		  ///Map of y-coordinates of a \ref Point "Point"-map
 		  ///\ingroup maps
@@ -606,3 +606,3 @@
 		  template<class M>
-		  class YMap
 		  class YMap
+		  {
@@ -625,4 +625,4 @@
 		  ///\relates YMap
 		  template<class M>
 		  inline YMap<M> yMap(M &m)
 		  template<class M>
 		  inline YMap<M> yMap(M &m)
+		  {
@@ -631,4 +631,4 @@
 		  template<class M>
 		  inline YMap<M> yMap(const M &m)
 		  template<class M>
 		  inline YMap<M> yMap(const M &m)
+		  {
@@ -643,3 +643,3 @@
 		  template<class M>
-		  class ConstYMap
 		  class ConstYMap
+		  {
@@ -654,3 +654,3 @@
 		  };
 		  ///Returns a \ref ConstYMap class
@@ -661,4 +661,4 @@
 		  ///\relates ConstYMap
 		  template<class M>
 		  inline ConstYMap<M> yMap(const M &m)
 		  template<class M>
 		  inline ConstYMap<M> yMap(const M &m)
+		  {
@@ -675,3 +675,3 @@
 		  template<class M>
-		  class NormSquareMap
 		  class NormSquareMap
+		  {
@@ -686,3 +686,3 @@
 		  };
 		  ///Returns a \ref NormSquareMap class
@@ -693,4 +693,4 @@
 		  ///\relates NormSquareMap
 		  template<class M>
 		  inline NormSquareMap<M> normSquareMap(const M &m)
 		  template<class M>
 		  inline NormSquareMap<M> normSquareMap(const M &m)
+		  {
@@ -702,3 +702,3 @@
 		  } //namespce dim2
 		} //namespace lemon

Changeset was too big and was cut off... Show full diff

0 comments (0 inline)

RhodeCode

Login to your account

Changeset was too big and was cut off... Show full diff

Changeset was too big and was cut off... Show full diff