LEMON/LEMON-main Changeset - r209:765619b7cbb2

Repositories » LEMON » LEMON-main

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

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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -65,5 +65,5 @@
 		  ap.other("infile", "The input file.")
 		    .other("...");
 		  // Perform the parsing process
 		  // (in case of any error it terminates the program)
@@ -85,5 +85,5 @@
 		  if(ap.given("grb")) std::cout << "  -grb is given\n";
 		  if(ap.given("grc")) std::cout << "  -grc is given\n";
 		  switch(ap.files().size()) {
 		  case 0:
@@ -95,9 +95,9 @@
 		  default:
 		    std::cout << "  "
-			      << ap.files().size() << " file arguments were given. They are:\n";
+		              << ap.files().size() << " file arguments were given. They are:\n";
+		  }
 		  for(unsigned int i=0;i<ap.files().size();++i)
 		    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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -50,5 +50,5 @@
 		  typedef ListDigraph::Arc Arc;
 		  typedef dim2::Point<int> Point;
 		  Node n1=g.addNode();
 		  Node n2=g.addNode();
@@ -63,5 +63,5 @@
 		  ListDigraph::ArcMap<int> acolors(g);
 		  ListDigraph::ArcMap<int> widths(g);
 		  coords[n1]=Point(50,50);  sizes[n1]=1; colors[n1]=1; shapes[n1]=0;
 		  coords[n2]=Point(50,70);  sizes[n2]=2; colors[n2]=2; shapes[n2]=2;
@@ -69,5 +69,5 @@
 		  coords[n4]=Point(70,50);  sizes[n4]=2; colors[n4]=4; shapes[n4]=1;
 		  coords[n5]=Point(85,60);  sizes[n5]=3; colors[n5]=5; shapes[n5]=2;
 		  Arc a;
@@ -79,5 +79,5 @@
 		  a=g.addArc(n2,n4); acolors[a]=1; widths[a]=2;
 		  a=g.addArc(n3,n4); acolors[a]=2; widths[a]=1;
 		  IdMap<ListDigraph,Node> id(g);
@@ -183,5 +183,5 @@
 		  ListDigraph::NodeMap<int> hcolors(h);
 		  ListDigraph::NodeMap<Point> hcoords(h);
 		  int cols=int(sqrt(double(palette.size())));
 		  for(int i=0;i<int(paletteW.size());i++) {
@@ -190,5 +190,5 @@
 		    hcolors[n]=i;
+		  }
 		  cout << "Create 'graph_to_eps_demo_out_6_colors.eps'" << endl;
 		  graphToEps(h,"graph_to_eps_demo_out_6_colors.eps").
@@ -203,5 +203,5 @@
 		    nodeColors(composeMap(paletteW,hcolors)).
 		    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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -22,5 +22,5 @@
 		///
 		/// 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.
 		///
