# HG changeset patch # User sugi # Date 1364025493 -32400 # Node ID 099bb3afd74f9f9c0f71afa8aa980673e11a3014 # Parent 15b68b65f8a4f2d1e1f1ae586666be9e8ff61879 no use managerKey diff -r 15b68b65f8a4 -r 099bb3afd74f .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Thu Mar 21 16:48:26 2013 +0900 +++ b/.settings/org.eclipse.core.resources.prefs Sat Mar 23 16:58:13 2013 +0900 @@ -1,2 +1,3 @@ eclipse.preferences.version=1 encoding//src/alice/test/codesegment/local/bitonicsort/SortTest.java=UTF-8 +encoding//src/alice/test/codesegment/local/bitonicsort/nolist/SortTest.java=UTF-8 diff -r 15b68b65f8a4 -r 099bb3afd74f src/alice/test/codesegment/local/bitonicsort/MakeData.java --- a/src/alice/test/codesegment/local/bitonicsort/MakeData.java Thu Mar 21 16:48:26 2013 +0900 +++ b/src/alice/test/codesegment/local/bitonicsort/MakeData.java Sat Mar 23 16:58:13 2013 +0900 @@ -12,8 +12,8 @@ private Receiver info2 = ids.create(CommandType.TAKE); public MakeData(){ - info1.setKey("local", "sortconf"); - info2.setKey("local", "data"); + info1.setKey("sortconf"); + info2.setKey("data"); } @Override @@ -21,9 +21,10 @@ SortConfig conf = info1.asClass(SortConfig.class); DataList list = info2.asClass(DataList.class); int size = conf.getLength(); + Random rnd = new Random(); for (int i = 0; i < size; i++){ - Random rnd = new Random(); list.table.add(rnd.nextInt(100000)); + } ods.update("list", list, false); diff -r 15b68b65f8a4 -r 099bb3afd74f src/alice/test/codesegment/local/bitonicsort/OddPhase.java --- a/src/alice/test/codesegment/local/bitonicsort/OddPhase.java Thu Mar 21 16:48:26 2013 +0900 +++ b/src/alice/test/codesegment/local/bitonicsort/OddPhase.java Sat Mar 23 16:58:13 2013 +0900 @@ -16,7 +16,7 @@ public OddPhase(String key0 ,String key1 ,int index,String key6){ info0.setKey(key0); info1 = ids.create(CommandType.TAKE); - info1.setKey("local",key1,index); + info1.setKey(key1,index); info3.setKey("block_num"); info5.setKey("sort_count"); info6.setKey(key6); @@ -25,9 +25,9 @@ public OddPhase(String key0,String key1,String key2,int index,String key6){ info0.setKey(key0); info1 = ids.create(CommandType.TAKE); - info1.setKey("local",key1,index); + info1.setKey(key1,index); info2 = ids.create(CommandType.TAKE); - info2.setKey("local",key2,index); + info2.setKey(key2,index); info3.setKey("block_num"); info5.setKey("sort_count"); info6.setKey(key6); @@ -89,7 +89,7 @@ new EvenPhase(info0.key,(info.range-1)+"b",info.range+"f",count,info6.key); } } - ods.update("local", info6.key, count+1); + ods.update(info6.key, count+1); } } diff -r 15b68b65f8a4 -r 099bb3afd74f src/alice/test/codesegment/local/bitonicsort/SortTest.java --- a/src/alice/test/codesegment/local/bitonicsort/SortTest.java Thu Mar 21 16:48:26 2013 +0900 +++ b/src/alice/test/codesegment/local/bitonicsort/SortTest.java Sat Mar 23 16:58:13 2013 +0900 @@ -7,7 +7,7 @@ public class SortTest { public static void main(String args[]){ - int size = 2000; + int size = 100000; int MAX = 1024; long t; List list = new ArrayList();