Commit 64fc9873 authored by Georgios Dagkakis's avatar Georgios Dagkakis Committed by Jérome Perrin

family attribute to be outputted in the results

parent e85bd7b3
...@@ -218,6 +218,7 @@ class Exit(CoreObject): ...@@ -218,6 +218,7 @@ class Exit(CoreObject):
from Globals import getConfidenceIntervals from Globals import getConfidenceIntervals
json = { '_class': 'Dream.%s' % self.__class__.__name__, json = { '_class': 'Dream.%s' % self.__class__.__name__,
'id': self.id, 'id': self.id,
'family': self.family,
'results': {} } 'results': {} }
if(G.numberOfReplications==1): if(G.numberOfReplications==1):
json['results']['throughput']=self.numOfExits json['results']['throughput']=self.numOfExits
......
...@@ -59,6 +59,7 @@ class Job(Entity): # inherits from the Entity c ...@@ -59,6 +59,7 @@ class Job(Entity): # inherits from the Entity c
if(G.numberOfReplications==1): #if we had just one replication output the results to excel if(G.numberOfReplications==1): #if we had just one replication output the results to excel
json = { '_class': 'Dream.%s' % self.__class__.__name__, json = { '_class': 'Dream.%s' % self.__class__.__name__,
'id': self.id, 'id': self.id,
'family': self.family,
'results': {} } 'results': {} }
#json['extraPropertyDict'] = self.extraPropertyDict #json['extraPropertyDict'] = self.extraPropertyDict
......
...@@ -985,6 +985,7 @@ class Machine(CoreObject): ...@@ -985,6 +985,7 @@ class Machine(CoreObject):
from Globals import getConfidenceIntervals from Globals import getConfidenceIntervals
json = {'_class': 'Dream.%s' % self.__class__.__name__, json = {'_class': 'Dream.%s' % self.__class__.__name__,
'id': self.id, 'id': self.id,
'family': self.family,
'results': {}} 'results': {}}
if (G.numberOfReplications == 1): if (G.numberOfReplications == 1):
# if we had just one replication output the results as numbers # if we had just one replication output the results as numbers
......
...@@ -290,7 +290,8 @@ class Queue(CoreObject): ...@@ -290,7 +290,8 @@ class Queue(CoreObject):
def outputResultsJSON(self): def outputResultsJSON(self):
from Globals import G from Globals import G
json = {'_class': 'Dream.%s' % self.__class__.__name__, json = {'_class': 'Dream.%s' % self.__class__.__name__,
'id': str(self.id), } 'id': str(self.id),
'family': self.family}
# XXX this have to be updated to support multiple generations # XXX this have to be updated to support multiple generations
# if G.numberOfReplications == 1 and self.wip_stat_list: # if G.numberOfReplications == 1 and self.wip_stat_list:
# json['wip_stat_list'] = self.wip_stat_list # json['wip_stat_list'] = self.wip_stat_list
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment