diff --git a/Makefile b/Makefile index 3e7772c..e5e0f72 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ DOCKER_ORGANIZATION = thibaultfalque # The version of the package to build. -VERSION = 1.1 +VERSION = 1.1.2 # The directory of the unit tests for the package to build. diff --git a/metrics/__init__.py b/metrics/__init__.py index b03dd8d..a8e0fdc 100644 --- a/metrics/__init__.py +++ b/metrics/__init__.py @@ -35,7 +35,7 @@ __summary__ = 'rEproducible sofTware peRformance analysIs in perfeCt Simplicity' __keywords__ = 'reproducible software performance analysis' __uri__ = 'https://github.com/crillab/metrics' -__version__ = '1.1.1' +__version__ = '1.1.2' __author__ = 'Thibault Falque, Romain Wallon, Hugues Wattez' __email__ = 'thibault.falque@exakis-nelite.com, wallon@cril.fr, wattez@cril.fr' diff --git a/metrics/wallet/analysis.py b/metrics/wallet/analysis.py index 0846316..2e3f149 100644 --- a/metrics/wallet/analysis.py +++ b/metrics/wallet/analysis.py @@ -634,7 +634,7 @@ def default_explode(df, samp, objective): times = _make_list(d.pop('timestamp_list')) bounds = _make_list(d.pop('bound_list')) - if objective(d.pop('objective',None)): + if objective(d.pop('objective', None)): bounds = [-x for x in bounds] if len(bounds) != len(times): @@ -643,7 +643,7 @@ def default_explode(df, samp, objective): l = [] i = 0 for j in range(len(bounds)): - while times[j] > samp[i]: + while i < len(samp) and times[j] > samp[i]: d2 = d.copy() d2['status'] = d2['status'] if d2['cpu_time'] < samp[i] else 'INCOMPLETE' d2['success'] = d2['status'] == 'COMPLETE'