@@ -43,5 +43,5 @@
 		  SmartDigraph::ArcMap<int> cap(g);
 		  SmartDigraph::Node s, t;
 		  try {
 		    digraphReader("digraph.lgf", g). // read the directed graph into g

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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -19,5 +19,5 @@
 		/*!
-		\page coding_style LEMON Coding Style
 		\page coding_style LEMON Coding Style
 		\section naming_conv Naming Conventions
@@ -69,5 +69,5 @@
 		\code
-		AllWordsCapitalizedWithoutUnderscores
 		AllWordsCapitalizedWithoutUnderscores
 		\endcode
@@ -77,5 +77,5 @@
 		\code
-		firstWordLowerCaseRestCapitalizedWithoutUnderscores
 		firstWordLowerCaseRestCapitalizedWithoutUnderscores
 		\endcode
@@ -85,13 +85,13 @@
 		\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
 		The names of class and instance member variables and auto variables (=variables used locally in methods) should look like the following.
 		\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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -75,5 +75,5 @@
 		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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -27,8 +27,8 @@
 		\brief Graph structures implemented in LEMON.
 		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.
 		The most efficient implementation of diverse applications require the
@@ -41,19 +41,19 @@
 		some graph features like arc/edge or node deletion.
 		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.
 		You are free to use the graph structure that fit your requirements
 		the best, most graph algorithms and auxiliary data structures can be used
-		with any graph structures.
 		with any graph structures.
 		*/
@@ -64,10 +64,10 @@
 		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.
 		*/
 		/**
-		@defgroup maps Maps
 		@defgroup maps Maps
 		@ingroup datas
 		\brief Map structures implemented in LEMON.
@@ -80,5 +80,5 @@
 		/**
-		@defgroup graph_maps Graph Maps
 		@defgroup graph_maps Graph Maps
 		@ingroup maps
 		\brief Special graph-related maps.
@@ -116,12 +116,12 @@
+		    }
+		  }
 		  Digraph::NodeMap<int> degree_map(graph);
 		  digraphToEps(graph, "graph.eps")
 		    .coords(coords).scaleToA4().undirected()
 		    .nodeColors(composeMap(functorToMap(nodeColor), degree_map))
 		    .run();
-		\endcode
 		\endcode
 		The \c functorToMap() function makes an \c int to \c Color map from the
 		\e nodeColor() function. The \c composeMap() compose the \e degree_map
@@ -141,5 +141,5 @@
 		  typedef DivMap<DoubleArcMap, DoubleArcMap> TimeMap;
 		  TimeMap time(length, speed);
 		  Dijkstra<Digraph, TimeMap> dijkstra(graph, time);
 		  dijkstra.run(source, target);
@@ -153,5 +153,5 @@
 		/**
-		@defgroup matrices Matrices
 		@defgroup matrices Matrices
 		@ingroup datas
 		\brief Two dimensional data storages implemented in LEMON.
@@ -201,5 +201,5 @@
 		\brief Common graph search algorithms.
-		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).
 		*/
@@ -213,7 +213,7 @@
 		*/
 		/**
 		@defgroup max_flow Maximum Flow algorithms
-		@ingroup algs
+		/**
 		@defgroup max_flow Maximum Flow algorithms
 		@ingroup algs
 		\brief Algorithms for finding maximum flows.
@@ -232,5 +232,5 @@
 		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"
 		- \ref lemon::DinitzSleatorTarjan "Dinitz's blocking flow algorithm with dynamic trees"
@@ -251,10 +251,10 @@
 		This group describes the algorithms for finding minimum cost flows and
-		circulations.
 		circulations.
 		*/
 		/**
 		@defgroup min_cut Minimum Cut algorithms
 		@ingroup algs
 		@defgroup min_cut Minimum Cut algorithms
 		@ingroup algs
 		\brief Algorithms for finding minimum cut in graphs.
@@ -273,5 +273,5 @@
 		- \ref lemon::HaoOrlin "Hao-Orlin algorithm" to calculate minimum cut
-		  in directed graphs
 		  in directed graphs
 		- \ref lemon::NagamochiIbaraki "Nagamochi-Ibaraki algorithm" to
 		  calculate minimum cut in undirected graphs
@@ -308,5 +308,5 @@
 		/**
-		@defgroup matching Matching algorithms
 		@defgroup matching Matching algorithms
 		@ingroup algs
 		\brief Algorithms for finding matchings in graphs and bipartite graphs.
@@ -315,5 +315,5 @@
 		matchings in graphs and bipartite graphs. The general matching problem is
 		finding a subset of the arcs which does not shares common endpoints.
 		There are several different algorithms for calculate matchings in
 		graphs.  The matching problems in bipartite graphs are generally
@@ -324,14 +324,14 @@
 		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
 		- \ref lemon::MaxMatching "MaxMatching" Edmond's blossom shrinking algorithm
@@ -397,6 +397,6 @@
 		*/
 		/**
 		@defgroup lp_utils Tools for Lp and Mip solvers
 		/**
 		@defgroup lp_utils Tools for Lp and Mip solvers
 		@ingroup lp_group
 		\brief Helper tools to the Lp and Mip solvers.
@@ -415,5 +415,5 @@
 		/**
-		@defgroup utils Tools and Utilities
 		@defgroup utils Tools and Utilities
 		\brief Tools and utilities for programming in LEMON
@@ -468,5 +468,5 @@
 		\brief Graph Input-Output methods
-		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
 		\c DIMACS format and the encapsulated postscript (EPS) format.
@@ -487,5 +487,5 @@
 		This group describes general \c EPS drawing methods and special
-		graph exporting tools.
 		graph exporting tools.
 		*/
@@ -499,5 +499,5 @@
 		The purpose of the classes in this group is fourfold.
 		- These classes contain the documentations of the concepts. In order
 		  to avoid document multiplications, an implementation of a concept
@@ -552,8 +552,8 @@
 		@defgroup tools Standalone utility applications
-		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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -44,5 +44,5 @@
 		while a quoted token is a
 		character sequence surrounded by double quotes, and it can also
-		contain whitespaces and escape sequences.
 		contain whitespaces and escape sequences.
 		The \c \@nodes section describes a set of nodes and associated
@@ -73,5 +73,5 @@
 		\code
 		 @arcs
-		 	      capacity
+		               capacity
 2   16
 3   12

doc/license.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.
 *
 * Copyright (C) 2003-2008

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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -42,13 +42,13 @@
 		\subsection howtoread How to read the documentation
-		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
 		"Quick Tour to LEMON" which will guide you along.
-		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

/* -*- 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.
 *
 * Copyright (C) 2003-2008

doc/template.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.
 *
 * Copyright (C) 2003-2008

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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -39,28 +39,28 @@
 		    for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
 		      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)
+		  {
 		    ParData p;
@@ -75,6 +75,6 @@
 		  ArgParser &ArgParser::doubleOption(const std::string &name,
 					       const std::string &help,
 					       double value, bool obl)
 		                               const std::string &help,
 		                               double value, bool obl)
+		  {
 		    ParData p;
@@ -89,6 +89,6 @@
 		  ArgParser &ArgParser::boolOption(const std::string &name,
 					       const std::string &help,
 					       bool value, bool obl)
 		                               const std::string &help,
 		                               bool value, bool obl)
+		  {
 		    ParData p;
@@ -103,6 +103,6 @@
 		  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)
+		  {
 		    ParData p;
@@ -117,6 +117,6 @@
 		  ArgParser &ArgParser::refOption(const std::string &name,
 					       const std::string &help,
 					       int &ref, bool obl)
 		                               const std::string &help,
 		                               int &ref, bool obl)
+		  {
 		    ParData p;
@@ -162,6 +162,6 @@
 		  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)
+		  {
 		    ParData p;
@@ -176,6 +176,6 @@
 		  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)
+		  {
 		    ParData p;
@@ -191,9 +191,9 @@
 		  ArgParser &ArgParser::optionGroup(const std::string &group,
-						    const std::string &opt)
+		                                    const std::string &opt)
+		  {
 		    Opts::iterator i = _opts.find(opt);
 		    LEMON_ASSERT(i!=_opts.end(), "Unknown option: '"+opt+"'");
-		    LEMON_ASSERT(!(i->second.ingroup),
 		    LEMON_ASSERT(!(i->second.ingroup),
 		                 "Option already in option group: '"+opt+"'");
 		    GroupData &g=_groups[group];
@@ -211,5 +211,5 @@
 		  ArgParser &ArgParser::synonym(const std::string &syn,
-						const std::string &opt)
+		                                const std::string &opt)
+		  {
 		    Opts::iterator o = _opts.find(opt);
@@ -234,5 +234,5 @@
 		  ArgParser &ArgParser::other(const std::string &name,
-					      const std::string &help)
+		                              const std::string &help)
+		  {
 		    _others_help.push_back(OtherArg(name,help));
@@ -245,6 +245,6 @@
 		    if(i->second.has_syn)
 		      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) {
 		    case STRING:
@@ -271,5 +271,5 @@
+		    }
+		  }
 		  void ArgParser::showHelp(Opts::iterator i)
+		  {
@@ -284,7 +284,7 @@
 		    if(i->help.size()==0) return;
 		    std::cerr << "  " << i->name << std::endl
-			      << "     " << i->help << std::endl;
+		              << "     " << i->help << std::endl;
+		  }
 		  void ArgParser::shortHelp()
+		  {
@@ -300,6 +300,6 @@
 		      if(!g->second.mandatory) cstr << ']';
 		      if(pos+cstr.str().size()>LINE_LEN) {
 			std::cerr << std::endl << indent;
 			pos=indent.size();
 		        std::cerr << std::endl << indent;
 		        pos=indent.size();
+		      }
 		      std::cerr << cstr.str();
@@ -308,32 +308,32 @@
 		    for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
 		      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();
+		      }
 		    std::cerr << std::endl;
+		  }
 		  void ArgParser::showHelp()
+		  {
@@ -341,11 +341,11 @@
 		    std::cerr << "Where:\n";
 		    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);
 		    exit(1);
+		  }
-		  void ArgParser::unknownOpt(std::string arg)
 		  void ArgParser::unknownOpt(std::string arg)
+		  {
 		    std::cerr << "\nUnknown option: " << arg << "\n";
@@ -354,6 +354,6 @@
 		    exit(1);
+		  }
 		  void ArgParser::requiresValue(std::string arg, OptType t)
 		  void ArgParser::requiresValue(std::string arg, OptType t)
+		  {
 		    std::cerr << "Argument '" << arg << "' requires a";
@@ -374,5 +374,5 @@
 		    showHelp();
+		  }
 		  void ArgParser::checkMandatories()
@@ -380,39 +380,39 @@
 		    bool ok=true;
 		    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);
+		    }
@@ -424,36 +424,36 @@
 		      std::string arg(_argv[ar]);
 		      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;
+		        }
+		      }
+		    }
@@ -461,5 +461,5 @@
 		    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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -42,25 +42,25 @@
 		  ///For a complete example see the \ref arg_parser_demo.cc demo file.
 		  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 {
 		    public:
 		      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;
 		      };
 		      std::string help;
@@ -73,5 +73,5 @@
 		      bool self_delete;
 		      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) {}
 		    };
@@ -79,5 +79,5 @@
 		    Opts _opts;
-		    class GroupData
 		    class GroupData
+		    {
 		    public:
@@ -88,5 +88,5 @@
 		      GroupData() :only_one(false), mandatory(false) {}
 		    };
 		    typedef std::map<std::string,GroupData> Groups;
 		    Groups _groups;
@@ -99,10 +99,10 @@
 		    };
 		    std::vector<OtherArg> _others_help;
 		    std::vector<std::string> _file_args;
 		    std::string _command_name;
 		  private:
 		    //Bind a function to an option.
@@ -114,7 +114,7 @@
 		    //\param data Data to be passed to \c func
 		    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:
@@ -137,6 +137,6 @@
 		    ///\param obl Indicate if the option is mandatory.
 		    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);
 		    ///Add a new floating point type option
@@ -148,6 +148,6 @@
 		    ///\param obl Indicate if the option is mandatory.
 		    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);
 		    ///Add a new bool type option
@@ -160,6 +160,6 @@
 		    ///\note A mandatory bool obtion is of very little use.
 		    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);
 		    ///Add a new string type option
@@ -171,6 +171,6 @@
 		    ///\param obl Indicate if the option is mandatory.
 		    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);
 		    ///Give help string for non-parsed arguments.
@@ -180,6 +180,6 @@
 		    ///\c help gives a more detailed description.
 		    ArgParser &other(const std::string &name,
 				     const std::string &help="");
 		                     const std::string &help="");
 		    ///@}
@@ -198,6 +198,6 @@
 		    ///\retval ref The value of the argument will be written to this variable.
 		    ArgParser &refOption(const std::string &name,
 				    const std::string &help,
 				    int &ref, bool obl=false);
 		                    const std::string &help,
 		                    int &ref, bool obl=false);
 		    ///Add a new floating type option with a storage reference
@@ -209,6 +209,6 @@
 		    ///\retval ref The value of the argument will be written to this variable.
 		    ArgParser &refOption(const std::string &name,
 				      const std::string &help,
 				      double &ref, bool obl=false);
 		                      const std::string &help,
 		                      double &ref, bool obl=false);
 		    ///Add a new bool type option with a storage reference
@@ -221,6 +221,6 @@
 		    ///\note A mandatory bool obtion is of very little use.
 		    ArgParser &refOption(const std::string &name,
 				      const std::string &help,
 				      bool &ref, bool obl=false);
 		                      const std::string &help,
 		                      bool &ref, bool obl=false);
 		    ///Add a new string type option with a storage reference
@@ -232,12 +232,12 @@
 		    ///\retval ref The value of the argument will be written to this variable.
 		    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);
 		    ///@}
 		    ///\name Option Groups and Synonyms
 		    ///
 		    ///@{
@@ -249,5 +249,5 @@
 		    ///\param opt The option name.
 		    ArgParser &optionGroup(const std::string &group,
-					   const std::string &opt);
+		                           const std::string &opt);
 		    ///Make the members of a group exclusive
@@ -256,5 +256,5 @@
 		    ///given at the same time.
 		    ArgParser &onlyOneGroup(const std::string &group);
 		    ///Make a group mandatory
@@ -262,5 +262,5 @@
 		    ///must be given.
 		    ArgParser &mandatoryGroup(const std::string &group);
 		    ///Create synonym to an option
@@ -268,6 +268,6 @@
 		    ///option \c opt.
 		    ArgParser &synonym(const std::string &syn,
 					   const std::string &opt);
 		                           const std::string &opt);
 		    ///@}
@@ -283,19 +283,19 @@
 		    void requiresValue(std::string arg, OptType t);
 		    void checkMandatories();
 		    ///Start the parsing process
 		    ArgParser &parse();
 		    /// Synonym for parse()
-		    ArgParser &run()
 		    ArgParser &run()
+		    {
 		      return parse();
+		    }
 		    ///Give back the command name (the 0th argument)
 		    const std::string &commandName() { return _command_name; }
 		    ///Check if an opion has been given to the command.
-		    bool given(std::string op)
 		    bool given(std::string op)
+		    {
 		      Opts::iterator i = _opts.find(op);
@@ -305,10 +305,10 @@
 		    ///Magic type for operator[]
 		    ///This is the type of the return value of ArgParser::operator[]().
 		    ///It automatically converts to \c int, \c double, \c bool or
 		    ///\c std::string if the type of the option matches, otherwise it
 		    ///throws an exception (i.e. it performs runtime type checking).
-		    class RefType
 		    class RefType
+		    {
 		      ArgParser &_parser;
@@ -318,44 +318,44 @@
 		      RefType(ArgParser &p,const std::string &n) :_parser(p),_name(n) {}
 		      ///\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);
+		      }
 		      ///\e
 		      operator std::string()
+		      {
 			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);
+		      }
@@ -363,5 +363,5 @@
 		    ///Give back the value of an option
 		    ///Give back the value of an option.
 		    ///\sa RefType
@@ -369,5 +369,5 @@
+		    {
 		      return RefType(*this, n);
+		    }
+		    }
 		    ///Give back the non-option type arguments.
@@ -376,5 +376,5 @@
 		    ///not starting with a '-' character.
 		    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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -29,5 +29,5 @@
 		  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)
+		  {
 		    std::cerr << file << ":" << line << ": ";
@@ -41,6 +41,6 @@
 		  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)
+		  {
 		    assert_fail_log(file, line, function, message, assertion);
@@ -49,6 +49,6 @@
 		  namespace _assert_bits {
 		    inline const char* cstringify(const std::string& str) {
 		      return str.c_str();
@@ -57,5 +57,5 @@
 		    inline const char* cstringify(const char* str) {
 		      return str;
+		    }
+		    }
+		  }
+		}
@@ -67,15 +67,15 @@
 		#undef LEMON_DEBUG
 		#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) +		\
 		  (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +		\
 		#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) +                \
 		  (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +                \
 		  (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) > 1
 		#error "LEMON assertion system is not set properly"
 		#endif
 		#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) +		\
 		     (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +		\
 		     (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 ||	\
 		     defined(LEMON_ENABLE_ASSERTS)) &&			\
-		  (defined(LEMON_DISABLE_ASSERTS) ||			\
+		#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) +                \
 		     (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +                \
 		     (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 ||        \
 		     defined(LEMON_ENABLE_ASSERTS)) &&                        \
 		  (defined(LEMON_DISABLE_ASSERTS) ||                        \
 		   defined(NDEBUG))
 		#error "LEMON assertion system is not set properly"
@@ -137,10 +137,10 @@
 		/// \endcode
 		/// The checking is also disabled when the standard macro \c NDEBUG is defined.
-		///
 		///
 		/// The LEMON assertion system has a wide range of customization
 		/// properties. As a default behaviour the failed assertion prints a
 		/// short log message to the standard error and aborts the execution.
 		///
-		/// The following modes can be used in the assertion system:
 		/// The following modes can be used in the assertion system:
 		///
 		/// - \c LEMON_ASSERT_LOG The failed assertion prints a short log
@@ -156,5 +156,5 @@
 		///   \endcode
 		///   The name of the function should be defined as the \c
-		///   LEMON_CUSTOM_ASSERT_HANDLER macro name.
 		///   LEMON_CUSTOM_ASSERT_HANDLER macro name.
 		///   \code
 		///     #define LEMON_CUSTOM_ASSERT_HANDLER custom_assert_handler
@@ -167,9 +167,9 @@
 		/// \ref lemon/assert.h "assert.h" file is reincluded, then the
 		/// 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)))
 		/// \ingroup exceptions
@@ -183,9 +183,9 @@
 		/// \endcode
 		///
 		/// \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)))
 		/// \ingroup exceptions
@@ -211,10 +211,10 @@
 		/// macro.
 		///
 		/// \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)))
 		#else
@@ -225,14 +225,14 @@
 		#    define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
 		#  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)))
 		#    if LEMON_ENABLE_DEBUG
@@ -241,6 +241,6 @@
 		           LEMON_ASSERT_HANDLER(__FILE__, __LINE__,  \
 		                                LEMON_FUNCTION_NAME, \
 						::lemon::_assert_bits::cstringify(msg),	\
 						#exp), 0)))
 		                                ::lemon::_assert_bits::cstringify(msg),        \
 		                                #exp), 0)))
 		#    else
 		#      define LEMON_DEBUG(exp, msg) (static_cast<void>(0))

lemon/base.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.
 *
 * Copyright (C) 2003-2008

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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -34,5 +34,5 @@
 		  ///Default traits class of Bfs class.
@@ -42,9 +42,9 @@
 		  struct BfsDefaultTraits
+		  {
-		    ///The digraph type the algorithm runs on.
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
-		    ///
 		    ///
 		    ///The type of the map that stores the last
 		    ///arcs of the shortest paths.
@@ -53,14 +53,14 @@
 		    typedef typename Digraph::template NodeMap<typename GR::Arc> PredMap;
 		    ///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)
+		    {
 		      return new PredMap(G);
+		    }
 		    ///The type of the map that indicates which nodes are processed.
 		    ///The type of the map that indicates which nodes are processed.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -68,6 +68,6 @@
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///\param g is the digraph, to which
 		    ///we would like to define the \ref ProcessedMap
@@ -81,5 +81,5 @@
+		    }
 		    ///The type of the map that indicates which nodes are reached.
 		    ///The type of the map that indicates which nodes are reached.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -87,6 +87,6 @@
 		    typedef typename Digraph::template NodeMap<bool> ReachedMap;
 		    ///Instantiates a ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///\param G is the digraph, to which
 		    ///we would like to define the \ref ReachedMap.
@@ -96,5 +96,5 @@
+		    }
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -102,6 +102,6 @@
 		    typedef typename Digraph::template NodeMap<int> DistMap;
 		    ///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
 		    static DistMap *createDistMap(const GR &G)
@@ -110,7 +110,7 @@
+		    }
 		  };
 		  ///%BFS algorithm class.
 		  ///\ingroup search
 		  ///This class provides an efficient implementation of the %BFS algorithm.
@@ -127,8 +127,8 @@
 		#ifdef DOXYGEN
 		  template <typename GR,
-			    typename TR>
+		            typename TR>
 		#else
 		  template <typename GR=ListDigraph,
-			    typename TR=BfsDefaultTraits<GR> >
+		            typename TR=BfsDefaultTraits<GR> >
 		#endif
 		  class Bfs {
@@ -143,5 +143,5 @@
 		    public:
 		      virtual const char* what() const throw() {
-			return "lemon::Bfs::UninitializedParameter";
+		        return "lemon::Bfs::UninitializedParameter";
+		      }
 		    };
@@ -150,5 +150,5 @@
 		    ///The type of the underlying digraph.
 		    typedef typename TR::Digraph Digraph;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
@@ -191,32 +191,32 @@
 		    ///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);
+		      }
+		    }
 		  protected:
 		    Bfs() {}
 		  public:
 		    typedef Bfs Create;
@@ -228,7 +228,7 @@
 		    struct DefPredMapTraits : public Traits {
 		      typedef T PredMap;
-		      static PredMap *createPredMap(const Digraph &)
 		      static PredMap *createPredMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
 		    };
@@ -239,14 +239,14 @@
 		    ///
 		    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>
 		    struct DefDistMapTraits : public Traits {
 		      typedef T DistMap;
-		      static DistMap *createDistMap(const Digraph &)
 		      static DistMap *createDistMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
 		    };
@@ -257,14 +257,14 @@
 		    ///
 		    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>
 		    struct DefReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
-		      static ReachedMap *createReachedMap(const Digraph &)
 		      static ReachedMap *createReachedMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
 		    };
@@ -275,14 +275,14 @@
 		    ///
 		    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>
 		    struct DefProcessedMapTraits : public Traits {
 		      typedef T ProcessedMap;
-		      static ProcessedMap *createProcessedMap(const Digraph &)
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
-			throw UninitializedParameter();
+		        throw UninitializedParameter();
+		      }
 		    };
@@ -296,10 +296,10 @@
 		      typedef Bfs< 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);
+		      }
 		    };
@@ -312,14 +312,14 @@
 		    template <class T>
 		    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.
 		    ///
@@ -331,7 +331,7 @@
 		      _processed(NULL), local_processed(false)
 		    { }
 		    ///Destructor.
-		    ~Bfs()
 		    ~Bfs()
+		    {
 		      if(local_pred) delete _pred;
@@ -348,9 +348,9 @@
 		    ///automatically allocated map, of course.
 		    ///\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;
+		      }
 		      _pred = &m;
@@ -365,9 +365,9 @@
 		    ///automatically allocated map, of course.
 		    ///\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;
+		      }
 		      _reached = &m;
@@ -382,9 +382,9 @@
 		    ///automatically allocated map, of course.
 		    ///\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;
+		      }
 		      _processed = &m;
@@ -399,9 +399,9 @@
 		    ///automatically allocated map, of course.
 		    ///\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;
+		      }
 		      _dist = &m;
@@ -433,10 +433,10 @@
 		      _curr_dist=1;
 		      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.
@@ -446,13 +446,13 @@
+		    {
 		      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.
@@ -465,6 +465,6 @@
+		    {
 		      if(_queue_tail==_queue_next_dist) {
 			_curr_dist++;
 			_queue_next_dist=_queue_head;
 		        _curr_dist++;
 		        _queue_next_dist=_queue_head;
+		      }
 		      Node n=_queue[_queue_tail++];
@@ -472,10 +472,10 @@
 		      Node m;
 		      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;
+		    }
@@ -496,6 +496,6 @@
+		    {
 		      if(_queue_tail==_queue_next_dist) {
 			_curr_dist++;
 			_queue_next_dist=_queue_head;
 		        _curr_dist++;
 		        _queue_next_dist=_queue_head;
+		      }
 		      Node n=_queue[_queue_tail++];
@@ -503,11 +503,11 @@
 		      Node m;
 		      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;
+		    }
@@ -529,6 +529,6 @@
+		    {
 		      if(_queue_tail==_queue_next_dist) {
 			_curr_dist++;
 			_queue_next_dist=_queue_head;
 		        _curr_dist++;
 		        _queue_next_dist=_queue_head;
+		      }
 		      Node n=_queue[_queue_tail++];
@@ -536,14 +536,14 @@
 		      Node m;
 		      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.
@@ -553,8 +553,8 @@
 		    /// empty.
 		    Node nextNode()
+		    {
+		    {
 		      return _queue_tail<_queue_head?_queue[_queue_tail]:INVALID;
+		    }
 		    ///\brief Returns \c false if there are nodes
 		    ///to be processed in the queue
@@ -564,8 +564,8 @@
 		    bool emptyQueue() { return _queue_tail==_queue_head; }
 		    ///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.
@@ -585,5 +585,5 @@
 		      while ( !emptyQueue() ) processNextNode();
+		    }
 		    ///Executes the algorithm until \c dest is reached.
@@ -603,5 +603,5 @@
 		      while ( !emptyQueue() && !reach ) processNextNode(dest, reach);
+		    }
 		    ///Executes the algorithm until a condition is met.
@@ -622,11 +622,11 @@
 		      Node rnode = INVALID;
 		      while ( !emptyQueue() && rnode == INVALID ) {
-			processNextNode(nm, rnode);
+		        processNextNode(nm, rnode);
+		      }
 		      return rnode;
+		    }
 		    ///Runs %BFS algorithm from node \c s.
 		    ///This method runs the %BFS algorithm from a root node \c s
 		    ///in order to
@@ -647,7 +647,7 @@
 		      start();
+		    }
 		    ///Finds the shortest path between \c s and \c t.
 		    ///Finds the shortest path between \c s and \c t.
 		    ///
@@ -667,5 +667,5 @@
 		      return reached(t) ? _curr_dist : 0;
+		    }
 		    ///@}
@@ -675,5 +675,5 @@
 		    ///Before the use of these functions,
 		    ///either run() or start() must be calleb.
 		    ///@{
@@ -681,8 +681,8 @@
 		    ///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)
+		    {
 		      return Path(*G, *_pred, t);
@@ -723,6 +723,6 @@
 		    ///using this function.
 		    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.
@@ -731,5 +731,5 @@
 		    ///be called before using this function.
 		    const DistMap &distMap() const { return *_dist;}
 		    ///Returns a reference to the shortest path tree map.
@@ -739,5 +739,5 @@
 		    ///must be called before using this function.
 		    const PredMap &predMap() const { return *_pred;}
 		    ///Checks if a node is reachable from the root.
@@ -748,5 +748,5 @@
 		    ///
 		    bool reached(Node v) { return (*_reached)[v]; }
 		    ///@}
 		  };
@@ -759,9 +759,9 @@
 		  struct BfsWizardDefaultTraits
+		  {
-		    ///The digraph type the algorithm runs on.
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
-		    ///
 		    ///
 		    ///The type of the map that stores the last
 		    ///arcs of the shortest paths.
@@ -770,12 +770,12 @@
 		    typedef NullMap<typename Digraph::Node,typename GR::Arc> PredMap;
 		    ///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
 		#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
+		    {
@@ -784,5 +784,5 @@
 		    ///The type of the map that indicates which nodes are processed.
 		    ///The type of the map that indicates which nodes are processed.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -790,6 +790,6 @@
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///\param g is the digraph, to which
 		    ///we would like to define the \ref ProcessedMap
@@ -803,5 +803,5 @@
+		    }
 		    ///The type of the map that indicates which nodes are reached.
 		    ///The type of the map that indicates which nodes are reached.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -809,6 +809,6 @@
 		    typedef typename Digraph::template NodeMap<bool> ReachedMap;
 		    ///Instantiates a ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///\param G is the digraph, to which
 		    ///we would like to define the \ref ReachedMap.
@@ -818,5 +818,5 @@
+		    }
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -824,6 +824,6 @@
 		    typedef NullMap<typename Digraph::Node,int> DistMap;
 		    ///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
 		#ifdef DOXYGEN
@@ -836,5 +836,5 @@
+		    }
 		  };
 		  /// Default traits used by \ref BfsWizard
@@ -866,15 +866,15 @@
 		    ///Pointer to the source node.
 		    Node _source;
 		    public:
 		    /// Constructor.
 		    /// This constructor does not require parameters, therefore it initiates
 		    /// all of the attributes to default values (0, INVALID).
 		    BfsWizardBase() : _g(0), _reached(0), _processed(0), _pred(0),
-					   _dist(0), _source(INVALID) {}
+		                           _dist(0), _source(INVALID) {}
 		    /// Constructor.
 		    /// This constructor requires some parameters,
 		    /// listed in the parameters list.
@@ -883,9 +883,9 @@
 		    /// \param s is the initial value of  \ref _source
 		    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) {}
 		  };
 		  /// A class to make the usage of Bfs algorithm easier
@@ -922,5 +922,5 @@
 		    //\e
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///\brief The type of the map that stores
 		    ///the reached nodes
@@ -952,5 +952,5 @@
 		    ///Runs Bfs algorithm from a given node.
 		    ///Runs Bfs algorithm from a given node.
 		    ///The node can be given by the \ref source function.
@@ -960,10 +960,10 @@
 		      Bfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
 		      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));
 		      alg.run(Base::_source);
@@ -986,5 +986,5 @@
 		      DefPredMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting PredMap
@@ -994,11 +994,11 @@
 		    ///
 		    template<class T>
-		    BfsWizard<DefPredMapBase<T> > predMap(const T &t)
 		    BfsWizard<DefPredMapBase<T> > predMap(const T &t)
+		    {
 		      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BfsWizard<DefPredMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct DefReachedMapBase : public Base {
@@ -1007,5 +1007,5 @@
 		      DefReachedMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting ReachedMap
@@ -1015,10 +1015,10 @@
 		    ///
 		    template<class T>
-		    BfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
 		    BfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
+		    {
 		      Base::_reached=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BfsWizard<DefReachedMapBase<T> >(*this);
+		    }
 		    template<class T>
@@ -1028,5 +1028,5 @@
 		      DefProcessedMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting ProcessedMap
@@ -1036,11 +1036,11 @@
 		    ///
 		    template<class T>
-		    BfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
 		    BfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
+		    {
 		      Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BfsWizard<DefProcessedMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct DefDistMapBase : public Base {
@@ -1049,5 +1049,5 @@
 		      DefDistMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting DistMap type
@@ -1057,22 +1057,22 @@
 		    ///
 		    template<class T>
-		    BfsWizard<DefDistMapBase<T> > distMap(const T &t)
 		    BfsWizard<DefDistMapBase<T> > distMap(const T &t)
+		    {
 		      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BfsWizard<DefDistMapBase<T> >(*this);
+		    }
 		    /// Sets the source node, from which the Bfs algorithm runs.
 		    /// Sets the source node, from which the Bfs algorithm runs.
 		    /// \param s is the source node.
-		    BfsWizard<TR> &source(Node s)
 		    BfsWizard<TR> &source(Node s)
+		    {
 		      Base::_source=s;
 		      return *this;
+		    }
 		  };
 		  ///Function type interface for Bfs algorithm.
@@ -1101,5 +1101,5 @@
 		#ifdef DOXYGEN
 		  /// \brief Visitor class for bfs.
-		  ///
 		  ///
 		  /// This class defines the interface of the BfsVisit events, and
 		  /// it could be the base of a real Visitor class.
@@ -1110,24 +1110,24 @@
 		    typedef typename Digraph::Node Node;
 		    /// \brief Called when the arc reach a node.
-		    ///
 		    ///
 		    /// It is called when the bfs find an arc which target is not
 		    /// reached yet.
 		    void discover(const Arc& arc) {}
 		    /// \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.
 		    void examine(const Arc& arc) {}
 		    /// \brief Called for the source node of the bfs.
-		    ///
 		    ///
 		    /// It is called for the source node of the bfs.
 		    void start(const Node& node) {}
 		    /// \brief Called when the node processed.
-		    ///
 		    ///
 		    /// It is Called when the node processed.
 		    void process(const Node& node) {}
@@ -1148,10 +1148,10 @@
 		    struct Constraints {
 		      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);
+		      }
@@ -1168,9 +1168,9 @@
 		  struct BfsVisitDefaultTraits {
-		    /// \brief The digraph type the algorithm runs on.
 		    /// \brief The digraph type the algorithm runs on.
 		    typedef _Digraph Digraph;
 		    /// \brief The type of the map that indicates which nodes are reached.
-		    ///
 		    ///
 		    /// The type of the map that indicates which nodes are reached.
 		    /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -1180,5 +1180,5 @@
 		    /// \brief Instantiates a ReachedMap.
 		    ///
-		    /// This function instantiates a \ref ReachedMap.
 		    /// This function instantiates a \ref ReachedMap.
 		    /// \param digraph is the digraph, to which
 		    /// we would like to define the \ref ReachedMap.
@@ -1190,7 +1190,7 @@
 		  /// \ingroup search
-		  ///
 		  ///
 		  /// \brief %BFS Visit algorithm class.
-		  ///
 		  ///
 		  /// This class provides an efficient implementation of the %BFS algorithm
 		  /// with visitor interface.
@@ -1198,14 +1198,14 @@
 		  /// The %BfsVisit class provides an alternative interface to the Bfs
 		  /// 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.
 		  ///
 		  /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
 		  /// \ref ListDigraph. The value of _Digraph is not used directly by Bfs, it
 		  /// 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
 		  /// does not observe the Bfs events. If you want to observe the bfs
 		  /// 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
 		  /// \ref BfsVisitDefaultTraits "BfsVisitDefaultTraits<_Digraph>".
@@ -1216,10 +1216,10 @@
 		#else
 		  template <typename _Digraph = ListDigraph,
 			    typename _Visitor = BfsVisitor<_Digraph>,
 			    typename _Traits = BfsDefaultTraits<_Digraph> >
 		            typename _Visitor = BfsVisitor<_Digraph>,
 		            typename _Traits = BfsDefaultTraits<_Digraph> >
 		#endif
 		  class BfsVisit {
 		  public:
 		    /// \brief \ref Exception for uninitialized parameters.
 		    ///
@@ -1228,7 +1228,7 @@
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
-		      virtual const char* what() const throw()
 		      virtual const char* what() const throw()
+		      {
-			return "lemon::BfsVisit::UninitializedParameter";
+		        return "lemon::BfsVisit::UninitializedParameter";
+		      }
 		    };
@@ -1267,6 +1267,6 @@
 		    void create_maps() {
 		      if(!_reached) {
 			local_reached = true;
 			_reached = Traits::createReachedMap(*_digraph);
 		        local_reached = true;
 		        _reached = Traits::createReachedMap(*_digraph);
+		      }
+		    }
@@ -1275,5 +1275,5 @@
 		    BfsVisit() {}
 		  public:
@@ -1287,8 +1287,8 @@
 		      typedef T ReachedMap;
 		      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
 		    ///
@@ -1296,11 +1296,11 @@
 		    template <class T>
 		    struct DefReachedMap : public BfsVisit< Digraph, Visitor,
-							    DefReachedMapTraits<T> > {
+		                                            DefReachedMapTraits<T> > {
 		      typedef BfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
 		    };
 		    ///@}
 		  public:
 		  public:
 		    /// \brief Constructor.
 		    ///
@@ -1310,8 +1310,8 @@
 		    /// \param visitor The visitor of the algorithm.
 		    ///
-		    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.
 		    ///
@@ -1330,6 +1330,6 @@
 		    BfsVisit &reachedMap(ReachedMap &m) {
 		      if(local_reached) {
 			delete _reached;
 			local_reached = false;
 		        delete _reached;
 		        local_reached = false;
+		      }
 		      _reached = &m;
@@ -1358,8 +1358,8 @@
 		      _list_front = _list_back = -1;
 		      for (NodeIt u(*_digraph) ; u != INVALID ; ++u) {
-			_reached->set(u, false);
+		        _reached->set(u, false);
+		      }
+		    }
 		    /// \brief Adds a new source node.
 		    ///
@@ -1367,11 +1367,11 @@
 		    void addSource(Node s) {
 		      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.
 		    ///
@@ -1381,5 +1381,5 @@
 		    ///
 		    /// \pre The queue must not be empty!
-		    Node processNextNode() {
 		    Node processNextNode() {
 		      Node n = _list[++_list_front];
 		      _visitor->process(n);
@@ -1468,5 +1468,5 @@
 		    /// \return The next node to be processed or INVALID if the stack is
 		    /// empty.
-		    Node nextNode() {
 		    Node nextNode() {
 		      return _list_front != _list_back ? _list[_list_front + 1] : INVALID;
+		    }
@@ -1483,5 +1483,5 @@
 		    /// Returns the number of the nodes to be processed in the queue.
 		    int queueSize() { return _list_back - _list_front; }
 		    /// \brief Executes the algorithm.
 		    ///
@@ -1493,5 +1493,5 @@
 		      while ( !emptyQueue() ) processNextNode();
+		    }
 		    /// \brief Executes the algorithm until \c dest is reached.
 		    ///
@@ -1504,5 +1504,5 @@
 		      while ( !emptyQueue() && !reach ) processNextNode(dest, reach);
+		    }
 		    /// \brief Executes the algorithm until a condition is met.
 		    ///
@@ -1522,5 +1522,5 @@
 		      Node rnode = INVALID;
 		      while ( !emptyQueue() && rnode == INVALID ) {
-			processNextNode(nm, rnode);
+		        processNextNode(nm, rnode);
+		      }
 		      return rnode;
@@ -1543,5 +1543,5 @@
 		    /// \brief Runs %BFSVisit algorithm to visit all nodes in the digraph.
-		    ///
 		    ///
 		    /// This method runs the %BFS algorithm in order to
 		    /// compute the %BFS path to each node. The algorithm computes

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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -49,5 +49,5 @@
 		  ///\sa Dijkstra
 		  template <typename _Prio, typename _ItemIntMap,
-			    typename _Compare = std::less<_Prio> >
+		            typename _Compare = std::less<_Prio> >
 		  class BinHeap {
@@ -91,5 +91,5 @@
 		    /// should be PRE_HEAP (-1) for each element.
 		    explicit BinHeap(ItemIntMap &_iim) : iim(_iim) {}
 		    /// \brief The constructor.
 		    ///
@@ -100,5 +100,5 @@
 		    ///
 		    /// \param _comp The comparator function object.
-		    BinHeap(ItemIntMap &_iim, const Compare &_comp)
 		    BinHeap(ItemIntMap &_iim, const Compare &_comp)
 		      : iim(_iim), comp(_comp) {}
@@ -108,5 +108,5 @@
 		    /// \brief Returns the number of items stored in the heap.
 		    int size() const { return data.size(); }
 		    /// \brief Checks if the heap stores no items.
 		    ///
@@ -115,11 +115,11 @@
 		    /// \brief Make empty this heap.
-		    ///
 		    ///
 		    /// Make empty this heap. It does not change the cross reference map.
 		    /// If you want to reuse what is not surely empty you should first clear
 		    /// the heap and after that you should set the cross reference map for
 		    /// each item to \c PRE_HEAP.
 		    void clear() {
 		      data.clear();
 		    void clear() {
 		      data.clear();
+		    }
@@ -135,7 +135,7 @@
 		      int par = parent(hole);
 		      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);
+		      }
 		      move(p, hole);
@@ -146,17 +146,17 @@
 		      int child = second_child(hole);
 		      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);
+		      }
 		      child--;
 		      if( child<length && less(data[child], p) ) {
 			move(data[child], hole);
 			hole=child;
 		        move(data[child], hole);
 		        hole=child;
+		      }
 		    ok:
@@ -182,6 +182,6 @@
 		    /// \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.
 		    /// \param p The priority of the item.
@@ -191,6 +191,6 @@
 		    ///
 		    /// 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 {
 		      return data[0].first;
@@ -208,11 +208,11 @@
 		    ///
 		    /// 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() {
 		      int n = data.size()-1;
 		      iim.set(data[0].first, POST_HEAP);
 		      if (n > 0) {
-			bubble_down(0, data[n], n);
+		        bubble_down(0, data[n], n);
+		      }
 		      data.pop_back();
@@ -229,15 +229,15 @@
 		      iim.set(data[h].first, POST_HEAP);
 		      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);
+		        }
+		      }
 		      data.pop_back();
+		    }
 		    /// \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.
 		    /// \param i The item.
@@ -247,5 +247,5 @@
+		    }
-		    /// \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.
 		    ///
@@ -257,11 +257,11 @@
 		      int idx = iim[i];
 		      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());
+		      }
+		    }
@@ -278,8 +278,8 @@
 		      bubble_up(idx, Pair(i,p));
+		    }
 		    /// \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
 		    /// p relative to \c Compare.
@@ -291,5 +291,5 @@
+		    }
-		    /// \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.
 		    ///
@@ -302,5 +302,5 @@
 		      int s = iim[i];
 		      if( s>=0 )
-			s=0;
+		        s=0;
 		      return State(s);
+		    }
@@ -312,5 +312,5 @@
 		    /// better time complexity.
 		    /// \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) {
 		      switch (st) {
@@ -341,5 +341,5 @@
 		  }; // 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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -33,5 +33,5 @@
 		  /// \ingroup graphbits
 		  ///
-		  /// \brief Notifier class to notify observes about alterations in
 		  /// \brief Notifier class to notify observes about alterations in
 		  /// a container.
 		  ///
@@ -50,5 +50,5 @@
 		  /// alteration of the graph.
 		  ///
-		  /// 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
 		  /// container. The \e id() function returns an integer id for each key.
@@ -61,5 +61,5 @@
 		  /// from the graph. If all items are erased from the graph or from an empty
 		  /// 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
 		  /// them from the container, on the other way on item addition we should
@@ -69,5 +69,5 @@
 		  /// \e ObserverBase nested class. The signals can be handled with
 		  /// 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
 		  /// alteration handlers should not call any function which signals
@@ -80,5 +80,5 @@
 		  /// be rolled back by calling the \e erase() or \e clear()
 		  /// 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
 		  /// exception which detach the observer from the notifier.
@@ -86,5 +86,5 @@
 		  /// There are some place when the alteration observing is not completly
 		  /// 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
 		  /// only erasing and adding but not the reversing it will stores bad
@@ -105,5 +105,5 @@
 		    typedef _Item Item;
-		    /// \brief Exception which can be called from \e clear() and
 		    /// \brief Exception which can be called from \e clear() and
 		    /// \e erase().
 		    ///
@@ -128,5 +128,5 @@
 		    /// The build() and clear() members are to notify the observer
 		    /// about the container is built from an empty container or
-		    /// is cleared to an empty container.
 		    /// is cleared to an empty container.
 		    class ObserverBase {
@@ -139,5 +139,5 @@
 		      ///
 		      /// Default constructor for ObserverBase.
-		      ///
 		      ///
 		      ObserverBase() : _notifier(0) {}
@@ -152,11 +152,11 @@
 		      ///
 		      /// 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
 		      virtual ~ObserverBase() {
@@ -171,7 +171,7 @@
 		      ///
 		      void attach(AlterationNotifier& nf) {
-			nf.attach(*this);
+		        nf.attach(*this);
+		      }
 		      /// \brief Detaches the observer into an AlterationNotifier.
 		      ///
@@ -181,6 +181,6 @@
 		        _notifier->detach(*this);
+		      }
 		      /// \brief Gives back a pointer to the notifier which the map
 		      /// \brief Gives back a pointer to the notifier which the map
 		      /// attached into.
 		      ///
@@ -189,5 +189,5 @@
 		      ///
 		      Notifier* notifier() const { return const_cast<Notifier*>(_notifier); }
 		      /// Gives back true when the observer is attached into a notifier.
 		      bool attached() const { return _notifier != 0; }
@@ -198,5 +198,5 @@
 		    protected:
 		      Notifier* _notifier;
 		      typename std::list<ObserverBase*>::iterator _index;
@@ -210,5 +210,5 @@
 		      virtual void add(const Item&) = 0;
-		      /// \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.
 		      ///
@@ -223,8 +223,8 @@
 		      /// The erase() member function notificates the observer about an
 		      /// 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.
 		      ///
@@ -248,24 +248,24 @@
 		      /// The clear() member function notificates the observer about all
 		      /// items are erased from the container. It have to be overrided in
-		      /// the subclasses.
 		      /// the subclasses.
 		      virtual void clear() = 0;
 		    };
 		  protected:
 		    const Container* container;
-		    typedef std::list<ObserverBase*> Observers;
 		    typedef std::list<ObserverBase*> Observers;
 		    Observers _observers;
 		  public:
 		    /// \brief Default constructor.
 		    ///
-		    /// The default constructor of the AlterationNotifier.
 		    /// The default constructor of the AlterationNotifier.
 		    /// It creates an empty notifier.
-		    AlterationNotifier()
 		    AlterationNotifier()
 		      : container(0) {}
@@ -273,17 +273,17 @@
 		    ///
 		    /// 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) {}
 		    /// \brief Destructor.
-		    ///
 		    ///
 		    /// Destructor of the AlterationNotifier.
 		    ///
@@ -291,5 +291,5 @@
 		      typename Observers::iterator it;
 		      for (it = _observers.begin(); it != _observers.end(); ++it) {
-			(*it)->_notifier = 0;
+		        (*it)->_notifier = 0;
+		      }
+		    }
@@ -339,5 +339,5 @@
 		      return container->maxId(Item());
+		    }
 		  protected:
@@ -345,5 +345,5 @@
 		      observer._index = _observers.insert(_observers.begin(), &observer);
 		      observer._notifier = this;
+		    }
+		    }
 		    void detach(ObserverBase& observer) {
@@ -354,11 +354,11 @@
 		  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) {
 		      typename Observers::reverse_iterator it;
@@ -374,12 +374,12 @@
 		        throw;
+		      }
+		    }
+		    }
-		    /// \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) {
 		      typename Observers::reverse_iterator it;
@@ -395,12 +395,12 @@
 		        throw;
+		      }
+		    }
+		    }
-		    /// \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() {
 		      typename Observers::iterator it = _observers.begin();
@@ -417,10 +417,10 @@
+		    }
-		    /// \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) {
 		      typename Observers::iterator it = _observers.begin();
@@ -437,7 +437,7 @@
+		    }
-		    /// \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
 		    /// from an empty container.
@@ -457,5 +457,5 @@
+		    }
-		    /// \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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -39,5 +39,5 @@
 		  /// The ArrayMap template class is graph map structure what
 		  /// 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.
 		  ///
@@ -45,8 +45,8 @@
 		  /// the Value type of the map.
 		  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;
 		    /// The item type of the map.
@@ -70,5 +70,5 @@
 		    /// The MapBase of the Map which imlements the core regisitry function.
 		    typedef typename Notifier::ObserverBase Parent;
 		  private:
 		    typedef std::allocator<Value> Allocator;
@@ -85,12 +85,12 @@
 		      Item it;
 		      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) {
 		      Parent::attach(graph.notifier(Item()));
@@ -99,15 +99,15 @@
 		      Item it;
 		      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 copy a map of the same map type.
 		    ///
-		    /// 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());
+		      }
 		      capacity = copy.capacity;
@@ -117,6 +117,6 @@
 		      Item it;
 		      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]);
+		      }
+		    }
@@ -125,8 +125,8 @@
 		    ///
 		    /// 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) {
 		      return operator=<ArrayMap>(cmap);
@@ -139,5 +139,5 @@
 		    /// concecpt and could be indiced by the current item set of
 		    /// 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>
 		    ArrayMap& operator=(const CMap& cmap) {
@@ -152,13 +152,13 @@
 		    /// \brief The destructor of the map.
-		    ///
 		    ///
 		    /// The destructor of the map.
-		    virtual ~ArrayMap() {
 		    virtual ~ArrayMap() {
 		      if (attached()) {
 			clear();
 			detach();
 		        clear();
 		        detach();
+		      }
+		    }
 		  protected:
@@ -169,17 +169,17 @@
 		  public:
-		    /// \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) {
 		      int id = Parent::notifier()->id(key);
 		      return values[id];
+		    }
+		    }
 		    /// \brief The const subscript operator.
 		    ///
 		    /// 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 {
 		      int id = Parent::notifier()->id(key);
@@ -188,5 +188,5 @@
 		    /// \brief Setter function of the map.
-		    ///
 		    ///
 		    /// Setter function of the map. Equivalent with map[key] = val.
 		    /// This is a compatibility feature with the not dereferable maps.
@@ -198,27 +198,27 @@
 		    /// \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) {
 		      Notifier* nf = Parent::notifier();
 		      int id = nf->id(key);
 		      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;
+		      }
 		      allocator.construct(&(values[id]), Value());
@@ -226,51 +226,51 @@
 		    /// \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) {
 		      Notifier* nf = Parent::notifier();
 		      int max_id = -1;
 		      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.
 		    ///
 		    /// 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) {
 		      int id = Parent::notifier()->id(key);
@@ -281,16 +281,16 @@
 		    ///
 		    /// 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]));
+		      }
+		    }
 		    /// \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() {
 		      Notifier* nf = Parent::notifier();
@@ -298,7 +298,7 @@
 		      Item it;
 		      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());
+		      }
+		    }
@@ -306,33 +306,33 @@
 		    ///
 		    /// 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;
+		      }
+		    }
 		  private:
 		    void allocate_memory() {
 		      int max_id = Parent::notifier()->maxId();
 		      if (max_id == -1) {
 			capacity = 0;
 			values = 0;
-			return;
+		        capacity = 0;
 		        values = 0;
 		        return;
+		      }
 		      capacity = 1;
 		      while (capacity <= max_id) {
-			capacity <<= 1;
+		        capacity <<= 1;
+		      }
 		      values = allocator.allocate(capacity);
+		    }
 		      values = allocator.allocate(capacity);
+		    }
 		    int capacity;
@@ -340,7 +340,7 @@
 		    Allocator allocator;
-		  };
 		  };
+		}
-		#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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -64,12 +64,12 @@
 		      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));
+		      }
 		    };
@@ -118,9 +118,9 @@
 		    void next(Arc &e) const {
 		      if( e.forward ) {
-			e.forward = false;
+		        e.forward = false;
+		      }
 		      else {
 			Parent::next(e);
 			e.forward = true;
 		        Parent::next(e);
 		        e.forward = true;
+		      }
+		    }
@@ -129,22 +129,22 @@
 		      Parent::firstIn(e,n);
 		      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;
+		      }
+		    }
 		    void nextOut(Arc &e) const {
 		      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);
+		      }
+		    }
@@ -153,22 +153,22 @@
 		      Parent::firstOut(e,n);
 		      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;
+		      }
+		    }
 		    void nextIn(Arc &e) const {
 		      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);
+		      }
+		    }
@@ -184,11 +184,11 @@
 		    void nextInc(Edge &e, bool &d) const {
 		      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);
+		      }
+		    }
@@ -241,16 +241,16 @@
 		    Arc findArc(Node s, Node t, Arc p = INVALID) const {
 		      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);
+		      }
 		      return INVALID;
@@ -268,8 +268,8 @@
 		          if (arc != INVALID) return arc;
 		          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;
+		        }
 		      } else {
@@ -300,10 +300,10 @@
 		      Red() {}
 		      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);
 		        return *this;
@@ -332,10 +332,10 @@
 		      Blue() {}
 		      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);
 		        return *this;
@@ -354,5 +354,5 @@
 		      Parent::nextBlue(static_cast<Node&>(node));
+		    }
 		    int id(const Blue& node) const {
 		      return Parent::redId(node);
@@ -368,17 +368,17 @@
 		    void firstInc(Edge& arc, bool& dir, const Node& node) const {
 		      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;
+		      }
+		    }
 		    void nextInc(Edge& arc, bool& dir) const {
 		      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;
+		      }
+		    }
@@ -390,5 +390,5 @@
 		      Arc(const Edge& arc, bool _forward)
-			: Edge(arc), forward(_forward) {}
+		        : Edge(arc), forward(_forward) {}
 		    public:
@@ -396,12 +396,12 @@
 		      Arc (Invalid) : Edge(INVALID), forward(true) {}
 		      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));
+		      }
 		    };
@@ -414,5 +414,5 @@
 		    void next(Arc& arc) const {
 		      if (!arc.forward) {
-			Parent::next(static_cast<Edge&>(arc));
+		        Parent::next(static_cast<Edge&>(arc));
+		      }
 		      arc.forward = !arc.forward;
@@ -421,16 +421,16 @@
 		    void firstOut(Arc& arc, const Node& node) const {
 		      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;
+		      }
+		    }
 		    void nextOut(Arc& arc) const {
 		      if (arc.forward) {
-			Parent::nextFromRed(arc);
+		        Parent::nextFromRed(arc);
 		      } else {
-			Parent::nextFromBlue(arc);
+		        Parent::nextFromBlue(arc);
 		        arc.forward = static_cast<Edge&>(arc) == INVALID;
+		      }
@@ -439,17 +439,17 @@
 		    void firstIn(Arc& arc, const Node& node) const {
 		      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;
+		      }
+		    }
 		    void nextIn(Arc& arc) const {
 		      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;
+		      }
+		    }
@@ -463,5 +463,5 @@
 		    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

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	*
5	5	* Copyright (C) 2003-2008
...	...	@@ -45,5 +45,5 @@
45	45	Bezier1() {}
46	46	Bezier1(Point _p1, Point _p2) :p1(_p1), p2(_p2) {}
47
	47
48	48	Point operator()(double t) const
49	49	{
...	...	@@ -55,5 +55,5 @@
55	55	return Bezier1(p1,conv(p1,p2,t));
56	56	}
57
	57
58	58	Bezier1 after(double t) const
59	59	{
...	...	@@ -88,5 +88,5 @@
88	88	return Bezier2(p1,q,conv(q,r,t));
89	89	}
90
	90
91	91	Bezier2 after(double t) const
92	92	{
...	...	@@ -111,14 +111,14 @@
111	111	Bezier3(Point _p1, Point _p2, Point _p3, Point _p4)
112	112	: p1(_p1), p2(_p2), p3(_p3), p4(_p4) {}
113		Bezier3(const Bezier1 &b) : p1(b.p1), p2(conv(b.p1,b.p2,1.0/3.0)),
114		p3(conv(b.p1,b.p2,2.0/3.0)), p4(b.p2) {}
	113	Bezier3(const Bezier1 &b) : p1(b.p1), p2(conv(b.p1,b.p2,1.0/3.0)),
	114	p3(conv(b.p1,b.p2,2.0/3.0)), p4(b.p2) {}
115	115	Bezier3(const Bezier2 &b) : p1(b.p1), p2(conv(b.p1,b.p2,2.0/3.0)),
116		p3(conv(b.p2,b.p3,1.0/3.0)), p4(b.p3) {}
117
118		~~Point~~ ~~operator~~()~~(double~~ t) ~~const~~
	116	p3(conv(b.p2,b.p3,1.0/3.0)), p4(b.p3) {}
	117
	118	Point operator()(double t) const
119	119	{
120	120	// return Bezier2(conv(p1,p2,t),conv(p2,p3,t),conv(p3,p4,t))(t);
121	121	return ((1-t)(1-t)(1-t))p1+(3t(1-t)(1-t))*p2+
122		(3tt(1-t))p3+(ttt)*p4;
	122	(3tt(1-t))p3+(ttt)*p4;
123	123	}
124	124	Bezier3 before(double t) const
...	...	@@ -132,5 +132,5 @@
132	132	return Bezier3(p1,p,a,c);
133	133	}
134
	134
135	135	Bezier3 after(double t) const
136	136	{
...	...	@@ -147,11 +147,11 @@
147	147	Bezier2 grad() const { return Bezier2(3.0(p2-p1),3.0(p3-p2),3.0*(p4-p3)); }
148	148	Bezier2 norm() const { return Bezier2(3.0*rot90(p2-p1),
149		3.0*rot90(p3-p2),
150		3.0*rot90(p4-p3)); }
	149	3.0*rot90(p3-p2),
	150	3.0*rot90(p4-p3)); }
151	151	Point grad(double t) const { return grad()(t); }
152	152	Point norm(double t) const { return rot90(grad(t)); }
153	153
154	154	template<class R,class F,class S,class D>
155		R recSplit(F &_f,const S &_s,D _d) const
	155	R recSplit(F &_f,const S &_s,D _d) const
156	156	{
157	157	const Point a=(p1+p2)/2;
...	...	@@ -165,5 +165,5 @@
165	165	return _s(f1,f2);
166	166	}
167
	167
168	168	};
169	169

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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -30,6 +30,6 @@
 		namespace lemon {
 		  //#ifndef LEMON_USE_DEBUG_MAP
@@ -141,5 +141,5 @@
 		  };
-		// #else
 		// #else
 		//   template <typename _Graph, typename _Item, typename _Value>
@@ -148,19 +148,19 @@
 		//   };
-		// #endif
 		// #endif
 		  /// \e
 		  template <typename _Graph, typename _Item, typename _Value>
-		  class DefaultMap
 		  class DefaultMap
 		    : public DefaultMapSelector<_Graph, _Item, _Value>::Map {
 		  public:
 		    typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent;
 		    typedef DefaultMap<_Graph, _Item, _Value> Map;
 		    typedef typename Parent::Graph Graph;
 		    typedef typename Parent::Value Value;
 		    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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -67,9 +67,9 @@
 		    Node oppositeNode(const Node &node, const Arc &arc) const {
 		      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;
+		    }
@@ -90,10 +90,10 @@
 		      return node_notifier;
+		    }
 		    ArcNotifier& notifier(Arc) const {
 		      return arc_notifier;
+		    }
-		    class NodeIt : public Node {
 		    class NodeIt : public Node {
 		      const Digraph* _digraph;
 		    public:
@@ -104,13 +104,13 @@
 		      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;
+		      }
@@ -118,5 +118,5 @@
-		    class ArcIt : public Arc {
 		    class ArcIt : public Arc {
 		      const Digraph* _digraph;
 		    public:
@@ -127,13 +127,13 @@
 		      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;
+		      }
@@ -141,5 +141,5 @@
-		    class OutArcIt : public Arc {
 		    class OutArcIt : public Arc {
 		      const Digraph* _digraph;
 		    public:
@@ -149,15 +149,15 @@
 		      OutArcIt(Invalid i) : Arc(i) { }
 		      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;
+		      }
@@ -165,5 +165,5 @@
-		    class InArcIt : public Arc {
 		    class InArcIt : public Arc {
 		      const Digraph* _digraph;
 		    public:
@@ -173,15 +173,15 @@
 		      InArcIt(Invalid i) : Arc(i) { }
 		      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;
+		      }
@@ -216,7 +216,7 @@
+		    }
 		    template <typename _Value>
-		    class NodeMap
 		    class NodeMap
 		      : public MapExtender<DefaultMap<Digraph, Node, _Value> > {
 		    public:
@@ -224,11 +224,11 @@
 		      typedef MapExtender<DefaultMap<Digraph, Node, _Value> > Parent;
 		      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);
+		      }
@@ -236,5 +236,5 @@
 		      NodeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
@@ -242,5 +242,5 @@
 		    template <typename _Value>
-		    class ArcMap
 		    class ArcMap
 		      : public MapExtender<DefaultMap<Digraph, Arc, _Value> > {
 		    public:
@@ -248,11 +248,11 @@
 		      typedef MapExtender<DefaultMap<Digraph, Arc, _Value> > Parent;
 		      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);
+		      }
@@ -260,5 +260,5 @@
 		      ArcMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
 		    };
@@ -270,5 +270,5 @@
 		      return node;
+		    }
 		    Arc addArc(const Node& from, const Node& to) {
 		      Arc arc = Parent::addArc(from, to);
@@ -294,12 +294,12 @@
 		      Parent::firstOut(arc, node);
 		      while (arc != INVALID ) {
 			erase(arc);
 			Parent::firstOut(arc, node);
+		      }
+		        erase(arc);
 		        Parent::firstOut(arc, node);
+		      }
 		      Parent::firstIn(arc, node);
 		      while (arc != INVALID ) {
 			erase(arc);
 			Parent::firstIn(arc, node);
 		        erase(arc);
 		        Parent::firstIn(arc, node);
+		      }
@@ -307,5 +307,5 @@
 		      Parent::erase(node);
+		    }
 		    void erase(const Arc& arc) {
 		      notifier(Arc()).erase(arc);
@@ -316,6 +316,6 @@
 		      node_notifier.setContainer(*this);
 		      arc_notifier.setContainer(*this);
+		    }
+		    }
 		    ~DigraphExtender() {
@@ -328,8 +328,8 @@
 		  ///
 		  /// \brief Extender for the Graphs
-		  template <typename Base>
 		  template <typename Base>
 		  class GraphExtender : public Base {
 		  public:
 		    typedef Base Parent;
 		    typedef GraphExtender Graph;
@@ -341,5 +341,5 @@
 		    typedef typename Parent::Edge Edge;
-		    // Graph extension
 		    // Graph extension
 		    int maxId(Node) const {
@@ -369,9 +369,9 @@
 		    Node oppositeNode(const Node &n, const Edge &e) const {
 		      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;
+		    }
@@ -403,5 +403,5 @@
 		      return node_notifier;
+		    }
 		    ArcNotifier& notifier(Arc) const {
 		      return arc_notifier;
@@ -414,5 +414,5 @@
-		    class NodeIt : public Node {
 		    class NodeIt : public Node {
 		      const Graph* _graph;
 		    public:
@@ -423,13 +423,13 @@
 		      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;
+		      }
@@ -437,5 +437,5 @@
-		    class ArcIt : public Arc {
 		    class ArcIt : public Arc {
 		      const Graph* _graph;
 		    public:
@@ -446,13 +446,13 @@
 		      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;
+		      }
@@ -460,5 +460,5 @@
-		    class OutArcIt : public Arc {
 		    class OutArcIt : public Arc {
 		      const Graph* _graph;
 		    public:
@@ -468,15 +468,15 @@
 		      OutArcIt(Invalid i) : Arc(i) { }
 		      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;
+		      }
@@ -484,5 +484,5 @@
-		    class InArcIt : public Arc {
 		    class InArcIt : public Arc {
 		      const Graph* _graph;
 		    public:
@@ -492,15 +492,15 @@
 		      InArcIt(Invalid i) : Arc(i) { }
 		      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;
+		      }
@@ -508,5 +508,5 @@
-		    class EdgeIt : public Parent::Edge {
 		    class EdgeIt : public Parent::Edge {
 		      const Graph* _graph;
 		    public:
@@ -517,13 +517,13 @@
 		      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;
+		      }
@@ -541,15 +541,15 @@
 		      IncEdgeIt(const Graph& graph, const Node &node) : _graph(&graph) {
-			_graph->firstInc(*this, _direction, node);
+		        _graph->firstInc(*this, _direction, node);
+		      }
 		      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);
+		      }
 		      IncEdgeIt& operator++() {
 			_graph->nextInc(*this, _direction);
 			return *this;
 		        _graph->nextInc(*this, _direction);
 		        return *this;
+		      }
 		    };
@@ -599,5 +599,5 @@
 		    template <typename _Value>
-		    class NodeMap
 		    class NodeMap
 		      : public MapExtender<DefaultMap<Graph, Node, _Value> > {
 		    public:
@@ -605,11 +605,11 @@
 		      typedef MapExtender<DefaultMap<Graph, Node, _Value> > Parent;
 		      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);
+		      }
@@ -617,5 +617,5 @@
 		      NodeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
@@ -623,5 +623,5 @@
 		    template <typename _Value>
-		    class ArcMap
 		    class ArcMap
 		      : public MapExtender<DefaultMap<Graph, Arc, _Value> > {
 		    public:
@@ -629,11 +629,11 @@
 		      typedef MapExtender<DefaultMap<Graph, Arc, _Value> > Parent;
 		      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);
+		      }
@@ -641,5 +641,5 @@
 		      ArcMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
 		    };
@@ -647,5 +647,5 @@
 		    template <typename _Value>
-		    class EdgeMap
 		    class EdgeMap
 		      : public MapExtender<DefaultMap<Graph, Edge, _Value> > {
 		    public:
@@ -653,12 +653,12 @@
 		      typedef MapExtender<DefaultMap<Graph, Edge, _Value> > Parent;
 		      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);
+		      }
@@ -666,5 +666,5 @@
 		      EdgeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
@@ -684,9 +684,9 @@
 		      std::vector<Arc> ev;
 		      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);
 		      return edge;
+		    }
 		    void clear() {
 		      notifier(Arc()).clear();
@@ -697,5 +697,5 @@
 		    template <typename Graph, typename NodeRefMap, typename EdgeRefMap>
-		    void build(const Graph& graph, NodeRefMap& nodeRef,
 		    void build(const Graph& graph, NodeRefMap& nodeRef,
 		               EdgeRefMap& edgeRef) {
 		      Parent::build(graph, nodeRef, edgeRef);
@@ -709,12 +709,12 @@
 		      Parent::firstOut(arc, node);
 		      while (arc != INVALID ) {
 			erase(arc);
 			Parent::firstOut(arc, node);
+		      }
+		        erase(arc);
 		        Parent::firstOut(arc, node);
+		      }
 		      Parent::firstIn(arc, node);
 		      while (arc != INVALID ) {
 			erase(arc);
 			Parent::firstIn(arc, node);
 		        erase(arc);
 		        Parent::firstIn(arc, node);
+		      }
@@ -726,5 +726,5 @@
 		      std::vector<Arc> av;
 		      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);
 		      notifier(Edge()).erase(edge);
@@ -733,14 +733,14 @@
 		    GraphExtender() {
-		      node_notifier.setContainer(*this);
 		      node_notifier.setContainer(*this);
 		      arc_notifier.setContainer(*this);
 		      edge_notifier.setContainer(*this);
+		    }
+		    }
 		    ~GraphExtender() {
 		      edge_notifier.clear();
 		      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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -35,5 +35,5 @@
 		    bool operator< (Invalid) { return false; }
 		  };
 		  /// \brief Invalid iterators.
 		  ///
@@ -53,3 +53,3 @@
 		#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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -33,5 +33,5 @@
 		  /// \ingroup graphbits
-		  ///
 		  ///
 		  /// \brief Extender for maps
 		  template <typename _Map>
@@ -57,8 +57,8 @@
 		  public:
-		    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) {}
@@ -71,12 +71,12 @@
 		      Parent::operator=(cmap);
 		      return *this;
+		    }
+		    }
 		    class MapIt : public Item {
 		    public:
 		      typedef Item Parent;
 		      typedef typename Map::Value Value;
 		      MapIt() {}
@@ -87,27 +87,27 @@
+		      }
 		      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];
+		      }
 		      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;
 		    };
@@ -118,5 +118,5 @@
 		      typedef typename Map::Value Value;
 		      ConstMapIt() {}
@@ -127,14 +127,14 @@
+		      }
 		      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;
+		      }
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
-			return map[*this];
+		        return map[*this];
+		      }
@@ -145,7 +145,7 @@
 		    class ItemIt : public Item {
 		    public:
 		      typedef Item Parent;
 		      ItemIt() {}
@@ -156,20 +156,20 @@
+		      }
 		      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;
+		      }
 		    protected:
 		      const Map& map;
 		    };
 		  };
 		  /// \ingroup graphbits
-		  ///
 		  ///
 		  /// \brief Extender for maps which use a subset of the items.
 		  template <typename _Graph, typename _Map>
@@ -195,8 +195,8 @@
 		  public:
-		    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) {}
@@ -213,12 +213,12 @@
+		      }
 		      return *this;
+		    }
+		    }
 		    class MapIt : public Item {
 		    public:
 		      typedef Item Parent;
 		      typedef typename Map::Value Value;
 		      MapIt() {}
@@ -229,27 +229,27 @@
+		      }
 		      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];
+		      }
 		      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;
 		    };
@@ -260,5 +260,5 @@
 		      typedef typename Map::Value Value;
 		      ConstMapIt() {}
@@ -269,14 +269,14 @@
+		      }
 		      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;
+		      }
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
-			return map[*this];
+		        return map[*this];
+		      }
@@ -287,7 +287,7 @@
 		    class ItemIt : public Item {
 		    public:
 		      typedef Item Parent;
 		      ItemIt() {}
@@ -298,21 +298,21 @@
+		      }
 		      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;
+		      }
 		    protected:
 		      const Map& map;
 		    };
 		  private:
 		    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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -54,5 +54,5 @@
 		      RevArcIt() {}
 		      RevArcIt(Invalid) : path(0), current(INVALID) {}
-		      RevArcIt(const PredMapPath& _path)
 		      RevArcIt(const PredMapPath& _path)
 		        : path(&_path), current(_path.target) {
 		        if (path->predMap[current] == INVALID) current = INVALID;
@@ -69,16 +69,16 @@
+		      }
 		      bool operator==(const RevArcIt& e) const {
 		        return current == e.current;
 		      bool operator==(const RevArcIt& e) const {
 		        return current == e.current;
+		      }
 		      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:
 		      const PredMapPath* path;
@@ -102,9 +102,9 @@
 		    typedef _PredMatrixMap PredMatrixMap;
-		    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) {}
@@ -128,7 +128,7 @@
 		      RevArcIt() {}
 		      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;
+		      }
@@ -139,23 +139,23 @@
 		      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;
 		        return *this;
+		      }
 		      bool operator==(const RevArcIt& e) const {
 		        return current == e.current;
 		      bool operator==(const RevArcIt& e) const {
 		        return current == e.current;
+		      }
 		      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:
 		      const PredMatrixMapPath* path;

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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -30,5 +29,5 @@
 		  template <typename _Graph, typename _Item>
 		  class ItemSetTraits {};
 		  template <typename Graph, typename Enable = void>
@@ -38,7 +37,7 @@
 		  template <typename Graph>
 		  struct NodeNotifierIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::NodeNotifier::Notifier, void>::type
-		  > {
 		  > {
 		    typedef typename Graph::NodeNotifier Type;
 		  };
@@ -47,5 +46,5 @@
 		  class ItemSetTraits<_Graph, typename _Graph::Node> {
 		  public:
 		    typedef _Graph Graph;
@@ -58,11 +57,11 @@
 		    class Map : public Graph::template NodeMap<_Value> {
 		    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;
 		      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) {}
 		     };
@@ -76,7 +75,7 @@
 		  template <typename Graph>
 		  struct ArcNotifierIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::ArcNotifier::Notifier, void>::type
-		  > {
 		  > {
 		    typedef typename Graph::ArcNotifier Type;
 		  };
@@ -85,5 +84,5 @@
 		  class ItemSetTraits<_Graph, typename _Graph::Arc> {
 		  public:
 		    typedef _Graph Graph;
@@ -96,11 +95,11 @@
 		    class Map : public Graph::template ArcMap<_Value> {
 		    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;
 		      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) {}
 		    };
@@ -113,7 +112,7 @@
 		  template <typename Graph>
 		  struct EdgeNotifierIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::EdgeNotifier::Notifier, void>::type
-		  > {
 		  > {
 		    typedef typename Graph::EdgeNotifier Type;
 		  };
@@ -122,5 +121,5 @@
 		  class ItemSetTraits<_Graph, typename _Graph::Edge> {
 		  public:
 		    typedef _Graph Graph;
@@ -133,11 +132,11 @@
 		    class Map : public Graph::template EdgeMap<_Value> {
 		    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;
 		      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) {}
 		    };
@@ -157,8 +156,8 @@
 		  template <typename Map>
 		  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;
 		    typedef typename Map::Value Value;
@@ -167,5 +166,5 @@
 		    typedef typename Map::Reference ReturnValue;
-		    typedef typename Map::ConstReference ConstReference;
 		    typedef typename Map::ConstReference ConstReference;
 		    typedef typename Map::Reference Reference;
 		 };
@@ -185,9 +184,9 @@
 		  template <typename MatrixMap>
 		  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;
 		    typedef typename MatrixMap::SecondKey SecondKey;
@@ -197,5 +196,5 @@
 		    typedef typename MatrixMap::Reference ReturnValue;
-		    typedef typename MatrixMap::ConstReference ConstReference;
 		    typedef typename MatrixMap::ConstReference ConstReference;
 		    typedef typename MatrixMap::Reference Reference;
 		 };
@@ -210,5 +209,5 @@
 		  template <typename Graph>
 		  struct NodeNumTagIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::NodeNumTag, void>::type
 		  > {
@@ -223,5 +222,5 @@
 		  template <typename Graph>
 		  struct EdgeNumTagIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::EdgeNumTag, void>::type
 		  > {
@@ -236,5 +235,5 @@
 		  template <typename Graph>
 		  struct FindEdgeTagIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::FindEdgeTag, void>::type
 		  > {
@@ -249,5 +248,5 @@
 		  template <typename Graph>
 		  struct UndirectedTagIndicator<
-		    Graph,
 		    Graph,
 		    typename enable_if<typename Graph::UndirectedTag, void>::type
 		  > {
@@ -262,5 +261,5 @@
 		  template <typename Graph>
 		  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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -84,5 +84,5 @@
 		  /**************** enable_if from BOOST ****************/
 		  template <typename Type, typename T = void>
 		  struct exists {
@@ -90,5 +90,5 @@
 		  };
 		  template <bool B, class T = void>
 		  struct enable_if_c {
@@ -99,5 +99,5 @@
 		  struct enable_if_c<false, T> {};
-		  template <class Cond, class T = void>
 		  template <class Cond, class T = void>
 		  struct enable_if : public enable_if_c<Cond::value, T> {};
@@ -110,5 +110,5 @@
 		  struct lazy_enable_if_c<false, T> {};
-		  template <class Cond, class T>
 		  template <class Cond, class T>
 		  struct lazy_enable_if : public lazy_enable_if_c<Cond::value, T> {};
@@ -122,5 +122,5 @@
 		  struct disable_if_c<true, T> {};
-		  template <class Cond, class T = void>
 		  template <class Cond, class T = void>
 		  struct disable_if : public disable_if_c<Cond::value, T> {};
@@ -133,5 +133,5 @@
 		  struct lazy_disable_if_c<true, T> {};
-		  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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -50,14 +50,14 @@
 		  /// \todo Fix the doc: there is _Graph parameter instead of _Notifier.
 		  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;
 		  public:
-		    /// The graph type of the map.
 		    /// The graph type of the map.
 		    typedef _Graph Graph;
 		    /// The item type of the map.
@@ -94,7 +94,7 @@
+		    }
-		    /// \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.
 		    VectorMap(const Graph& graph, const Value& value) {
@@ -108,6 +108,6 @@
 		    VectorMap(const VectorMap& _copy) : Parent() {
 		      if (_copy.attached()) {
 			Parent::attach(*_copy.notifier());
 			container = _copy.container;
 		        Parent::attach(*_copy.notifier());
 		        container = _copy.container;
+		      }
+		    }
@@ -116,8 +116,8 @@
 		    ///
 		    /// 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) {
 		      return operator=<VectorMap>(cmap);
@@ -130,5 +130,5 @@
 		    /// concecpt and could be indiced by the current item set of
 		    /// 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>
 		    VectorMap& operator=(const CMap& cmap) {
@@ -141,5 +141,5 @@
 		      return *this;
+		    }
 		  public:
@@ -147,13 +147,13 @@
 		    ///
 		    /// 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.
 		    ///
 		    /// 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 {
 		      return container[Parent::notifier()->id(key)];
@@ -171,18 +171,18 @@
 		    /// \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) {
 		      int id = Parent::notifier()->id(key);
 		      if (id >= int(container.size())) {
-			container.resize(id + 1);
+		        container.resize(id + 1);
+		      }
+		    }
 		    /// \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) {
 		      int max = container.size() - 1;
@@ -199,5 +199,5 @@
 		    ///
 		    /// 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) {
 		      container[Parent::notifier()->id(key)] = Value();
@@ -207,16 +207,16 @@
 		    ///
 		    /// 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;
 		      container.reserve(size);
@@ -227,11 +227,11 @@
 		    ///
 		    /// 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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -25,5 +25,5 @@
 		  const Color WHITE(1,1,1);
 		  const Color BLACK(0,0,0);
 		  const Color RED(1,0,0);
@@ -41,4 +41,4 @@
 		  const Color DARK_MAGENTA(.5,0,.5);
 		  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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -63,5 +63,5 @@
 		  /// White color constant
-		  extern const Color WHITE;
 		  extern const Color WHITE;
 		  /// Black color constant
 		  extern const Color BLACK;
@@ -131,5 +131,5 @@
 		        colors.push_back(Color(1,0,1));
 		        colors.push_back(Color(0,1,1));
 		        colors.push_back(Color(.5,0,0));
 		        colors.push_back(Color(0,.5,0));
@@ -138,5 +138,5 @@
 		        colors.push_back(Color(.5,0,.5));
 		        colors.push_back(Color(0,.5,.5));
 		        colors.push_back(Color(.5,.5,.5));
 		        colors.push_back(Color(1,.5,.5));
@@ -146,5 +146,5 @@
 		        colors.push_back(Color(1,.5,1));
 		        colors.push_back(Color(.5,1,1));
 		        colors.push_back(Color(1,.5,0));
 		        colors.push_back(Color(.5,1,0));
@@ -172,5 +172,5 @@
+		    }
 		    ///Adds a new color to the end of the color list.
