# HG changeset patch # User sugi # Date 1344945731 -32400 # Node ID 26b4b18c51fa4691d82fa263c878b76c3c7eeb4f # Parent 1044a79ce4ef65780db37bbd3e43ce7520b9a491 minor change diff -r 1044a79ce4ef -r 26b4b18c51fa scripts/fishBeta_run.sh --- a/scripts/fishBeta_run.sh Tue Aug 14 19:43:10 2012 +0900 +++ b/scripts/fishBeta_run.sh Tue Aug 14 21:02:11 2012 +0900 @@ -3,7 +3,7 @@ child_num=$2 ruby ./topology/treen.rb $1 $2 > ./topology/tree.dot dot -Tpng ./topology/tree.dot > ./topology/tree.png -open ./topology/tree.png +#open ./topology/tree.png java -cp ../Alice.jar alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot -log ./output/manager.log -level debug > ./output/std_manager.log & cnt=0 diff -r 1044a79ce4ef -r 26b4b18c51fa src/alice/test/topology/fishmodel/alpha/AutoIncrement.java --- a/src/alice/test/topology/fishmodel/alpha/AutoIncrement.java Tue Aug 14 19:43:10 2012 +0900 +++ b/src/alice/test/topology/fishmodel/alpha/AutoIncrement.java Tue Aug 14 21:02:11 2012 +0900 @@ -11,9 +11,9 @@ float max = 3.3f; float min = -1.3f; - public AutoIncrement(String key){ + public AutoIncrement(String key,int index){ this.key = key; - this.position.setKey("local", key); + this.position.setKey("local", key,index); } @Override @@ -41,7 +41,7 @@ } } - new AutoIncrement(this.key); + new AutoIncrement(this.key,this.position.index); } } diff -r 1044a79ce4ef -r 26b4b18c51fa src/alice/test/topology/fishmodel/beta/CheckMyName.java --- a/src/alice/test/topology/fishmodel/beta/CheckMyName.java Tue Aug 14 19:43:10 2012 +0900 +++ b/src/alice/test/topology/fishmodel/beta/CheckMyName.java Tue Aug 14 21:02:11 2012 +0900 @@ -72,7 +72,7 @@ for (int i = 0;i < 3 ; i++){ key = "fish"+i; - if (num == 0) new AutoIncrement(key); + if (num == 0) new AutoIncrement(key,0); ods.update("local", key, new FishPoint(0.2f*i,0.2f*i)); new SetLocation(new MakeObject(frame),key,0,num); new CheckLocalIndex(key,1);