# HG changeset patch
# User sugi
# Date 1354520348 -32400
# Node ID b6f9978447476ae091aadd51454cd4cf2eca7f73
# Parent  b23581a5243c4993c4ddbe17f8a80d76f97539e4
change PackageName

diff -r b23581a5243c -r b6f997844747 src/alice/test/codesegment/local/mergesort/LocalMergeSort.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/alice/test/codesegment/local/mergesort/LocalMergeSort.java	Mon Dec 03 16:39:08 2012 +0900
@@ -0,0 +1,8 @@
+package alice.test.codesegment.local.mergesort;
+
+public class LocalMergeSort {
+	public static void main(String[] args){
+		SortConfig conf = new SortConfig(args);
+		new StartSort(conf).execute();
+	}
+}
diff -r b23581a5243c -r b6f997844747 src/alice/test/codesegment/local/mergesort/MergeArray.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/alice/test/codesegment/local/mergesort/MergeArray.java	Mon Dec 03 16:39:08 2012 +0900
@@ -0,0 +1,112 @@
+package alice.test.codesegment.local.mergesort;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.msgpack.type.Value;
+
+import alice.codesegment.CodeSegment;
+import alice.datasegment.CommandType;
+import alice.datasegment.Receiver;
+
+public class MergeArray extends CodeSegment{
+	
+	private Receiver info1 = ids.create(CommandType.TAKE);
+	private Receiver info2 = ids.create(CommandType.TAKE);
+
+	int keyNum1;
+	int keyNum2;
+	
+	public MergeArray(int num1, int num2) {
+		keyNum1 = num1;
+		keyNum2 = num2;
+		String key1 = Integer.toString(num1);
+		String key2 = Integer.toString(num2);
+		info1.setKey("local", key1, 1);
+		info2.setKey("local", key2, 1);
+		
+	}
+
+	@Override
+	public void run() {
+		List<Value> list1 = info1.asArray();
+		List<Value> list2 = info2.asArray();
+
+		//System.out.println(list1);
+		//System.out.println(list2);
+		
+		int length = list1.size() + list2.size();
+		int[] array = new int[length];
+		
+		Iterator<Value> iter1 = list1.listIterator();
+		Iterator<Value> iter2 = list2.listIterator();
+		
+		int val1 = iter1.next().asIntegerValue().getInt();//0
+		int val2 = iter2.next().asIntegerValue().getInt();//0
+
+		int i;
+		for (i=0;i<length;i++){
+			if (val1 <= val2){
+				array[i] = val1;
+				if (!iter1.hasNext()) {
+					array[i+1] = val2; 
+					break;
+				}
+				val1 = iter1.next().asIntegerValue().getInt();
+			} else if (val1>val2) {
+				array[i] = val2;
+				if (!iter2.hasNext()) {
+					array[i+1] = val1; 
+					break;
+				}
+				val2 = iter2.next().asIntegerValue().getInt();
+			}
+		}
+		
+		if (iter2.hasNext()) {
+			for (i=i+2 ;i<length;i++){
+				array[i] = iter2.next().asIntegerValue().getInt();
+			}
+		} else if (iter1.hasNext()) {
+			for (i=i+2;iter1.hasNext();i++){
+				array[i] = iter1.next().asIntegerValue().getInt();
+			}
+		}
+		
+		/*
+		for (int i=0,k=0,j=0;i<length;i++){
+			int array1 = list1.get(j).asIntegerValue().getInt();
+			int array2 = list2.get(k).asIntegerValue().getInt();
+			
+			if (array1<=array2){
+				array[i]=array1;
+				j++;
+				if (j == list1.size()){
+					for (i=i+1;i<length;i++,k++){
+						array[i]=list2.get(k).asIntegerValue().getInt();
+					}
+					break;
+				}
+			} else if (array1>array2){
+				array[i]=array2;
+				k++;
+				if (k == list2.size()){
+					for (i=i+1;i<length;i++,j++){
+						array[i]=list1.get(j).asIntegerValue().getInt();
+					}
+					break;
+				}
+			}
+		}
+		*/
+		/*
+		for (int i = 0;i<length;i++){
+			System.out.println(array[i]);
+		}
+		*/
+		int num = (keyNum1-1)/2;
+		String key = Integer.toString(num);
+		
+		ods.put("local", key, array);
+	}
+}
diff -r b23581a5243c -r b6f997844747 src/alice/test/codesegment/local/mergesort/SeparateArray.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/alice/test/codesegment/local/mergesort/SeparateArray.java	Mon Dec 03 16:39:08 2012 +0900
@@ -0,0 +1,71 @@
+package alice.test.codesegment.local.mergesort;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.msgpack.type.Value;
+
+import alice.codesegment.CodeSegment;
+import alice.datasegment.CommandType;
+import alice.datasegment.Receiver;
+
+public class SeparateArray extends CodeSegment{
+
+	private Receiver info = ids.create(CommandType.TAKE);
+	int keyNum;
+	
+	public SeparateArray(int keyNum) {
+		this.keyNum = keyNum;
+		String key = Integer.toString(keyNum);
+		info.setKey("local", key);
+	}
+	@Override
+	public void run() {
+		List<Value> list = info.asArray();
+		//System.out.println(list);
+		if (list.size() > 2){
+			int num = 2*keyNum + 1;
+			int length = list.size()/2;
+			int[] array1 = new int[length];
+			int[] array2 = new int[length];
+			/*
+			for (int i = 0;i<length;i++){
+				array1[i] = list.get(i).asIntegerValue().getInt();
+				array2[i] = list.get(i+length).asIntegerValue().getInt();
+			}
+			*/
+			
+			Iterator<Value> iter = list.listIterator();
+			Iterator<Value> iter1 = list.listIterator(length);
+			
+			for (int i = 0;i<length;i++){
+				array1[i] = iter.next().asIntegerValue().getInt();
+				array2[i] = iter1.next().asIntegerValue().getInt();				
+			}
+			String key1 = Integer.toString(num);
+			String key2 = Integer.toString(num+1);
+
+			ods.put("local", key1, array1);
+			ods.put("local", key2, array2);			
+			
+			new SeparateArray(num);
+			new SeparateArray(num+1);
+			new MergeArray(num,num+1);
+		} else {
+			String key = Integer.toString(keyNum);
+			int array[] = new int[2];
+			int array1 = list.get(0).asIntegerValue().getInt();
+			int array2 = list.get(1).asIntegerValue().getInt();
+			if (array1<=array2){
+				array[0] = array1;
+				array[1] = array2;
+				ods.put("local",key, array);
+			} else {
+				array[0] = array2;
+				array[1] = array1;			
+				ods.put("local",key, array);
+			}
+		}
+	}
+
+}
diff -r b23581a5243c -r b6f997844747 src/alice/test/codesegment/local/mergesort/ShowResult.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/alice/test/codesegment/local/mergesort/ShowResult.java	Mon Dec 03 16:39:08 2012 +0900
@@ -0,0 +1,37 @@
+package alice.test.codesegment.local.mergesort;
+
+import java.util.List;
+
+import org.msgpack.type.Value;
+
+import alice.codesegment.CodeSegment;
+import alice.datasegment.CommandType;
+import alice.datasegment.Receiver;
+
+public class ShowResult extends CodeSegment{
+
+	private Receiver info = ids.create(CommandType.PEEK);
+	int keyNum;
+	public ShowResult(int keyNum) {
+		this.keyNum = keyNum;
+		String key = Integer.toString(keyNum);
+		info.setKey("local", key, 1);
+		
+	}
+
+	@Override
+	public void run() {
+		System.out.println(System.currentTimeMillis() - StartSort.t +"ms");
+		List<Value> list = info.asArray();
+		for (int i =0; i+1< list.size();i++){
+			if (list.get(i).asIntegerValue().getInt()>list.get(i+1).asIntegerValue().getInt()){
+				System.out.println("MISS");
+				System.exit(0);
+			}
+			//System.out.println(list.get(i).asIntegerValue().getInt()+",");
+		}
+		//System.out.println(list);
+		System.exit(0);
+	}
+
+}
diff -r b23581a5243c -r b6f997844747 src/alice/test/codesegment/local/mergesort/SortConfig.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/alice/test/codesegment/local/mergesort/SortConfig.java	Mon Dec 03 16:39:08 2012 +0900
@@ -0,0 +1,18 @@
+package alice.test.codesegment.local.mergesort;
+
+
+
+public class SortConfig {
+	int size;
+	boolean flag;
+	public SortConfig(String[] args){
+		for (int i=0;i<args.length; i++){
+			if ("-size".equals(args[i])){
+				size = Integer.parseInt(args[++i]);	
+			} else if ("-show".equals(args[i])){
+				flag = true;	
+			}
+		}
+	}
+
+}
diff -r b23581a5243c -r b6f997844747 src/alice/test/codesegment/local/mergesort/StartSort.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/alice/test/codesegment/local/mergesort/StartSort.java	Mon Dec 03 16:39:08 2012 +0900
@@ -0,0 +1,38 @@
+package alice.test.codesegment.local.mergesort;
+
+import java.io.IOException;
+import java.util.Random;
+
+import alice.codesegment.CodeSegment;
+import alice.codesegment.SingletonMessage;
+
+public class StartSort extends CodeSegment{
+	public static long t = System.currentTimeMillis();
+	SortConfig conf;
+	public StartSort(SortConfig conf){
+		this.conf = conf;
+	}
+	
+	@Override
+	public void run() {
+		int size = conf.size;
+		int[] array = new int[size];
+		for (int i=0;i< size; i++){
+			Random rnd = new Random();
+			array[i] = rnd.nextInt(Integer.MAX_VALUE);
+		}
+		if (conf.flag){
+			try {
+				System.out.println(SingletonMessage.getInstance().unconvert(array));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		String key = Integer.toString(0);
+		ods.put("local", key, array);
+	
+		new SeparateArray(0);
+		new ShowResult(0);
+	}
+
+}
diff -r b23581a5243c -r b6f997844747 src/alice/test/topology/mergesort/LocalMergeSort.java
--- a/src/alice/test/topology/mergesort/LocalMergeSort.java	Thu Nov 29 16:29:58 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-package alice.test.topology.mergesort;
-
-public class LocalMergeSort {
-	public static void main(String[] args){
-		SortConfig conf = new SortConfig(args);
-		new StartSort(conf).execute();
-	}
-}
diff -r b23581a5243c -r b6f997844747 src/alice/test/topology/mergesort/MergeArray.java
--- a/src/alice/test/topology/mergesort/MergeArray.java	Thu Nov 29 16:29:58 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-package alice.test.topology.mergesort;
-
-import java.util.List;
-
-import org.msgpack.type.Value;
-
-import alice.codesegment.CodeSegment;
-import alice.datasegment.CommandType;
-import alice.datasegment.Receiver;
-
-public class MergeArray extends CodeSegment{
-	
-	private Receiver info1 = ids.create(CommandType.TAKE);
-	private Receiver info2 = ids.create(CommandType.TAKE);
-
-	int keyNum1;
-	int keyNum2;
-	
-	public MergeArray(int num1, int num2) {
-		keyNum1 = num1;
-		keyNum2 = num2;
-		String key1 = Integer.toString(num1);
-		String key2 = Integer.toString(num2);
-		info1.setKey("local", key1, 1);
-		info2.setKey("local", key2, 1);
-		
-	}
-
-	@Override
-	public void run() {
-		List<Value> list1 = info1.asArray();
-		List<Value> list2 = info2.asArray();
-
-		//System.out.println(list1);
-		//System.out.println(list2);
-		
-		int length = list1.size() + list2.size();
-		int[] array = new int[length];
-		
-		for (int i=0,k=0,j=0;i<length;i++){
-			int array1 = list1.get(j).asIntegerValue().getInt();
-			int array2 = list2.get(k).asIntegerValue().getInt();
-			
-			if (array1<=array2){
-				array[i]=array1;
-				j++;
-				if (j == list1.size()){
-					for (i=i+1;i<length/*&&k!=list2.size()*/;i++,k++){
-						array[i]=list2.get(k).asIntegerValue().getInt();
-					}
-					break;
-				}
-			} else if (array1>array2){
-				array[i]=array2;
-				k++;
-				if (k == list2.size()){
-					for (i=i+1;i<length/*&&j!=list1.size()*/;i++,j++){
-						array[i]=list1.get(j).asIntegerValue().getInt();
-					}
-					break;
-				}
-			}
-		}
-		/*
-		for (int i = 0;i<length;i++){
-			System.out.println(array[i]);
-		}
-		*/
-		int num = (keyNum1-1)/2;
-		String key = Integer.toString(num);
-		
-		ods.put("local", key, array);
-	}
-}
diff -r b23581a5243c -r b6f997844747 src/alice/test/topology/mergesort/SeparateArray.java
--- a/src/alice/test/topology/mergesort/SeparateArray.java	Thu Nov 29 16:29:58 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-package alice.test.topology.mergesort;
-
-import java.util.List;
-
-import org.msgpack.type.Value;
-
-import alice.codesegment.CodeSegment;
-import alice.datasegment.CommandType;
-import alice.datasegment.Receiver;
-
-public class SeparateArray extends CodeSegment{
-
-	private Receiver info = ids.create(CommandType.TAKE);
-	int keyNum;
-	
-	public SeparateArray(int keyNum) {
-		this.keyNum = keyNum;
-		String key = Integer.toString(keyNum);
-		info.setKey("local", key);
-	}
-	@Override
-	public void run() {
-		List<Value> list = info.asArray();
-		//System.out.println(list);
-		if (list.size() > 2){
-			int num = 2*keyNum + 1;
-			int length = list.size()/2;
-			int[] array1 = new int[length];
-			int[] array2 = new int[length];
-			for (int i = 0;i<length;i++){
-				array1[i] = list.get(i).asIntegerValue().getInt();
-				array2[i] = list.get(i+length).asIntegerValue().getInt();
-			}
-			
-			String key1 = Integer.toString(num);
-			String key2 = Integer.toString(num+1);
-
-			ods.put("local", key1, array1);
-			ods.put("local", key2, array2);			
-			
-			new SeparateArray(num);
-			new SeparateArray(num+1);
-			new MergeArray(num,num+1);
-		} else {
-			String key = Integer.toString(keyNum);
-			int array[] = new int[2];
-			int array1 = list.get(0).asIntegerValue().getInt();
-			int array2 = list.get(1).asIntegerValue().getInt();
-			if (array1<=array2){
-				array[0] = array1;
-				array[1] = array2;
-				ods.put("local",key, array);
-			} else {
-				array[0] = array2;
-				array[1] = array1;			
-				ods.put("local",key, array);
-			}
-		}
-	}
-
-}
diff -r b23581a5243c -r b6f997844747 src/alice/test/topology/mergesort/ShowResult.java
--- a/src/alice/test/topology/mergesort/ShowResult.java	Thu Nov 29 16:29:58 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-package alice.test.topology.mergesort;
-
-import java.util.List;
-
-import org.msgpack.type.Value;
-
-import alice.codesegment.CodeSegment;
-import alice.datasegment.CommandType;
-import alice.datasegment.Receiver;
-
-public class ShowResult extends CodeSegment{
-
-	private Receiver info = ids.create(CommandType.PEEK);
-	int keyNum;
-	public ShowResult(int keyNum) {
-		this.keyNum = keyNum;
-		String key = Integer.toString(keyNum);
-		info.setKey("local", key, 1);
-		
-	}
-
-	@Override
-	public void run() {
-		System.out.println(System.currentTimeMillis() - StartSort.t +"ms");
-		List<Value> list = info.asArray();
-		for (int i =0; i+1< list.size();i++){
-			if (list.get(i).asIntegerValue().getInt()>list.get(i+1).asIntegerValue().getInt()){
-				System.out.println("MISS");
-				System.exit(0);
-			}
-			//System.out.println(list.get(i).asIntegerValue().getInt()+",");
-		}
-		//System.out.println(list);
-		System.exit(0);
-	}
-
-}
diff -r b23581a5243c -r b6f997844747 src/alice/test/topology/mergesort/SortConfig.java
--- a/src/alice/test/topology/mergesort/SortConfig.java	Thu Nov 29 16:29:58 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-package alice.test.topology.mergesort;
-
-
-
-public class SortConfig {
-	int size;
-	boolean flag;
-	public SortConfig(String[] args){
-		for (int i=0;i<args.length; i++){
-			if ("-size".equals(args[i])){
-				size = Integer.parseInt(args[++i]);	
-			} else if ("-show".equals(args[i])){
-				flag = true;	
-			}
-		}
-	}
-
-}
diff -r b23581a5243c -r b6f997844747 src/alice/test/topology/mergesort/StartSort.java
--- a/src/alice/test/topology/mergesort/StartSort.java	Thu Nov 29 16:29:58 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-package alice.test.topology.mergesort;
-
-import java.io.IOException;
-import java.util.Random;
-
-import alice.codesegment.CodeSegment;
-import alice.codesegment.SingletonMessage;
-
-public class StartSort extends CodeSegment{
-	public static long t = System.currentTimeMillis();
-	SortConfig conf;
-	public StartSort(SortConfig conf){
-		this.conf = conf;
-	}
-	
-	@Override
-	public void run() {
-		int size = conf.size;
-		int[] array = new int[size];
-		for (int i=0;i< size; i++){
-			Random rnd = new Random();
-			array[i] = rnd.nextInt(Integer.MAX_VALUE);
-		}
-		if (conf.flag){
-			try {
-				System.out.println(SingletonMessage.getInstance().unconvert(array));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		String key = Integer.toString(0);
-		ods.put("local", key, array);
-	
-		new SeparateArray(0);
-		new ShowResult(0);
-	}
-
-}