-		    void add(const Color &c)
 		    void add(const Color &c)
+		    {
 		      colors.push_back(c);
@@ -187,5 +187,5 @@
 		  ///Returns a \ref Color which is as different from the given parameter
 		  ///as it is possible.
-		  inline Color distantColor(const Color &c)
 		  inline Color distantColor(const Color &c)
+		  {
 		    return Color(c.red()<.5?1:0,c.green()<.5?1:0,c.blue()<.5?1:0);

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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -37,5 +37,5 @@
 		///\brief Basic utilities for concept checking.
 		///
-		///\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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -47,5 +47,5 @@
 		    private:
 		      ///Digraphs are \e not copy constructible. Use DigraphCopy() instead.
 		      ///Digraphs are \e not copy constructible. Use DigraphCopy() instead.
 		      ///
@@ -53,5 +53,5 @@
 		      ///\brief Assignment of \ref Digraph "Digraph"s to another ones are
 		      ///\e not allowed. Use DigraphCopy() instead.
 		      ///Assignment of \ref Digraph "Digraph"s to another ones are
 		      ///\e not allowed.  Use DigraphCopy() instead.
@@ -96,21 +96,21 @@
 		        /// Inequality operator
 		        /// \sa operator==(Node n)
 		        ///
 		        bool operator!=(Node) const { return true; }
 			/// 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.
@@ -130,5 +130,5 @@
 		        NodeIt() { }
 		        /// Copy constructor.
 		        /// Copy constructor.
 		        ///
@@ -146,7 +146,7 @@
 		        /// Node -> NodeIt conversion.
 		        /// 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.
 		        NodeIt(const Digraph&, const Node&) { }
@@ -157,6 +157,6 @@
 		        NodeIt& operator++() { return *this; }
 		      };
 		      /// Class for identifying an arc of the digraph
@@ -192,15 +192,15 @@
 		        bool operator!=(Arc) const { return true; }
 			/// 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.
@@ -214,5 +214,5 @@
 		      /// for (Digraph::OutArcIt e(g, n); e!=INVALID; ++e) ++count;
 		      ///\endcode
 		      class OutArcIt : public Arc {
 		      public:
@@ -233,5 +233,5 @@
 		        OutArcIt(Invalid) { }
 		        /// This constructor sets the iterator to the first outgoing arc.
 		        /// This constructor sets the iterator to the first outgoing arc of
 		        /// the node.
@@ -240,10 +240,10 @@
 		        /// 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.
 		        OutArcIt(const Digraph&, const Arc&) { }
 		        ///Next outgoing arc
 		        /// Assign the iterator to the next
 		        /// Assign the iterator to the next
 		        /// outgoing arc of the corresponding node.
 		        OutArcIt& operator++() { return *this; }
@@ -280,5 +280,5 @@
 		        InArcIt(Invalid) { }
 		        /// This constructor sets the iterator to first incoming arc.
 		        /// This constructor set the iterator to the first incoming arc of
 		        /// the node.
@@ -287,5 +287,5 @@
 		        /// 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.
 		        InArcIt(const Digraph&, const Arc&) { }
@@ -323,5 +323,5 @@
 		        ArcIt(Invalid) { }
 		        /// This constructor sets the iterator to the first arc.
 		        /// This constructor sets the iterator to the first arc of \c g.
 		        ///@param g the digraph
@@ -330,9 +330,9 @@
 		        /// 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.
 		        ArcIt& operator++() { return *this; }
@@ -350,24 +350,24 @@
 		      /// \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; }
 		      /// \brief Returns the node with the given ID.
 		      ///
 		      /// \pre The argument should be a valid node ID in the graph.
-		      Node nodeFromId(int) const { return INVALID; }
 		      Node nodeFromId(int) const { return INVALID; }
 		      /// \brief Returns the arc with the given ID.
 		      ///
 		      /// \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; }
 		      void first(Node&) const {}
@@ -390,7 +390,7 @@
 		      // 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; }
 		      /// \brief The base node of the iterator.
@@ -424,8 +424,8 @@
 		      /// \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 > {
 		      public:
@@ -440,7 +440,7 @@
 		        ///Assignment operator
 		        template <typename CMap>
-		        NodeMap& operator=(const CMap&) {
 		        NodeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Node, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
 		      };
@@ -450,5 +450,5 @@
 		      /// Reference map of the arcs to type \c T.
 		      /// \sa Reference
-		      template<class T>
 		      template<class T>
 		      class ArcMap : public ReadWriteMap<Arc,T> {
 		      public:
@@ -462,7 +462,7 @@
 		        ///Assignment operator
 		        template <typename CMap>
-		        ArcMap& operator=(const CMap&) {
 		        ArcMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Arc, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
 		      };
@@ -472,5 +472,5 @@
 		        void constraints() {
 		          checkConcept<IterableDigraphComponent<>, _Digraph>();
-			  checkConcept<IDableDigraphComponent<>, _Digraph>();
+		          checkConcept<IDableDigraphComponent<>, _Digraph>();
 		          checkConcept<MappableDigraphComponent<>, _Digraph>();
+		        }
@@ -478,6 +478,6 @@
 		    };
 		  } //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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -66,5 +66,5 @@
 		    /// direction. The IncEdgeIt iterates also on the same edges
 		    /// as the OutArcIt and InArcIt but it is not convertible to Arc just
-		    /// to Edge.
 		    /// to Edge.
 		    class Graph {
 		    public:
@@ -73,14 +73,14 @@
 		      ///
 		      /// 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.
 		      ///
 		      /// This is the base type of each node iterator,
 		      /// 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.
 		      class Node {
@@ -109,21 +109,21 @@
 		        /// Inequality operator
 		        /// \sa operator==(Node n)
 		        ///
 		        bool operator!=(Node) const { return true; }
 			/// 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.
@@ -143,5 +143,5 @@
 		        NodeIt() { }
 		        /// Copy constructor.
 		        /// Copy constructor.
 		        ///
@@ -159,7 +159,7 @@
 		        /// Node -> NodeIt conversion.
 		        /// 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.
 		        NodeIt(const Graph&, const Node&) { }
@@ -170,6 +170,6 @@
 		        NodeIt& operator++() { return *this; }
 		      };
 		      /// The base type of the edge iterators.
@@ -204,13 +204,13 @@
 		        bool operator!=(Edge) const { return true; }
 			/// 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; }
 		      };
@@ -242,5 +242,5 @@
 		        EdgeIt(Invalid) { }
 		        /// This constructor sets the iterator to the first edge.
 		        /// This constructor sets the iterator to the first edge.
 		        EdgeIt(const Graph&) { }
@@ -249,23 +249,23 @@
 		        /// Sets the iterator to the value of the trivial iterator.
 		        /// 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.
 		        EdgeIt& operator++() { return *this; }
 		      };
