Mercurial > hg > Members > tatsuki > Alice

changeset 133:26b4b18c51fa working

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor change
author sugi
date Tue, 14 Aug 2012 21:02:11 +0900
parents 1044a79ce4ef
children 53aff28cde6b
files scripts/fishBeta_run.sh src/alice/test/topology/fishmodel/alpha/AutoIncrement.java src/alice/test/topology/fishmodel/beta/CheckMyName.java
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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);
 	}
 	
 }
--- 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);