From 97f5dda0c10c3a885cbe53d1e8ae324cec2dcc49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Mon, 21 May 2012 14:59:15 +0200
Subject: Send numDevices in Experiment1.

---
 .../com/orbekk/same/android/benchmark/Experiment1Activity.java    | 8 ++++++--
 same/src/main/java/com/orbekk/same/Types.java                     | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/same-android/src/main/java/com/orbekk/same/android/benchmark/Experiment1Activity.java b/same-android/src/main/java/com/orbekk/same/android/benchmark/Experiment1Activity.java
index ffcf930..3e81147 100644
--- a/same-android/src/main/java/com/orbekk/same/android/benchmark/Experiment1Activity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/benchmark/Experiment1Activity.java
@@ -17,6 +17,7 @@ package com.orbekk.same.android.benchmark;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
+import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,7 +34,6 @@ import com.orbekk.same.Variable;
 import com.orbekk.same.Variable.OnChangeListener;
 import com.orbekk.same.android.ClientInterfaceBridge;
 import com.orbekk.stats.Common;
-import com.orbekk.stats.Experiments.Experiment1;
 import com.orbekk.stats.Experiments.Empty;
 import com.orbekk.stats.Experiments.Experiment1;
 import com.orbekk.stats.Experiments.SimpleTiming;
@@ -67,6 +67,10 @@ public class Experiment1Activity extends Activity {
     };
     
     private void finalizeBenchmark() {
+        Variable<List<String>> participants =
+                client.createVariableFactory().create(
+                        ".participants0", Types.STRING_LIST);
+        int numDevices = participants.get().size();
         RpcChannel channel = null;
         try {
             RpcCallback<Empty> done = new RpcCallback<Empty>() {
@@ -84,7 +88,7 @@ public class Experiment1Activity extends Activity {
                 }
                 SimpleTiming timing = SimpleTiming.newBuilder()
                         .setTiming(sample)
-                        .setNumDevices(-1)
+                        .setNumDevices(numDevices)
                         .build();
                 exp1.registerSample(rpc, timing, done);
             }
diff --git a/same/src/main/java/com/orbekk/same/Types.java b/same/src/main/java/com/orbekk/same/Types.java
index 60e2d25..00914b8 100644
--- a/same/src/main/java/com/orbekk/same/Types.java
+++ b/same/src/main/java/com/orbekk/same/Types.java
@@ -15,6 +15,8 @@
  */
 package com.orbekk.same;
 
+import java.util.List;
+
 import org.codehaus.jackson.type.TypeReference;
 
 public class Types {
@@ -22,4 +24,6 @@ public class Types {
             new TypeReference<String>() {};
     public final static TypeReference<Integer> INTEGER =
             new TypeReference<Integer>() {};
+    public final static TypeReference<List<String>> STRING_LIST =
+            new TypeReference<List<String>>() {};
 }
-- 
cgit v1.2.3