# HG changeset patch
# User suruga
# Date 1514633586 -32400
# Node ID f05a89484ec11b5f8a8e6cf3d5dcdd9da842d9c3
# Parent  8d9f35701fdbe576d07e52eef59e47bd901affd5
check topology

diff -r 8d9f35701fdb -r f05a89484ec1 scripts/aquarium.sh
--- a/scripts/aquarium.sh	Sat Dec 30 20:25:19 2017 +0900
+++ b/scripts/aquarium.sh	Sat Dec 30 20:33:06 2017 +0900
@@ -5,23 +5,23 @@
 fi
 max=$1
 child_num=$2
-java=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bin/java
+# java=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bin/java
 jar_path=../build/libs/Alice.jar
-if [ ! -e $java ]; then
-    echo "$java not found."
-    exit 1
-fi
+# if [ ! -e $java ]; then
+#    echo "$java not found."
+#    exit 1
+# fi
 
 ruby ./topology/treen.rb $1 $2 > ./topology/tree.dot
 dot -Tpng ./topology/tree.dot > ./topology/tree.png
 #open ./topology/tree.png
-$java -version
-$java -cp $jar_path alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot -log ./output/manager.log -level debug > ./output/std_manager.log &
+java -version
+java -cp $jar_path alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot -log ./output/manager.log -level debug > ./output/std_manager.log &
 
 cnt=0
 while [ $cnt -lt $max ]
 do
-    $java -cp $jar_path alice.test.topology.aquarium.FishMovementTopology -host `hostname` -port 10000 -p `expr 20000 + $cnt` -log ./output/aquarium${cnt}.log -level debug > ./output/std_aquarium${cnt}.log &
+    java -cp $jar_path alice.test.topology.aquarium.FishMovementTopology -host `hostname` -port 10000 -p `expr 20000 + $cnt` -log ./output/aquarium${cnt}.log -level debug > ./output/std_aquarium${cnt}.log &
     cnt=`expr $cnt + 1`
 done
 wait