-		      /// \brief This iterator goes trough the incident undirected
 		      /// \brief This iterator goes trough the incident undirected
 		      /// arcs of a node.
 		      ///
 		      /// 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.
 		      ///
 		      ///\code
@@ -291,5 +291,5 @@
 		        IncEdgeIt(Invalid) { }
 		        /// This constructor sets the iterator to first incident arc.
 		        /// This constructor set the iterator to the first incident arc of
 		        /// the node.
@@ -298,5 +298,5 @@
 		        /// 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.
 		        IncEdgeIt(const Graph&, const Edge&) { }
@@ -304,5 +304,5 @@
 		        /// Assign the iterator to the next incident arc
-			/// of the corresponding node.
+		        /// of the corresponding node.
 		        IncEdgeIt& operator++() { return *this; }
 		      };
@@ -341,15 +341,15 @@
 		        bool operator!=(Arc) const { return true; }
 			/// 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.
@@ -379,5 +379,5 @@
 		        ArcIt(Invalid) { }
 		        /// This constructor sets the iterator to the first arc.
 		        /// This constructor sets the iterator to the first arc of \c g.
 		        ///@param g the graph
@@ -386,13 +386,13 @@
 		        /// 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.
 		        ArcIt& operator++() { return *this; }
 		      };
 		      /// This iterator goes trough the outgoing directed arcs of a node.
