0
4
0
... | ... |
@@ -38,63 +38,62 @@ |
38 | 38 |
///\tparam GR Digraph type. |
39 | 39 |
template<class GR> |
40 | 40 |
struct BfsDefaultTraits |
41 | 41 |
{ |
42 | 42 |
///The type of the digraph the algorithm runs on. |
43 | 43 |
typedef GR Digraph; |
44 | 44 |
|
45 | 45 |
///\brief The type of the map that stores the predecessor |
46 | 46 |
///arcs of the shortest paths. |
47 | 47 |
/// |
48 | 48 |
///The type of the map that stores the predecessor |
49 | 49 |
///arcs of the shortest paths. |
50 | 50 |
///It must meet the \ref concepts::WriteMap "WriteMap" concept. |
51 | 51 |
typedef typename Digraph::template NodeMap<typename Digraph::Arc> PredMap; |
52 | 52 |
///Instantiates a PredMap. |
53 | 53 |
|
54 |
///This function instantiates a PredMap. |
|
54 |
///This function instantiates a PredMap. |
|
55 | 55 |
///\param g is the digraph, to which we would like to define the |
56 | 56 |
///PredMap. |
57 | 57 |
static PredMap *createPredMap(const Digraph &g) |
58 | 58 |
{ |
59 | 59 |
return new PredMap(g); |
60 | 60 |
} |
61 | 61 |
|
62 | 62 |
///The type of the map that indicates which nodes are processed. |
63 | 63 |
|
64 | 64 |
///The type of the map that indicates which nodes are processed. |
65 | 65 |
///It must meet the \ref concepts::WriteMap "WriteMap" concept. |
66 | 66 |
typedef NullMap<typename Digraph::Node,bool> ProcessedMap; |
67 | 67 |
///Instantiates a ProcessedMap. |
68 | 68 |
|
69 | 69 |
///This function instantiates a ProcessedMap. |
70 | 70 |
///\param g is the digraph, to which |
71 | 71 |
///we would like to define the ProcessedMap |
72 | 72 |
#ifdef DOXYGEN |
73 | 73 |
static ProcessedMap *createProcessedMap(const Digraph &g) |
74 | 74 |
#else |
75 | 75 |
static ProcessedMap *createProcessedMap(const Digraph &) |
76 | 76 |
#endif |
77 | 77 |
{ |
78 | 78 |
return new ProcessedMap(); |
79 | 79 |
} |
80 | 80 |
|
81 | 81 |
///The type of the map that indicates which nodes are reached. |
82 | 82 |
|
83 |
///The type of the map that indicates which nodes are reached. |
|
84 |
///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept. |
|
83 |
///The type of the map that indicates which nodes are reached.///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept. |
|
85 | 84 |
typedef typename Digraph::template NodeMap<bool> ReachedMap; |
86 | 85 |
///Instantiates a ReachedMap. |
87 | 86 |
|
88 | 87 |
///This function instantiates a ReachedMap. |
89 | 88 |
///\param g is the digraph, to which |
90 | 89 |
///we would like to define the ReachedMap. |
91 | 90 |
static ReachedMap *createReachedMap(const Digraph &g) |
92 | 91 |
{ |
93 | 92 |
return new ReachedMap(g); |
94 | 93 |
} |
95 | 94 |
|
96 | 95 |
///The type of the map that stores the distances of the nodes. |
97 | 96 |
|
98 | 97 |
///The type of the map that stores the distances of the nodes. |
99 | 98 |
///It must meet the \ref concepts::WriteMap "WriteMap" concept. |
100 | 99 |
typedef typename Digraph::template NodeMap<int> DistMap; |
... | ... |
@@ -827,34 +827,34 @@ |
827 | 827 |
public: |
828 | 828 |
Edge() {} |
829 | 829 |
Edge (Invalid) { id = -1; } |
830 | 830 |
bool operator==(const Edge& edge) const {return id == edge.id;} |
831 | 831 |
bool operator!=(const Edge& edge) const {return id != edge.id;} |
832 | 832 |
bool operator<(const Edge& edge) const {return id < edge.id;} |
833 | 833 |
}; |
834 | 834 |
|
835 | 835 |
class Arc { |
836 | 836 |
friend class ListGraphBase; |
837 | 837 |
protected: |
838 | 838 |
|
839 | 839 |
int id; |
840 | 840 |
explicit Arc(int pid) { id = pid;} |
841 | 841 |
|
842 | 842 |
public: |
843 |
operator Edge() const { |
|
844 |
return id != -1 ? edgeFromId(id / 2) : INVALID; |
|
843 |
operator Edge() const { |
|
844 |
return id != -1 ? edgeFromId(id / 2) : INVALID; |
|
845 | 845 |
} |
846 | 846 |
|
847 | 847 |
Arc() {} |
848 | 848 |
Arc (Invalid) { id = -1; } |
849 | 849 |
bool operator==(const Arc& arc) const {return id == arc.id;} |
850 | 850 |
bool operator!=(const Arc& arc) const {return id != arc.id;} |
851 | 851 |
bool operator<(const Arc& arc) const {return id < arc.id;} |
852 | 852 |
}; |
853 | 853 |
|
854 | 854 |
|
855 | 855 |
|
856 | 856 |
ListGraphBase() |
857 | 857 |
: nodes(), first_node(-1), |
858 | 858 |
first_free_node(-1), arcs(), first_free_arc(-1) {} |
859 | 859 |
|
860 | 860 |
... | ... |
@@ -451,34 +451,34 @@ |
451 | 451 |
public: |
452 | 452 |
Edge() {} |
453 | 453 |
Edge (Invalid) { _id = -1; } |
454 | 454 |
bool operator==(const Edge& arc) const {return _id == arc._id;} |
455 | 455 |
bool operator!=(const Edge& arc) const {return _id != arc._id;} |
456 | 456 |
bool operator<(const Edge& arc) const {return _id < arc._id;} |
457 | 457 |
}; |
458 | 458 |
|
459 | 459 |
class Arc { |
460 | 460 |
friend class SmartGraphBase; |
461 | 461 |
protected: |
462 | 462 |
|
463 | 463 |
int _id; |
464 | 464 |
explicit Arc(int id) { _id = id;} |
465 | 465 |
|
466 | 466 |
public: |
467 |
operator Edge() const { |
|
468 |
return _id != -1 ? edgeFromId(_id / 2) : INVALID; |
|
467 |
operator Edge() const { |
|
468 |
return _id != -1 ? edgeFromId(_id / 2) : INVALID; |
|
469 | 469 |
} |
470 | 470 |
|
471 | 471 |
Arc() {} |
472 | 472 |
Arc (Invalid) { _id = -1; } |
473 | 473 |
bool operator==(const Arc& arc) const {return _id == arc._id;} |
474 | 474 |
bool operator!=(const Arc& arc) const {return _id != arc._id;} |
475 | 475 |
bool operator<(const Arc& arc) const {return _id < arc._id;} |
476 | 476 |
}; |
477 | 477 |
|
478 | 478 |
|
479 | 479 |
|
480 | 480 |
SmartGraphBase() |
481 | 481 |
: nodes(), arcs() {} |
482 | 482 |
|
483 | 483 |
|
484 | 484 |
int maxNodeId() const { return nodes.size()-1; } |
... | ... |
@@ -75,39 +75,50 @@ |
75 | 75 |
} |
76 | 76 |
|
77 | 77 |
function update_end() { |
78 | 78 |
if [ $CHANGED == YES ] |
79 | 79 |
then |
80 | 80 |
((++CHANGED_FILES)) |
81 | 81 |
fi |
82 | 82 |
if [ $WARNED == YES ] |
83 | 83 |
then |
84 | 84 |
((++WARNED_FILES)) |
85 | 85 |
fi |
86 | 86 |
} |
87 | 87 |
|
88 | 88 |
function check_action() { |
89 | 89 |
if ! diff -q $1 $2 >/dev/null |
90 | 90 |
then |
91 |
echo |
|
91 |
echo |
|
92 |
echo -n " $3 failed at line(s): " |
|
93 |
echo -n $(diff $1 $2 | grep '^[0-9]' | sed "s/^\(.*\)c.*$/ \1/g" | |
|
94 |
sed "s/,/-/g" | paste -s -d',') |
|
92 | 95 |
FAILED=YES |
93 | 96 |
fi |
94 | 97 |
} |
95 | 98 |
|
96 | 99 |
function check_warning() { |
97 |
echo |
|
100 |
echo |
|
101 |
if [ "$2" == 'long lines' ] |
|
102 |
then |
|
103 |
echo -n " $2 warning at line(s): " |
|
104 |
echo -n $(grep -n -E '.{81,}' $1 | sed "s/^\([0-9]*\)/ \1\t/g" | |
|
105 |
cut -f 1 | paste -s -d',') |
|
106 |
else |
|
107 |
echo -n " $2 warning" |
|
108 |
fi |
|
98 | 109 |
WARNED=YES |
99 | 110 |
} |
100 | 111 |
|
101 | 112 |
function check_init() { |
102 | 113 |
echo Check source files... |
103 | 114 |
FAILED_FILES=0 |
104 | 115 |
WARNED_FILES=0 |
105 | 116 |
TOTAL_FILES=0 |
106 | 117 |
} |
107 | 118 |
|
108 | 119 |
function check_done() { |
109 | 120 |
echo $FAILED_FILES out of $TOTAL_FILES files has been failed. |
110 | 121 |
echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings. |
111 | 122 |
|
112 | 123 |
if [ $FAILED_FILES -gt 0 ] |
113 | 124 |
then |
... | ... |
@@ -199,46 +210,46 @@ |
199 | 210 |
OLD_PATTERN=$(echo -e '\t') |
200 | 211 |
NEW_PATTERN=' ' |
201 | 212 |
else |
202 | 213 |
OLD_PATTERN=' ' |
203 | 214 |
NEW_PATTERN=$(echo -e '\t') |
204 | 215 |
fi |
205 | 216 |
TMP_FILE=`mktemp` |
206 | 217 |
cat $1 | sed -e "s/$OLD_PATTERN/$NEW_PATTERN/g" >$TMP_FILE |
207 | 218 |
|
208 | 219 |
"$ACTION"_action "$TMP_FILE" "$1" 'tabs' |
209 | 220 |
} |
210 | 221 |
|
211 | 222 |
function spaces_check() { |
212 | 223 |
TMP_FILE=`mktemp` |
213 | 224 |
cat $1 | sed -e 's/ \+$//g' >$TMP_FILE |
214 | 225 |
|
215 |
"$ACTION"_action "$TMP_FILE" "$1" 'spaces' |
|
226 |
"$ACTION"_action "$TMP_FILE" "$1" 'trailing spaces' |
|
216 | 227 |
} |
217 | 228 |
|
218 | 229 |
function long_lines_check() { |
219 | 230 |
if cat $1 | grep -q -E '.{81,}' |
220 | 231 |
then |
221 | 232 |
"$ACTION"_warning $1 'long lines' |
222 | 233 |
fi |
223 | 234 |
} |
224 | 235 |
|
225 | 236 |
# process the file |
226 | 237 |
|
227 | 238 |
function process_file() { |
228 |
echo -n " $ACTION |
|
239 |
echo -n " $ACTION $1..." |
|
229 | 240 |
|
230 | 241 |
CHECKING="header tabs spaces long_lines" |
231 | 242 |
|
232 | 243 |
"$ACTION"_begin $1 |
233 | 244 |
for check in $CHECKING |
234 | 245 |
do |
235 | 246 |
"$check"_check $1 |
236 | 247 |
done |
237 | 248 |
"$ACTION"_end $1 |
238 | 249 |
echo |
239 | 250 |
} |
240 | 251 |
|
241 | 252 |
function process_all { |
242 | 253 |
"$ACTION"_init |
243 | 254 |
while read file |
244 | 255 |
do |
... | ... |
@@ -252,78 +263,78 @@ |
252 | 263 |
|
253 | 264 |
if [ "$1" == '--help' ] || [ "$1" == '-h' ] |
254 | 265 |
then |
255 | 266 |
echo -n \ |
256 | 267 |
"Usage: |
257 | 268 |
$0 [OPTIONS] [files] |
258 | 269 |
Options: |
259 | 270 |
--dry-run|-n |
260 | 271 |
Check the files, but do not modify them. |
261 | 272 |
--interactive|-i |
262 | 273 |
If --dry-run is specified and the checker emits warnings, |
263 | 274 |
then the user is asked if the warnings should be considered |
264 | 275 |
errors. |
265 | 276 |
--werror|-w |
266 | 277 |
Make all warnings into errors. |
267 | 278 |
--all|-a |
268 |
|
|
279 |
Check all source files in the repository. |
|
269 | 280 |
--modified|-m |
270 | 281 |
Check only the modified (and new) source files. This option is |
271 | 282 |
useful to check the modification before making a commit. |
272 | 283 |
--changed|-c |
273 | 284 |
Check only the changed source files compared to the parent(s) of |
274 | 285 |
the current hg node. This option is useful as hg hook script. |
275 | 286 |
To automatically check all your changes before making a commit, |
276 | 287 |
add the following section to the appropriate .hg/hgrc file. |
277 | 288 |
|
278 | 289 |
[hooks] |
279 | 290 |
pretxncommit.checksources = scripts/unify-sources.sh -c -n -i |
280 | 291 |
|
281 | 292 |
--help|-h |
282 | 293 |
Print this help message. |
283 | 294 |
files |
284 |
The files to check/unify. If no file names are given, the |
|
285 |
modified source will be checked/unified |
|
286 |
|
|
295 |
The files to check/unify. If no file names are given, the modified |
|
296 |
source files will be checked/unified (just like using the |
|
297 |
--modified|-m option). |
|
287 | 298 |
" |
288 | 299 |
exit 0 |
289 | 300 |
elif [ "$1" == '--dry-run' ] || [ "$1" == '-n' ] |
290 | 301 |
then |
291 |
[ -n "$ACTION" ] && echo " |
|
302 |
[ -n "$ACTION" ] && echo "Conflicting action options" >&2 && exit 1 |
|
292 | 303 |
ACTION=check |
293 | 304 |
elif [ "$1" == "--all" ] || [ "$1" == '-a' ] |
294 | 305 |
then |
295 |
[ -n "$FILES" ] && echo " |
|
306 |
[ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1 |
|
296 | 307 |
FILES=all_files |
297 | 308 |
elif [ "$1" == "--changed" ] || [ "$1" == '-c' ] |
298 | 309 |
then |
299 |
[ -n "$FILES" ] && echo " |
|
310 |
[ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1 |
|
300 | 311 |
FILES=changed_files |
301 | 312 |
elif [ "$1" == "--modified" ] || [ "$1" == '-m' ] |
302 | 313 |
then |
303 |
[ -n "$FILES" ] && echo " |
|
314 |
[ -n "$FILES" ] && echo "Conflicting target options" >&2 && exit 1 |
|
304 | 315 |
FILES=modified_files |
305 | 316 |
elif [ "$1" == "--interactive" ] || [ "$1" == "-i" ] |
306 | 317 |
then |
307 |
[ -n "$WARNING" ] && echo " |
|
318 |
[ -n "$WARNING" ] && echo "Conflicting warning options" >&2 && exit 1 |
|
308 | 319 |
WARNING='INTERACTIVE' |
309 | 320 |
elif [ "$1" == "--werror" ] || [ "$1" == "-w" ] |
310 | 321 |
then |
311 |
[ -n "$WARNING" ] && echo " |
|
322 |
[ -n "$WARNING" ] && echo "Conflicting warning options" >&2 && exit 1 |
|
312 | 323 |
WARNING='WERROR' |
313 |
elif [ $(echo $1 | cut -c |
|
324 |
elif [ $(echo x$1 | cut -c 2) == '-' ] |
|
314 | 325 |
then |
315 | 326 |
echo "Invalid option $1" >&2 && exit 1 |
316 | 327 |
else |
317 | 328 |
[ -n "$FILES" ] && echo "Invalid option $1" >&2 && exit 1 |
318 | 329 |
GIVEN_FILES=$@ |
319 | 330 |
FILES=given_files |
320 | 331 |
break |
321 | 332 |
fi |
322 | 333 |
|
323 | 334 |
shift |
324 | 335 |
done |
325 | 336 |
|
326 | 337 |
if [ -z $FILES ] |
327 | 338 |
then |
328 | 339 |
FILES=modified_files |
329 | 340 |
fi |
0 comments (0 inline)