CSIT-1078: Optimize input data files download and processing

[csit.git] / resources / tools / presentation / generator_CPTA.py

diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index d72be3d..89e9a41 100644 (file)
--- 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)