@@ -406,5 +406,5 @@
 		      /// for (Graph::OutArcIt e(g, n); e!=INVALID; ++e) ++count;
 		      ///\endcode
 		      class OutArcIt : public Arc {
 		      public:
@@ -425,5 +425,5 @@
 		        OutArcIt(Invalid) { }
 		        /// This constructor sets the iterator to the first outgoing arc.
 		        /// This constructor sets the iterator to the first outgoing arc of
 		        /// the node.
@@ -431,16 +431,16 @@
 		        ///@param g the graph
 		        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
 		        /// 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.
 		        OutArcIt(const Graph&, const Arc&) { }
 		        ///Next outgoing arc
 		        /// Assign the iterator to the next
 		        /// Assign the iterator to the next
 		        /// outgoing arc of the corresponding node.
 		        OutArcIt& operator++() { return *this; }
@@ -477,17 +477,17 @@
 		        InArcIt(Invalid) { }
 		        /// This constructor sets the iterator to first incoming arc.
 		        /// This constructor set the iterator to the first incoming arc of
 		        /// the node.
 		        ///@param n the node
 		        ///@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
 		        /// 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.
 		        InArcIt(const Graph&, const Arc&) { }
@@ -500,8 +500,8 @@
 		      /// \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 >
+		      {
@@ -517,7 +517,7 @@
 		        ///Assignment operator
 		        template <typename CMap>
-		        NodeMap& operator=(const CMap&) {
 		        NodeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Node, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
 		      };
@@ -527,5 +527,5 @@
 		      /// Reference map of the directed arcs to type \c T.
 		      /// \sa Reference
-		      template<class T>
 		      template<class T>
 		      class ArcMap : public ReadWriteMap<Arc,T>
+		      {
@@ -540,7 +540,7 @@
 		        ///Assignment operator
 		        template <typename CMap>
-		        ArcMap& operator=(const CMap&) {
 		        ArcMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Arc, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
 		      };
@@ -550,5 +550,5 @@
 		      /// Reference map of the arcs to type \c T.
 		      /// \sa Reference
-		      template<class T>
 		      template<class T>
 		      class EdgeMap : public ReadWriteMap<Edge,T>
+		      {
@@ -563,7 +563,7 @@
 		        ///Assignment operator
 		        template <typename CMap>
-		        EdgeMap& operator=(const CMap&) {
 		        EdgeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Edge, T>, CMap>();
-		          return *this;
 		          return *this;
+		        }
 		      };
@@ -574,5 +574,5 @@
 		      /// will be the given node.
 		      Arc direct(const Edge&, const Node&) const {
-			return INVALID;
+		        return INVALID;
+		      }
@@ -584,5 +584,5 @@
 		      /// the directed arc is the same when the given bool is true.
 		      Arc direct(const Edge&, bool) const {
-			return INVALID;
+		        return INVALID;
+		      }
@@ -626,35 +626,35 @@
 		      /// \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; }
 		      /// \brief Returns the node with the given id.
 		      ///
 		      /// \pre The argument should be a valid node id in the graph.
-		      Node nodeFromId(int) const { return INVALID; }
 		      Node nodeFromId(int) const { return INVALID; }
 		      /// \brief Returns the edge with the given id.
 		      ///
 		      /// \pre The argument should be a valid edge id in the graph.
-		      Edge edgeFromId(int) const { return INVALID; }
 		      Edge edgeFromId(int) const { return INVALID; }
 		      /// \brief Returns the arc with the given id.
 		      ///
 		      /// \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; }
 		      void first(Node&) const {}
@@ -684,9 +684,9 @@
 		      // 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; }
 		      /// \brief Base node of the iterator
@@ -694,5 +694,5 @@
 		      /// Returns the base node (the source in this case) of the iterator
 		      Node baseNode(OutArcIt e) const {
-			return source(e);
+		        return source(e);
+		      }
 		      /// \brief Running node of the iterator
@@ -701,5 +701,5 @@
 		      /// iterator
 		      Node runningNode(OutArcIt e) const {
-			return target(e);
+		        return target(e);
+		      }
@@ -708,5 +708,5 @@
 		      /// Returns the base node (the target in this case) of the iterator
 		      Node baseNode(InArcIt e) const {
-			return target(e);
+		        return target(e);
+		      }
 		      /// \brief Running node of the iterator
@@ -715,5 +715,5 @@
 		      /// iterator
 		      Node runningNode(InArcIt e) const {
-			return source(e);
+		        return source(e);
+		      }
@@ -722,21 +722,21 @@
 		      /// Returns the base node of the iterator
 		      Node baseNode(IncEdgeIt) const {
-			return INVALID;
+		        return INVALID;
+		      }
 		      /// \brief Running node of the iterator
 		      ///
 		      /// Returns the running node of the iterator
 		      Node runningNode(IncEdgeIt) const {
-			return INVALID;
+		        return INVALID;
+		      }
 		      template <typename _Graph>
 		      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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -50,5 +50,5 @@
 		    public:
 		      /// \brief Default constructor.
-		      ///
 		      ///
 		      /// \warning The default constructor is not required to set
 		      /// the item to some well-defined value. So you should consider it
@@ -67,5 +67,5 @@
 		      /// \brief Assign operator for nodes.
 		      ///
-		      /// The nodes are assignable.
 		      /// The nodes are assignable.
 		      ///
 		      GraphItem& operator=(GraphItem const&) { return *this; }
@@ -93,25 +93,25 @@
 		      template<typename _GraphItem>
 		      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;
 		      };
 		    };
 		    /// \brief An empty base directed graph class.
-		    ///
 		    ///
 		    /// This class provides the minimal set of features needed for a
 		    /// directed graph structure. All digraph concepts have to be
@@ -123,8 +123,8 @@
 		      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.
 		      ///
 		      typedef GraphItem<'n'> Node;
@@ -132,5 +132,5 @@
 		      /// \brief Arc class of the digraph.
 		      ///
-		      /// This class represents the Arcs of the digraph.
 		      /// This class represents the Arcs of the digraph.
 		      ///
 		      typedef GraphItem<'e'> Arc;
@@ -157,25 +157,25 @@
 		      template <typename _Digraph>
 		      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;
 		      };
 		    };
 		    /// \brief An empty base undirected graph class.
