[Lemon-commits] Alpar Juttner: Merge
Lemon HG
hg at lemon.cs.elte.hu
Sun Sep 28 11:15:12 CEST 2008
details: http://lemon.cs.elte.hu/hg/lemon/rev/66bb22401834
changeset: 283:66bb22401834
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Sat Sep 27 13:45:50 2008 +0200
description:
Merge
diffstat:
15 files changed, 7 insertions(+), 53 deletions(-)
lemon/bfs.h | 9 ++-------
lemon/bits/base_extender.h | 3 ---
lemon/bits/vector_map.h | 3 +--
lemon/concept_check.h | 2 --
lemon/concepts/path.h | 1 -
lemon/dfs.h | 9 ++-------
lemon/dijkstra.h | 12 +-----------
lemon/error.h | 2 --
lemon/graph_to_eps.h | 5 -----
lemon/list_graph.h | 4 +---
lemon/maps.h | 4 ----
lemon/random.h | 1 -
lemon/smart_graph.h | 1 -
lemon/time_measure.h | 2 --
lemon/tolerance.h | 2 --
diffs (truncated from 353 to 300 lines):
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/bfs.h
--- a/lemon/bfs.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/bfs.h Sat Sep 27 13:45:50 2008 +0200
@@ -54,7 +54,6 @@
///This function instantiates a \ref PredMap.
///\param g is the digraph, to which we would like to define the
///\ref PredMap.
- ///\todo The digraph alone may be insufficient to initialize
static PredMap *createPredMap(const Digraph &g)
{
return new PredMap(g);
@@ -64,7 +63,6 @@
///The type of the map that indicates which nodes are processed.
///It must meet the \ref concepts::WriteMap "WriteMap" concept.
- ///By default it is a NullMap.
typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
///Instantiates a \ref ProcessedMap.
@@ -196,8 +194,7 @@
int _queue_head,_queue_tail,_queue_next_dist;
int _curr_dist;
- ///Creates the maps if necessary.
- ///\todo Better memory allocation (instead of new).
+ //Creates the maps if necessary.
void create_maps()
{
if(!_pred) {
@@ -848,7 +845,6 @@
///This function instantiates a \ref PredMap.
///\param g is the digraph, to which we would like to define the
///\ref PredMap.
- ///\todo The digraph alone may be insufficient to initialize
static PredMap *createPredMap(const Digraph &g)
{
return new PredMap(g);
@@ -1370,8 +1366,7 @@
std::vector<typename Digraph::Node> _list;
int _list_front, _list_back;
- ///Creates the maps if necessary.
- ///\todo Better memory allocation (instead of new).
+ //Creates the maps if necessary.
void create_maps() {
if(!_reached) {
local_reached = true;
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/bits/base_extender.h
--- a/lemon/bits/base_extender.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/bits/base_extender.h Sat Sep 27 13:45:50 2008 +0200
@@ -105,9 +105,6 @@
/// Returns whether the given directed arc has the same orientation
/// as the corresponding edge.
- ///
- /// \todo reference to the corresponding point of the undirected digraph
- /// concept. "What does the direction of an edge mean?"
static bool direction(const Arc &a) { return a.forward; }
using Parent::first;
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/bits/vector_map.h
--- a/lemon/bits/vector_map.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/bits/vector_map.h Sat Sep 27 13:45:50 2008 +0200
@@ -42,10 +42,9 @@
/// automatically updates the map when a key is added to or erased from
/// the map. This map type uses the std::vector to store the values.
///
- /// \tparam _Notifier The AlterationNotifier that will notify this map.
+ /// \tparam _Graph The graph this map is attached to.
/// \tparam _Item The item type of the graph items.
/// \tparam _Value The value type of the map.
- /// \todo Fix the doc: there is _Graph parameter instead of _Notifier.
template <typename _Graph, typename _Item, typename _Value>
class VectorMap
: public ItemSetTraits<_Graph, _Item>::ItemNotifier::ObserverBase {
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/concept_check.h
--- a/lemon/concept_check.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/concept_check.h Sat Sep 27 13:45:50 2008 +0200
@@ -36,8 +36,6 @@
///\file
///\brief Basic utilities for concept checking.
///
-///\todo Are we still using BOOST concept checking utility?
-///Is the BOOST copyright notice necessary?
#ifndef LEMON_CONCEPT_CHECK_H
#define LEMON_CONCEPT_CHECK_H
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/concepts/path.h
--- a/lemon/concepts/path.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/concepts/path.h Sat Sep 27 13:45:50 2008 +0200
@@ -20,7 +20,6 @@
///\file
///\brief Classes for representing paths in digraphs.
///
-///\todo Iterators have obsolete style
#ifndef LEMON_CONCEPT_PATH_H
#define LEMON_CONCEPT_PATH_H
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/dfs.h
--- a/lemon/dfs.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/dfs.h Sat Sep 27 13:45:50 2008 +0200
@@ -55,7 +55,6 @@
///This function instantiates a \ref PredMap.
///\param g is the digraph, to which we would like to define the
///\ref PredMap.
- ///\todo The digraph alone may be insufficient to initialize
static PredMap *createPredMap(const Digraph &g)
{
return new PredMap(g);
@@ -65,7 +64,6 @@
///The type of the map that indicates which nodes are processed.
///It must meet the \ref concepts::WriteMap "WriteMap" concept.
- ///By default it is a NullMap.
typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
///Instantiates a \ref ProcessedMap.
@@ -196,8 +194,7 @@
std::vector<typename Digraph::OutArcIt> _stack;
int _stack_head;
- ///Creates the maps if necessary.
- ///\todo Better memory allocation (instead of new).
+ //Creates the maps if necessary.
void create_maps()
{
if(!_pred) {
@@ -782,7 +779,6 @@
///This function instantiates a \ref PredMap.
///\param g is the digraph, to which we would like to define the
///\ref PredMap.
- ///\todo The digraph alone may be insufficient to initialize
static PredMap *createPredMap(const Digraph &g)
{
return new PredMap(g);
@@ -1317,8 +1313,7 @@
std::vector<typename Digraph::Arc> _stack;
int _stack_head;
- ///Creates the maps if necessary.
- ///\todo Better memory allocation (instead of new).
+ //Creates the maps if necessary.
void create_maps() {
if(!_reached) {
local_reached = true;
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/dijkstra.h
--- a/lemon/dijkstra.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/dijkstra.h Sat Sep 27 13:45:50 2008 +0200
@@ -144,7 +144,6 @@
///This function instantiates a \ref PredMap.
///\param g is the digraph, to which we would like to define the
///\ref PredMap.
- ///\todo The digraph alone may be insufficient for the initialization
static PredMap *createPredMap(const Digraph &g)
{
return new PredMap(g);
@@ -155,8 +154,6 @@
///The type of the map that indicates which nodes are processed.
///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///By default it is a NullMap.
- ///\todo If it is set to a real map,
- ///Dijkstra::processed() should read this.
typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
///Instantiates a \ref ProcessedMap.
@@ -297,8 +294,7 @@
//Indicates if _heap is locally allocated (true) or not.
bool local_heap;
- ///Creates the maps if necessary.
- ///\todo Better memory allocation (instead of new).
+ //Creates the maps if necessary.
void create_maps()
{
if(!_pred) {
@@ -958,7 +954,6 @@
///This function instantiates a \ref HeapCrossRef.
/// \param g is the digraph, to which we would like to define the
/// HeapCrossRef.
- /// \todo The digraph alone may be insufficient for the initialization
static HeapCrossRef *createHeapCrossRef(const Digraph &g)
{
return new HeapCrossRef(g);
@@ -994,7 +989,6 @@
///This function instantiates a \ref PredMap.
///\param g is the digraph, to which we would like to define the
///\ref PredMap.
- ///\todo The digraph alone may be insufficient to initialize
static PredMap *createPredMap(const Digraph &g)
{
return new PredMap(g);
@@ -1005,9 +999,6 @@
///The type of the map that indicates which nodes are processed.
///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///By default it is a NullMap.
- ///\todo If it is set to a real map,
- ///Dijkstra::processed() should read this.
- ///\todo named parameter to set this type, function to read and write.
typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
///Instantiates a \ref ProcessedMap.
@@ -1053,7 +1044,6 @@
/// as well as the \ref Dijkstra class.
/// The \ref DijkstraWizardBase is a class to be the default traits of the
/// \ref DijkstraWizard class.
- /// \todo More named parameters are required...
template<class GR,class LM>
class DijkstraWizardBase : public DijkstraWizardDefaultTraits<GR,LM>
{
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/error.h
--- a/lemon/error.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/error.h Sat Sep 27 13:45:50 2008 +0200
@@ -102,8 +102,6 @@
protected:
///\e
- ///\todo The good solution is boost::shared_ptr...
- ///
mutable std::auto_ptr<std::ostringstream> buf;
///\e
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/graph_to_eps.h
--- a/lemon/graph_to_eps.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/graph_to_eps.h Sat Sep 27 13:45:50 2008 +0200
@@ -666,7 +666,6 @@
///this function calls the algorithm itself, i.e. in this case
///it draws the graph.
void run() {
- //\todo better 'epsilon' would be nice here.
const double EPSILON=1e-9;
if(dontPrint) return;
@@ -707,7 +706,6 @@
double max_w=0;
for(ArcIt e(g);e!=INVALID;++e)
max_w=std::max(double(_arcWidths[e]),max_w);
- //\todo better 'epsilon' would be nice here.
if(max_w>EPSILON) {
_arcWidthScale/=max_w;
}
@@ -717,7 +715,6 @@
double max_s=0;
for(NodeIt n(g);n!=INVALID;++n)
max_s=std::max(double(_nodeSizes[n]),max_s);
- //\todo better 'epsilon' would be nice here.
if(max_s>EPSILON) {
_nodeScale/=max_s;
}
@@ -873,7 +870,6 @@
<< -bb.left() << ' ' << -bb.bottom() << " translate\n";
}
else {
- //\todo Verify centering
double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.width(),
(A4WIDTH-2*A4BORDER)/bb.height());
os << ((A4WIDTH -2*A4BORDER)-sc*bb.height())/2 + A4BORDER << ' '
@@ -906,7 +902,6 @@
dim2::Point<double>
dvec(mycoords[g.target(*i)]-mycoords[g.source(*i)]);
double l=std::sqrt(dvec.normSquare());
- //\todo better 'epsilon' would be nice here.
dim2::Point<double> d(dvec/std::max(l,EPSILON));
dim2::Point<double> m;
// m=dim2::Point<double>(mycoords[g.target(*i)]+
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/list_graph.h
--- a/lemon/list_graph.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/list_graph.h Sat Sep 27 13:45:50 2008 +0200
@@ -501,10 +501,8 @@
///valid. However <tt>InArcIt</tt>s and <tt>OutArcIt</tt>s may
///be invalidated.
///
- ///\warning This functionality cannot be used together with the
+ ///\warning This functionality cannot be used in conjunction with the
///Snapshot feature.
- ///
- ///\todo It could be implemented in a bit faster way.
Node split(Node n, bool connect = true) {
Node b = addNode();
for(OutArcIt e(*this,n);e!=INVALID;) {
diff -r dc9e8d2c0df9 -r 66bb22401834 lemon/maps.h
--- a/lemon/maps.h Fri Sep 26 13:46:49 2008 +0200
+++ b/lemon/maps.h Sat Sep 27 13:45:50 2008 +0200
@@ -484,8 +484,6 @@
/// function.
///
/// \sa CombineMap
- ///
- /// \todo Check the requirements.
template <typename M1, typename M2>
class ComposeMap : public MapBase<typename M2::Key, typename M1::Value> {
const M1 &_m1;
@@ -540,8 +538,6 @@
/// function.
///
/// \sa ComposeMap
- ///
- /// \todo Check the requirements.
template<typename M1, typename M2, typename F,
typename V = typename F::result_type>
class CombineMap : public MapBase<typename M1::Key, V> {
More information about the Lemon-commits
mailing list