enable networkx submodule

This commit is contained in:
josch 2013-03-01 16:56:14 +01:00
parent 17ff991310
commit fe6a7d88c7

View file

@ -20,6 +20,7 @@ for f in *.dot; do
result_hawick=$(./hawick/circuits_hawick $num_vertices $(echo $adj_list)) result_hawick=$(./hawick/circuits_hawick $num_vertices $(echo $adj_list))
result_meyer=$(java -classpath ./meyer de.normalisiert.utils.graphs.TestCycles $num_vertices $(echo $adj_list)) result_meyer=$(java -classpath ./meyer de.normalisiert.utils.graphs.TestCycles $num_vertices $(echo $adj_list))
result_tarjan=$(python ./tarjan/cycles.py $num_vertices $(echo $adj_list)) result_tarjan=$(python ./tarjan/cycles.py $num_vertices $(echo $adj_list))
result_networkx=$(python ./networkx/cycles.py $num_vertices $(echo $adj_list))
result_abate_iter=$(./abate/cycles_iter.native $num_vertices $(echo $adj_list)) result_abate_iter=$(./abate/cycles_iter.native $num_vertices $(echo $adj_list))
result_abate_func=$(./abate/cycles_functional.native $num_vertices $(echo $adj_list)) result_abate_func=$(./abate/cycles_functional.native $num_vertices $(echo $adj_list))
@ -39,6 +40,10 @@ for f in *.dot; do
echo error: hawick differs from abate_func echo error: hawick differs from abate_func
exit 1 exit 1
fi fi
if [ "$result_hawick" != "$result_networkx" ]; then
echo error: hawick differs from networkx
exit 1
fi
echo $f okay, $(echo "$result_hawick" | wc -l) cycles echo $f okay, $(echo "$result_hawick" | wc -l) cycles
counter=$((counter+1)) counter=$((counter+1))
done done