0
6
0
... | ... |
@@ -150,8 +150,8 @@ |
150 | 150 |
typedef typename Map::Key Key; |
151 | 151 |
typedef typename Map::Value Value; |
152 | 152 |
|
153 |
typedef const Value ConstReturnValue; |
|
154 |
typedef const Value ReturnValue; |
|
153 |
typedef Value ConstReturnValue; |
|
154 |
typedef Value ReturnValue; |
|
155 | 155 |
}; |
156 | 156 |
|
157 | 157 |
template <typename Map> |
... | ... |
@@ -178,8 +178,8 @@ |
178 | 178 |
typedef typename MatrixMap::SecondKey SecondKey; |
179 | 179 |
typedef typename MatrixMap::Value Value; |
180 | 180 |
|
181 |
typedef const Value ConstReturnValue; |
|
182 |
typedef const Value ReturnValue; |
|
181 |
typedef Value ConstReturnValue; |
|
182 |
typedef Value ReturnValue; |
|
183 | 183 |
}; |
184 | 184 |
|
185 | 185 |
template <typename MatrixMap> |
... | ... |
@@ -1015,7 +1015,7 @@ |
1015 | 1015 |
} |
1016 | 1016 |
else for(ArcIt e(g);e!=INVALID;++e) |
1017 | 1017 |
if((!_undirected||g.source(e)<g.target(e))&&_arcWidths[e]>0 |
1018 |
&&g.source(e)!=g.target(e)) |
|
1018 |
&&g.source(e)!=g.target(e)) { |
|
1019 | 1019 |
if(_drawArrows) { |
1020 | 1020 |
dim2::Point<double> d(mycoords[g.target(e)]-mycoords[g.source(e)]); |
1021 | 1021 |
double rn=_nodeSizes[g.target(e)]*_nodeScale; |
... | ... |
@@ -1035,7 +1035,7 @@ |
1035 | 1035 |
<< _arcColors[e].red() << ' ' |
1036 | 1036 |
<< _arcColors[e].green() << ' ' |
1037 | 1037 |
<< _arcColors[e].blue() << " arr\n"; |
1038 |
} |
|
1038 |
} |
|
1039 | 1039 |
else os << mycoords[g.source(e)].x << ' ' |
1040 | 1040 |
<< mycoords[g.source(e)].y << ' ' |
1041 | 1041 |
<< mycoords[g.target(e)].x << ' ' |
... | ... |
@@ -1044,6 +1044,7 @@ |
1044 | 1044 |
<< _arcColors[e].green() << ' ' |
1045 | 1045 |
<< _arcColors[e].blue() << ' ' |
1046 | 1046 |
<< _arcWidths[e]*_arcWidthScale << " l\n"; |
1047 |
} |
|
1047 | 1048 |
os << "grestore\n"; |
1048 | 1049 |
} |
1049 | 1050 |
if(_showNodes) { |
... | ... |
@@ -115,7 +115,7 @@ |
115 | 115 |
int n; |
116 | 116 |
for(n = first_node; |
117 | 117 |
n!=-1 && nodes[n].first_in == -1; |
118 |
n = nodes[n].next) |
|
118 |
n = nodes[n].next) {} |
|
119 | 119 |
arc.id = (n == -1) ? -1 : nodes[n].first_in; |
120 | 120 |
} |
121 | 121 |
|
... | ... |
@@ -125,8 +125,8 @@ |
125 | 125 |
} else { |
126 | 126 |
int n; |
127 | 127 |
for(n = nodes[arcs[arc.id].target].next; |
128 |
n!=-1 && nodes[n].first_in == -1; |
|
129 |
n = nodes[n].next); |
|
128 |
n!=-1 && nodes[n].first_in == -1; |
|
129 |
n = nodes[n].next) {} |
|
130 | 130 |
arc.id = (n == -1) ? -1 : nodes[n].first_in; |
131 | 131 |
} |
132 | 132 |
} |
... | ... |
@@ -24,6 +24,7 @@ |
24 | 24 |
///\brief Some utilities to write test programs. |
25 | 25 |
|
26 | 26 |
#include <iostream> |
27 |
#include <stdlib.h> |
|
27 | 28 |
|
28 | 29 |
///If \c rc is fail, writes an error message and exits. |
29 | 30 |
|
... | ... |
@@ -36,8 +37,6 @@ |
36 | 37 |
///\code check(0==1,"This is obviously false.");\endcode will |
37 | 38 |
///print something like this (and then exits). |
38 | 39 |
///\verbatim file_name.cc:123: error: This is obviously false. \endverbatim |
39 |
/// |
|
40 |
///\todo It should be in \c assert.h |
|
41 | 40 |
#define check(rc, msg) \ |
42 | 41 |
if(!(rc)) { \ |
43 | 42 |
std::cerr << __FILE__ ":" << __LINE__ << ": error: " << msg << std::endl; \ |
0 comments (0 inline)