X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_CPTA.py;h=89e9a41b48cf5f7e4902e86dbc3a7025e5449083;hb=5646509aea6b43ef1efb282aad908289cc005b26;hp=d72be3d58992ce2d5ba4655026c69b4dc0cada4c;hpb=d5d53957f4686398727469e0f5b1774a5b6560fe;p=csit.git diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py index d72be3d589..89e9a41b48 100644 --- a/resources/tools/presentation/generator_CPTA.py +++ b/resources/tools/presentation/generator_CPTA.py @@ -32,7 +32,7 @@ from utils import split_outliers, archive_input_data, execute_command HTML_BUILDER = 'sphinx-build -v -c conf_cpta -a ' \ '-b html -E ' \ '-t html ' \ - '-D version="Generated on {date}" ' \ + '-D version="{date}" ' \ '{working_dir} ' \ '{build_dir}/' @@ -64,7 +64,7 @@ def generate_cpta(spec, data): ret_code = _generate_all_charts(spec, data) cmd = HTML_BUILDER.format( - date=datetime.date.today().strftime('%d-%b-%Y'), + date=datetime.datetime.utcnow().strftime('%m/%d/%Y %H:%M UTC'), working_dir=spec.environment["paths"]["DIR[WORKING,SRC]"], build_dir=spec.environment["paths"]["DIR[BUILD,HTML]"]) execute_command(cmd) @@ -176,9 +176,9 @@ def _evaluate_results(trimmed_data, window=10): or np.isnan(tmm[build_nr]) or np.isnan(tmstd[build_nr])): results.append(0.0) - elif value < (tmm[build_nr] - 2 * tmstd[build_nr]): + elif value < (tmm[build_nr] - 3 * tmstd[build_nr]): results.append(0.33) - elif value > (tmm[build_nr] + 2 * tmstd[build_nr]): + elif value > (tmm[build_nr] + 3 * tmstd[build_nr]): results.append(1.0) else: results.append(0.66) @@ -187,10 +187,10 @@ def _evaluate_results(trimmed_data, window=10): try: tmm = np.median(trimmed_data) tmstd = np.std(trimmed_data) - if trimmed_data.values[-1] < (tmm - 2 * tmstd): + if trimmed_data.values[-1] < (tmm - 3 * tmstd): results.append(0.33) - elif (tmm - 2 * tmstd) <= trimmed_data.values[-1] <= ( - tmm + 2 * tmstd): + elif (tmm - 3 * tmstd) <= trimmed_data.values[-1] <= ( + tmm + 3 * tmstd): results.append(0.66) else: results.append(1.0)