-		    ///
 		    ///
 		    /// This class provides the minimal set of features needed for an
 		    /// undirected graph structure. All undirected graph concepts have
@@ -200,5 +200,5 @@
 		        typedef GraphItem<'u'> Parent;
 		        /// \brief Default constructor.
-		        ///
 		        ///
 		        /// \warning The default constructor is not required to set
 		        /// the item to some well-defined value. So you should consider it
@@ -218,10 +218,10 @@
 		        ///
 		        /// Besides the core graph item functionality each arc should
-		        /// be convertible to the represented edge.
 		        /// be convertible to the represented edge.
 		        Edge(const Arc&) {}
 		        /// \brief Assign arc to edge.
 		        ///
 		        /// 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; }
 		      };
@@ -238,5 +238,5 @@
 		      /// Returns the directed arc from its direction and the
 		      /// represented edge.
-		      Arc direct(const Edge&, bool) const { return INVALID;}
 		      Arc direct(const Edge&, bool) const { return INVALID;}
 		      /// \brief Returns the directed arc.
@@ -244,5 +244,5 @@
 		      /// Returns the directed arc from its source and the
 		      /// represented edge.
-		      Arc direct(const Edge&, const Node&) const { return INVALID;}
 		      Arc direct(const Edge&, const Node&) const { return INVALID;}
 		      /// \brief Returns the opposite arc.
