josch/cycle_test
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3 from ldionne/pull_request

Browse source 
Add the boost_hawick submodule.
This commit is contained in:
josch 2013-04-11 12:57:35 -07:00
commit 22c3e1b386
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -13,3 +13,6 @@
[submodule "networkx"] [submodule "networkx"]
path = networkx path = networkx
url = git://github.com/josch/cycles_johnson_networkx.git url = git://github.com/josch/cycles_johnson_networkx.git
[submodule "boost_hawick"]
path = boost_hawick
url = https://github.com/ldionne/hawick_circuits.git

1
boost_hawick Submodule

@ -0,0 +1 @@
Subproject commit 0a1f810efa33239efacaa9b7f8e87f36a52e6720

14
test.sh
View file

@ -2,15 +2,23 @@
echo compiling ./hawick/circuits_hawick... echo compiling ./hawick/circuits_hawick...
make -C ./hawick >/dev/null make -C ./hawick >/dev/null
echo compiling ./meyer/de/normalisiert/utils/graphs/TestCycles.class echo compiling ./meyer/de/normalisiert/utils/graphs/TestCycles.class
make -C ./meyer >/dev/null make -C ./meyer >/dev/null
echo compiling ./abate/cycles_iter.native and ./abate/cycles_functional.native echo compiling ./abate/cycles_iter.native and ./abate/cycles_functional.native
make -C ./abate >/dev/null make -C ./abate >/dev/null
echo compiling ./boost_hawick/hawick_circuits...
make -C ./boost_hawick >/dev/null
echo compiling ./rand_graph.native... echo compiling ./rand_graph.native...
make > /dev/null make > /dev/null
echo generating random graphs... echo generating random graphs...
rm -f *.dot rm -f *.dot
./rand_graph.native $1 ./rand_graph.native $1
echo testing graphs... echo testing graphs...
counter=0 counter=0
for f in *.dot; do for f in *.dot; do
@ -23,6 +31,7 @@ for f in *.dot; do
result_abate_iter=$(echo "$adj_list" | ./abate/cycles_iter.native $num_vertices) result_abate_iter=$(echo "$adj_list" | ./abate/cycles_iter.native $num_vertices)
result_abate_func=$(echo "$adj_list" | ./abate/cycles_functional.native $num_vertices) result_abate_func=$(echo "$adj_list" | ./abate/cycles_functional.native $num_vertices)
result_networkx=$(echo "$adj_list" | python ./networkx/cycles.py $num_vertices) result_networkx=$(echo "$adj_list" | python ./networkx/cycles.py $num_vertices)
result_boost_hawick=$(echo "$adj_list" | ./boost_hawick/hawick_circuits $num_vertices)
if [ "$result_hawick" != "$result_meyer" ]; then if [ "$result_hawick" != "$result_meyer" ]; then
echo error: hawick differs from meyer echo error: hawick differs from meyer
@ -44,8 +53,11 @@ for f in *.dot; do
echo error: hawick differs from networkx echo error: hawick differs from networkx
exit 1 exit 1
fi fi
if [ "$result_hawick" != "$result_boost_hawick" ]; then
echo error: hawick differs from boost_hawick
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
echo successfully tested $counter graphs echo successfully tested $counter graphs