Fixes #161, some bugs with non-8000 port

apps/CardinalBanditsPureExploration/myApp.py

@@ -112,3 +112,27 @@ def getModel(self, butler, alg, args):
                                  'standard_deviation':standard_deviations[index],
                                  'count':counts[index]} )
         return {'targets': targets} 
+
+
+    def format_responses(self, responses):
+        formatted = []
+        for response in responses:
+            if 'target_reward' not in response:
+                continue
+            reward = {response['target_reward'] == l['reward']: l['label']
+                      for l in response['labels']}
+            reward_num = {response['target_reward'] == l['reward']: l['reward']
+                      for l in response['labels']}
+            target = response['target_indices'][0]['target']['primary_description']
+            response.update({'target': target, 'target_reward_label': reward[True],
+                'target_reward': reward_num[True]})
+
+            for key in ['_id', 'target_indices',
+                        'context_type', 'labels', 'target_id']:
+                if key in response:
+                    del response[key]
+            formatted += [response]
+
+        return formatted
+
+

apps/DuelingBanditsPureExploration/myApp.py

@@ -143,3 +143,24 @@ def getModel(self, butler, alg, args):
         return {'targets': targets, 'num_reported_answers':num_reported_answers} 
 
 
+    def format_responses(self, responses):
+        formatted = []
+        for response in responses:
+            targets = {'target_' + target['label']: target['target']['primary_description']
+                       for target in response['target_indices']}
+            if 'winner_id' not in response:
+                continue
+            winner = {t['target']['target_id'] == response['winner_id']:
+                    t['target']['primary_description']
+                      for t in response['target_indices']}
+            response.update({'target_winner': winner[True]})
+
+            for key in ['q', '_id', 'target_indices', 'winner_id', 'context_type']:
+                if key in response:
+                    del response[key]
+            response.update(targets)
+            formatted += [response]
+
+        return formatted
+
+

apps/PoolBasedTripletMDS/algs/ValidationSampling/utilsMDS.py

@@ -92,17 +92,14 @@ def getRandomQuery(X):
     """
     n,d = X.shape
 
-    i = randint(n)
-    j = randint(n)
-    while (j==i):
+    while True:
+        i = randint(n)
         j = randint(n)
-    k = randint(n)
-    while (k==i) | (k==j):
         k = randint(n)
+        if i != j and j != k and k != i:
+            break
     q = [i, j, k]
-
     score = getTripletScore(X,q)
-
     return q,score
 
 def getTripletScore(X,q):

apps/PoolBasedTripletMDS/myApp.py

@@ -63,6 +63,23 @@ def processAnswer(self, butler, alg, args):
     def getModel(self, butler, alg, args):
         return alg()
 
+    def format_responses(self, responses):
+        formatted = []
+        for response in responses:
+            if 'target_winner' not in response:
+                continue
+            targets = {'target_' + target['label']: target['primary_description']
+                       for target in response['target_indices']}
+            winner = {t['target_id'] == response['target_winner']: t['primary_description']
+                      for t in response['target_indices']}
+            response.update({'target_winner': winner[True]})
 
+            for key in ['q', '_id', 'target_indices']:
+                if key in response:
+                    del response[key]
+            response.update(targets)
+            formatted += [response]
+
+        return formatted