@@ -261,20 +261,20 @@
 		      /// Gives back the other ending of an edge.
 		      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);
 		            e = graph.direct(ue, n);
@@ -283,8 +283,8 @@
 		            bool d = graph.direction(e);
 		            ignore_unused_variable_warning(d);
+			  }
+			}
 			const _Graph& graph;
+		          }
+		        }
 		        const _Graph& graph;
 		      };
@@ -292,5 +292,5 @@
 		    /// \brief An empty idable base digraph class.
-		    ///
 		    ///
 		    /// This class provides beside the core digraph features
 		    /// core id functions for the digraph structure.
@@ -305,7 +305,7 @@
 		      typedef typename Base::Arc Arc;
-		      /// \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.
 		      ///
 		      int id(const Node&) const { return -1;}
@@ -315,10 +315,10 @@
 		      /// Gives back the node by the unique id.
 		      /// 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.
 		      ///
 		      int id(const Arc&) const { return -1;}
@@ -328,5 +328,5 @@
 		      /// Gives back the arc by the unique id.
 		      /// 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;}
@@ -348,27 +348,27 @@
 		      struct Constraints {
 			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;
 		      };
 		    };
 		    /// \brief An empty idable base undirected graph class.
-		    ///
 		    ///
 		    /// This class provides beside the core undirected graph features
 		    /// core id functions for the undirected graph structure.  The
@@ -384,7 +384,7 @@
 		      using IDableDigraphComponent<_Base>::id;
-		      /// \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.
 		      ///
 		      int id(const Edge&) const { return -1;}
@@ -407,16 +407,16 @@
 		      struct Constraints {
 			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;
 		      };
 		    };
@@ -451,37 +451,37 @@
 		      /// \brief Assign operator for items.
 		      ///
-		      /// 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.
 		      ///
 		      GraphItemIt& operator++() { return *this; }
 		      /// \brief Equality operator
-		      ///
 		      ///
 		      /// Two iterators are equal if and only if they point to the
 		      /// same object or both are invalid.
 		      bool operator==(const GraphItemIt&) const { return true;}
 		      /// \brief Inequality operator
-		      ///
 		      ///
 		      /// \sa operator==(Node n)
 		      ///
 		      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;
 		      };
 		    };
@@ -490,11 +490,11 @@
 		    ///
 		    /// \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 {
 		    public:
@@ -509,8 +509,8 @@
 		      ///
 		      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.
 		      ///
@@ -523,7 +523,7 @@
 		      /// \brief Assign operator for iterators.
 		      ///
-		      /// The iterators are assignable.
 		      /// The iterators are assignable.
 		      ///
-		      GraphIncIt& operator=(GraphIncIt const&) { return *this; }
 		      GraphIncIt& operator=(GraphIncIt const&) { return *this; }
 		      /// \brief Next item.
 		      ///
@@ -546,21 +546,21 @@
 		      template <typename _GraphIncIt>
 		      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;
 		      };
 		    };
@@ -576,5 +576,5 @@
 		    public:
 		      typedef _Base Base;
 		      typedef typename Base::Node Node;
@@ -584,13 +584,13 @@
 		      /// \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 {}
@@ -598,5 +598,5 @@
 		      ///
 		      /// Gives back the next node in the iterating order.
-		      ///
 		      ///
 		      void next(Node&) const {}
@@ -604,5 +604,5 @@
 		      ///
 		      /// Gives back the first arc in the iterating order.
-		      ///
 		      ///
 		      void first(Arc&) const {}
@@ -610,5 +610,5 @@
 		      ///
 		      /// Gives back the next arc in the iterating order.
-		      ///
 		      ///
 		      void next(Arc&) const {}
@@ -618,5 +618,5 @@
 		      ///
 		      /// Gives back the first of the arcs point to the given node.
