X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fsearch%2FReceiveRateMeasurement.py;h=d052ebd3bf7a4c9fe3940150e3b25aa7e02ee8e9;hp=58aa819017d06ac5055b9630c4be1b66a6d229cf;hb=39b4a07718ecab94ea331362edb62dfcf678bd09;hpb=35175924550d67f98fb1c2c50b0634656d29169e diff --git a/resources/libraries/python/search/ReceiveRateMeasurement.py b/resources/libraries/python/search/ReceiveRateMeasurement.py index 58aa819017..d052ebd3bf 100644 --- a/resources/libraries/python/search/ReceiveRateMeasurement.py +++ b/resources/libraries/python/search/ReceiveRateMeasurement.py @@ -17,38 +17,38 @@ class ReceiveRateMeasurement(object): """Structure defining the result of single Rr measurement.""" - def __init__(self, duration, target_tr, transmit_count, drop_count): + def __init__(self, duration, target_tr, transmit_count, loss_count): """Constructor, normalize primary and compute secondary quantities. :param duration: Measurement duration [s]. :param target_tr: Target transmit rate [pps]. If bidirectional traffic is measured, this is bidirectional rate. :param transmit_count: Number of packets transmitted [1]. - :param drop_count: Number of packets transmitted but not received [1]. + :param loss_count: Number of packets transmitted but not received [1]. :type duration: float :type target_tr: float :type transmit_count: int - :type drop_count: int + :type loss_count: int """ self.duration = float(duration) self.target_tr = float(target_tr) self.transmit_count = int(transmit_count) - self.drop_count = int(drop_count) - self.receive_count = transmit_count - drop_count + self.loss_count = int(loss_count) + self.receive_count = transmit_count - loss_count self.transmit_rate = transmit_count / self.duration - self.drop_rate = drop_count / self.duration + self.loss_rate = loss_count / self.duration self.receive_rate = self.receive_count / self.duration - self.drop_fraction = float(self.drop_count) / self.transmit_count + self.loss_fraction = float(self.loss_count) / self.transmit_count # TODO: Do we want to store also the real time (duration + overhead)? def __str__(self): - """Return string reporting input and drop fraction.""" + """Return string reporting input and loss fraction.""" return "d={dur!s},Tr={rate!s},Df={frac!s}".format( - dur=self.duration, rate=self.target_tr, frac=self.drop_fraction) + dur=self.duration, rate=self.target_tr, frac=self.loss_fraction) def __repr__(self): """Return string evaluable as a constructor call.""" return ("ReceiveRateMeasurement(duration={dur!r},target_tr={rate!r}" - ",transmit_count={trans!r},drop_count={drop!r})".format( + ",transmit_count={trans!r},loss_count={loss!r})".format( dur=self.duration, rate=self.target_tr, - trans=self.transmit_count, drop=self.drop_count)) + trans=self.transmit_count, loss=self.loss_count))