# HG changeset patch
# User sugi
# Date 1418106294 -32400
# Node ID 1cb529b468760c9548d1efd35570af47f7d590f2
# Parent  47d6f7a76b864a3cac5a6e307e274cd5fcd89716
change measurement method

diff -r 47d6f7a76b86 -r 1cb529b46876 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java	Mon Dec 08 22:05:56 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java	Tue Dec 09 15:24:54 2014 +0900
@@ -9,6 +9,7 @@
 
 import alice.codesegment.CodeSegment;
 import alice.datasegment.CommandType;
+import alice.datasegment.ReceiveData;
 import alice.datasegment.Receiver;
 
 public class ReceiveMeasurement extends CodeSegment {
@@ -26,6 +27,7 @@
     @SuppressWarnings("unchecked")
     @Override
     public void run() {
+        long time = System.currentTimeMillis();
         ArrayList<String> clist = info1.asClass(ArrayList.class);
         boolean route = true;
         for (String node : clist){
@@ -47,8 +49,8 @@
                     BufferedWriter bw = new BufferedWriter(filewriter);
                     PrintWriter pw = new PrintWriter(bw);
 
-                    MeasurementData md = info.asClass(MeasurementData.class);
-                    pw.println(md.depth+" "+md.time+" "+md.size);
+                    ReceiveData r = info.getReceiveData();
+                    pw.println(r.depth/2+" "+(time - r.time)+" "+((byte[])info.getObj()).length);
                     pw.close();
                 }
             } else {
diff -r 47d6f7a76b86 -r 1cb529b46876 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java	Mon Dec 08 22:05:56 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java	Tue Dec 09 15:24:54 2014 +0900
@@ -29,20 +29,11 @@
         info3.setKey("_CLIST");
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void run() {
-        // for measurement;
-        long time = System.currentTimeMillis();
-        MeasurementData md = null;
-        if (info2.getReceiveData().setTime) {
-            ReceiveData r = info2.getReceiveData();
-            md = new MeasurementData();
-            md.depth = r.depth;
-            md.time = time - r.time;
-            md.size = ((byte[])info2.getObj()).length;
-        }
+
         // send other node
-        @SuppressWarnings("unchecked")
         ArrayList<String> clist = info3.asClass(ArrayList.class);
         for (String node : clist){
             if (!info1.from.equals(node)) {
@@ -62,7 +53,6 @@
             }
         }
 
-
         try {
             RenderAndControllerHolder holder = info.asClass(RenderAndControllerHolder.class);
             DecodeInfomation message = info1.asClass(DecodeInfomation.class);
@@ -95,8 +85,10 @@
 
             }
             // for measurement
-            if (md !=null)
-                ods.put("parent", "measurement", md);
+            if (info2.getReceiveData().setTime) {
+                ods.put("manager", "measurement", info2.getReceiveData());
+            }
+
 
             this.recycle(); //TODO