-		      ///
 		      ///
 		      void firstIn(Arc&, const Node&) const {}
@@ -630,7 +630,7 @@
 		      /// \brief Gives back the first of the arcs start from the
 		      /// given node.
-		      ///
 		      ///
 		      /// Gives back the first of the arcs start from the given node.
-		      ///
 		      ///
 		      void firstOut(Arc&, const Node&) const {}
@@ -639,5 +639,5 @@
 		      ///
 		      /// Gives back the next of the arcs start from the given node.
-		      ///
 		      ///
 		      void nextOut(Arc&) const {}
@@ -645,5 +645,5 @@
 		      /// \name Class based iteration
-		      ///
 		      ///
 		      /// This interface provides functions for iteration on digraph items
 		      ///
@@ -700,11 +700,11 @@
 		      /// @}
-		      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);
+		            {
@@ -724,5 +724,5 @@
 		              digraph.nextOut(arc);
+		            }
+		          }
+		          }
+		          {
@@ -731,7 +731,7 @@
 		            checkConcept<GraphItemIt<_Digraph, typename _Digraph::Node>,
 		              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>();
@@ -746,7 +746,7 @@
+		          }
+		        }
 			const _Digraph& digraph;
 		        const _Digraph& digraph;
 		      };
 		    };
@@ -766,11 +766,11 @@
 		      typedef typename Base::Edge Edge;
 		      typedef IterableGraphComponent Graph;
 		      /// \name Base iteration
-		      ///
 		      ///
 		      /// This interface provides functions for iteration on graph items
-		      /// @{
 		      /// @{
 		      using IterableDigraphComponent<_Base>::first;
@@ -781,5 +781,5 @@
 		      ///
 		      /// Gives back the first edge in the iterating order.
-		      ///
 		      ///
 		      void first(Edge&) const {}
@@ -788,5 +788,5 @@
 		      ///
 		      /// Gives back the next edge in the iterating order.
-		      ///
 		      ///
 		      void next(Edge&) const {}
@@ -815,5 +815,5 @@
 		      /// \name Class based iteration
-		      ///
 		      ///
 		      /// This interface provides functions for iteration on graph items
 		      ///
@@ -842,8 +842,8 @@
 		      /// @}
-		      template <typename _Graph>
 		      template <typename _Graph>
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<IterableDigraphComponent<Base>, _Graph>();
 		        void constraints() {
 		          checkConcept<IterableDigraphComponent<Base>, _Graph>();
+		          {
@@ -859,13 +859,13 @@
 		              graph.nextInc(edge, dir);
+		            }
+		          }
+		          }
+		          {
 		            checkConcept<GraphItemIt<_Graph, typename _Graph::Edge>,
 		              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;
 		            typename _Graph::IncEdgeIt ueit(INVALID);
@@ -874,12 +874,12 @@
+		          }
+		        }
 			const _Graph& graph;
 		        const _Graph& graph;
 		      };
 		    };
 		    /// \brief An empty alteration notifier digraph class.
-		    ///
 		    ///
 		    /// This class provides beside the core digraph features alteration
 		    /// notifier interface for the digraph structure.  This implements
@@ -898,46 +898,46 @@
 		      /// 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.
 		      ///
 		      /// Gives back the node alteration notifier.
 		      NodeNotifier& notifier(Node) const {
-			return NodeNotifier();
+		        return NodeNotifier();
+		      }
 		      /// \brief Gives back the arc alteration notifier.
 		      ///
 		      /// Gives back the arc alteration notifier.
 		      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;
 		      };
 		    };
 		    /// \brief An empty alteration notifier undirected graph class.
-		    ///
 		    ///
 		    /// This class provides beside the core graph features alteration
 		    /// notifier interface for the graph structure.  This implements
@@ -955,31 +955,31 @@
 		      /// The arc observer registry.
-		      typedef AlterationNotifier<AlterableGraphComponent, Edge>
 		      typedef AlterationNotifier<AlterableGraphComponent, Edge>
 		      EdgeNotifier;
 		      /// \brief Gives back the arc alteration notifier.
 		      ///
 		      /// Gives back the arc alteration notifier.
 		      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;
 		      };
 		    };
 		    /// \brief Class describing the concept of graph maps
-		    ///
 		    ///
 		    /// This class describes the common interface of the graph maps
 		    /// (NodeMap, ArcMap), that is \ref maps-page "maps" which can be used to
@@ -1010,12 +1010,12 @@
 		      /// Copy Constructor.
 		      GraphMap(const GraphMap&) : Parent() {}
 		      /// \brief Assign operator.
 		      ///
 		      /// Assign operator. It does not mofify the underlying graph,
 		      /// 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>();
 		        return *this;
@@ -1024,23 +1024,23 @@
 		      template<typename _Map>
 		      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;
 		          b = cmap;
 			  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;
 		      };
@@ -1071,26 +1071,26 @@
 		        typedef GraphMap<MappableDigraphComponent, Node, _Value> Parent;
 			/// \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>();
 		          return *this;
@@ -1108,26 +1108,26 @@
 		        typedef GraphMap<MappableDigraphComponent, Arc, _Value> Parent;
 			/// \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>();
 		          return *this;
@@ -1140,42 +1140,42 @@
 		      struct Constraints {
 			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;
 		      };
 		    };
@@ -1200,30 +1200,30 @@
 		      ///
 		      template <typename _Value>
-		      class EdgeMap : public GraphMap<Graph, Edge, _Value> {
 		      class EdgeMap : public GraphMap<Graph, Edge, _Value> {
 		      public:
 		        typedef GraphMap<MappableGraphComponent, Edge, _Value> Parent;
 			/// \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>();
 		          return *this;
@@ -1236,29 +1236,29 @@
 		      struct Constraints {
 			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;
 		      };
 		    };
@@ -1283,26 +1283,26 @@
 		      ///
 		      Node addNode() {
-			return INVALID;
+		        return INVALID;
+		      }
 		      /// \brief Adds a new arc connects the given two nodes.
 		      ///
 		      /// Adds a new arc connects the the given two nodes.
 		      Arc addArc(const Node&, const Node&) {
-			return INVALID;
+		        return INVALID;
+		      }
 		      template <typename _Digraph>
 		      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;
 		      };
 		    };
@@ -1328,31 +1328,31 @@
 		      ///
 		      Node addNode() {
-			return INVALID;
+		        return INVALID;
+		      }
 		      /// \brief Adds a new arc connects the given two nodes.
 		      ///
 		      /// Adds a new arc connects the the given two nodes.
 		      Edge addArc(const Node&, const Node&) {
-			return INVALID;
+		        return INVALID;
+		      }
 		      template <typename _Graph>
 		      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;
 		      };
 		    };
 		    /// \brief An empty erasable digraph class.
-		    ///
 		    ///
 		    /// This class provides beside the core digraph features core erase
 		    /// functions for the digraph structure. The main difference between
@@ -1369,7 +1369,7 @@
 		      /// \brief Erase a node from the digraph.
 		      ///
-		      /// 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&) {}
 		      /// \brief Erase an arc from the digraph.
@@ -1381,18 +1381,18 @@
 		      template <typename _Digraph>
 		      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;
 		      };
 		    };
 		    /// \brief An empty erasable base undirected graph class.
-		    ///
 		    ///
 		    /// This class provides beside the core undirected graph features
 		    /// core erase functions for the undirceted graph structure. The
@@ -1411,5 +1411,5 @@
 		      /// Erase a node from the graph. This function should erase
 		      /// arcs connecting to the node.
-		      void erase(const Node&) {}
 		      void erase(const Node&) {}
 		      /// \brief Erase an arc from the graph.
@@ -1421,13 +1421,13 @@
 		      template <typename _Graph>
 		      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;
 		      };
 		    };
@@ -1449,14 +1449,14 @@
 		      /// Erase all nodes and arcs from the digraph.
 		      ///
-		      void clear() {}
 		      void clear() {}
 		      template <typename _Digraph>
 		      struct Constraints {
-			void constraints() {
+		        void constraints() {
 		          checkConcept<Base, _Digraph>();
 			  digraph.clear();
+			}
 		          digraph.clear();
+		        }
-			_Digraph digraph;
+		        _Digraph digraph;
 		      };
 		    };
@@ -1476,9 +1476,9 @@
 		      template <typename _Graph>
 		      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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -53,12 +53,12 @@
 		      /// the user.
 		      ///
-		      /// 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.
 		      ///
@@ -86,6 +86,6 @@
 		      /// \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.
 		      /// \param p The priority of the item.
@@ -113,10 +113,10 @@
 		      ///
 		      /// 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) {}
 		      /// \brief The priority of an item.
 		      ///
-		      /// Returns the priority of the given item.
 		      /// Returns the priority of the given item.
 		      /// \pre \c i must be in the heap.
 		      /// \param i The item.
@@ -134,5 +134,5 @@
 		      /// \param p The priority.
 		      void set(const Item &i, const Prio &p) {}
 		      /// \brief Decreases the priority of an item to the given value.
 		      ///
@@ -175,67 +175,67 @@
 		      struct Constraints {
 		      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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -48,5 +48,5 @@
 		      /// Returns the value associated with the given key.
-		      Value operator[](const Key &) const {
 		      Value operator[](const Key &) const {
 		        return *static_cast<Value *>(0);
+		      }
@@ -54,18 +54,18 @@
 		      template<typename _ReadMap>
 		      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;
 		      };
@@ -94,18 +94,18 @@
 		      template <typename _WriteMap>
 		      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;
 		      };
 		    };
@@ -117,5 +117,5 @@
 		    template<typename K, typename T>
 		    class ReadWriteMap : public ReadMap<K,T>,
-					 public WriteMap<K,T>
+		                         public WriteMap<K,T>
+		    {
 		    public:
@@ -126,5 +126,5 @@
 		      /// Returns the value associated with the given key.
-		      Value operator[](const Key &) const {
 		      Value operator[](const Key &) const {
 		        return *static_cast<Value *>(0);
+		      }
@@ -135,8 +135,8 @@
 		      template<typename _ReadWriteMap>
 		      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 >();
+		        }
 		      };
 		    };
@@ -165,5 +165,5 @@
 		      /// Returns a reference to the value associated with the given key.
-		      Reference operator[](const Key &) {
 		      Reference operator[](const Key &) {
 		        return *static_cast<Value *>(0);
+		      }
@@ -179,26 +179,26 @@
 		      template<typename _ReferenceMap>
 		      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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -40,5 +40,5 @@
 		    ///
 		    /// A skeleton structure for representing directed paths in a
-		    /// digraph.
 		    /// digraph.
 		    /// \tparam _Digraph The digraph type in which the path is.
 		    ///
@@ -84,23 +84,23 @@
 		      class ArcIt {
 		      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;}
 		      };
@@ -138,5 +138,5 @@
 		    namespace _path_bits {
 		      template <typename _Digraph, typename _Path, typename RevPathTag = void>
 		      struct PathDumperConstraints {
@@ -163,5 +163,5 @@
 		      template <typename _Digraph, typename _Path>
 		      struct PathDumperConstraints<
-		        _Digraph, _Path,
 		        _Digraph, _Path,
 		        typename enable_if<typename _Path::RevPathTag, void>::type
 		      > {
@@ -185,5 +185,5 @@
 		        _Path& p;
 		      };
+		    }
@@ -210,5 +210,5 @@
 		    /// The paths can be constructed from any path type by a
 		    /// template constructor or a template assignment operator.
-		    ///
 		    ///
 		    template <typename _Digraph>
 		    class PathDumper {
@@ -239,23 +239,23 @@
 		      class ArcIt {
 		      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;}
 		      };
@@ -267,23 +267,23 @@
 		      class RevArcIt {
 		      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.
+		 *
 		 * Copyright (C) 2003-2008
@@ -27,5 +27,5 @@
 		///\brief Tools for counting steps and events
-		namespace lemon
 		namespace lemon
+		{
@@ -33,5 +33,5 @@
 		  template<class P>
-		  class _SubCounter
 		  class _SubCounter
+		  {
 		    P &_parent;
@@ -50,5 +50,5 @@
 		    _SubCounter(P &parent,const char *title,std::ostream &os=std::cerr)
 		      : _parent(parent), _title(title), _os(os), count(0) {}
-		    ~_SubCounter() {
 		    ~_SubCounter() {
 		      _os << _title << count <<std::endl;
 		      _parent+=count;
@@ -64,5 +64,5 @@
 		  template<class P>
-		  class _NoSubCounter
 		  class _NoSubCounter
+		  {
 		    P &_parent;
@@ -70,9 +70,9 @@
 		    typedef _NoSubCounter<_NoSubCounter<P> > SubCounter;
 		    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) {}
 		    _NoSubCounter(P &parent,const char *,std::ostream &)
@@ -103,5 +103,5 @@
 		  /// for different types of operations.
 		  /// A report containing the given title and the value of the counter
-		  /// is automatically printed on destruction.
 		  /// is automatically printed on destruction.
 		  ///
 		  /// The following example shows the usage of counters and subcounters.
@@ -134,5 +134,5 @@
 		  ///
 		  /// \sa NoCounter
-		  class Counter
 		  class Counter
+		  {
 		    std::string _title;
@@ -142,5 +142,5 @@
 		    /// SubCounter class
 		    /// This class can be used to setup subcounters for a \ref Counter
 		    /// to have finer reports. A subcounter provides exactly the same
@@ -148,5 +148,5 @@
 		    /// decrements the value of its parent.
 		    /// Subcounters can also have subcounters.
-		    ///
 		    ///
 		    /// The parent counter must be given as the first parameter of the
 		    /// constructor. Apart from that a title and an \c ostream object
@@ -157,10 +157,10 @@
 		    /// would like to turn off this report, use \ref NoSubCounter
 		    /// instead.
-		    ///
 		    ///
 		    /// \sa NoSubCounter
 		    typedef _SubCounter<Counter> SubCounter;
 		    /// 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.
 		    /// It is the same as \ref SubCounter but it does not print report
@@ -169,5 +169,5 @@
 		    ///
 		    /// 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
 		    /// and the increment or decrement operators.
@@ -179,5 +179,5 @@
 		    Counter() : _title(), _os(std::cerr), count(0) {}
 		    /// 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) {}
 		    /// Constructor.
@@ -205,5 +205,5 @@
 		    /// \note This function does not reset the values of
 		    /// \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;}
 		    /// Returns the value of the counter.

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