Mercurial > hg > Database > Alice
changeset 169:16418c2c3e72 working
minor change
| author | sugi |
|---|---|
| date | Tue, 18 Dec 2012 14:49:36 +0900 |
| parents | f846527a98b7 |
| children | 6a69891b7232 |
| files | src/alice/test/codesegment/local/StartCodeSegment.java src/alice/test/codesegment/local/TestCodeSegment.java src/alice/test/codesegment/local/bitonicsort/ShowData.java src/alice/test/codesegment/local/bitonicsort/SortTest.java |
| diffstat | 4 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/alice/test/codesegment/local/StartCodeSegment.java Sat Dec 15 14:37:56 2012 +0900 +++ b/src/alice/test/codesegment/local/StartCodeSegment.java Tue Dec 18 14:49:36 2012 +0900 @@ -1,7 +1,6 @@ package alice.test.codesegment.local; import alice.codesegment.CodeSegment; -import alice.test.topology.aquarium.FishPoint; public class StartCodeSegment extends CodeSegment { @@ -16,10 +15,14 @@ ods.update("local", "key1", 0); // bind string data to datasegment local.key1 // this startup TestCodeSegment. */ + ods.put("local", "key1", 0); + ods.put("local", "key1", 1); + ods.put("local", "key1", 2); + ods.put("local", "key1", 3); new TestCodeSegment(); System.out.println("create TestCodeSegment"); - ods.update("local", "key1", new FishPoint(0.0f,0.0f)); + //ods.update("local", "key1", 0); }
--- a/src/alice/test/codesegment/local/TestCodeSegment.java Sat Dec 15 14:37:56 2012 +0900 +++ b/src/alice/test/codesegment/local/TestCodeSegment.java Tue Dec 18 14:49:36 2012 +0900 @@ -3,7 +3,6 @@ import alice.codesegment.CodeSegment; import alice.datasegment.CommandType; import alice.datasegment.Receiver; -import alice.test.topology.aquarium.FishPoint; public class TestCodeSegment extends CodeSegment { @@ -20,26 +19,22 @@ @Override public void run() { - FishPoint fp = this.arg1.asClass(FishPoint.class); //System.out.println("index = " + arg1.index); - //System.out.println("data = " + arg1.val); + System.out.println("data = " + arg1.val); //System.out.println(arg1.val.getType()); - if (arg1.index > 100000) { - System.out.println(System.currentTimeMillis()-TestLocalAlice.t); - System.exit(0); - return; - } /* TestCodeSegment cs = new TestCodeSegment(); cs.arg1.setKey("key1", arg1.index); */ - new TestCodeSegment(arg1.index); - fp.setXYZ(fp.getX()+1.0f, fp.getY()+1.0f, fp.getZ()+1.0f); + new TestCodeSegment(); + //new TestCodeSegment(arg1.index); + + // DataSegment.get("local").update - ods.update("local", "key1", fp); + //ods.update("local", "key1", arg1.index); }
--- a/src/alice/test/codesegment/local/bitonicsort/ShowData.java Sat Dec 15 14:37:56 2012 +0900 +++ b/src/alice/test/codesegment/local/bitonicsort/ShowData.java Tue Dec 18 14:49:36 2012 +0900 @@ -18,6 +18,7 @@ info[i] = ids.create(CommandType.PEEK); for (int i= 0;i < cnt; i++) info[i].setKey("local","array"+i,1); + info0.setKey("local", "arraynum"); }
--- a/src/alice/test/codesegment/local/bitonicsort/SortTest.java Sat Dec 15 14:37:56 2012 +0900 +++ b/src/alice/test/codesegment/local/bitonicsort/SortTest.java Tue Dec 18 14:49:36 2012 +0900 @@ -7,8 +7,8 @@ public class SortTest { public static void main(String args[]){ - int size = 10000; - int MAX = 100000; + int size = 2000; + int MAX = 1024; long t; List<Integer> list = new ArrayList<Integer>(); List<Integer> list2 = new ArrayList<Integer>();