From 1709f406eddda318f39275a4d9f3838bdaa83496 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Mon, 25 May 2020 14:27:39 +0100
Subject: Correct calculation of F measure

This commit corrects an error in the calculation of the
F measure and updates the results accordingly. As a precaution,
doctests are added to each of the functions in the metrics.py
file.
---
 analysis/output/tables/aggregate_table_wide.tex | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'analysis/output/tables/aggregate_table_wide.tex')

diff --git a/analysis/output/tables/aggregate_table_wide.tex b/analysis/output/tables/aggregate_table_wide.tex
index 43aff1de..1da11a9f 100644
--- a/analysis/output/tables/aggregate_table_wide.tex
+++ b/analysis/output/tables/aggregate_table_wide.tex
@@ -3,19 +3,19 @@
  & \multicolumn{4}{c}{Univariate} & \multicolumn{4}{c}{Multivariate} \\\cmidrule(lr){2-5}\cmidrule(lr){6-9}
  & \multicolumn{2}{c}{Default} & \multicolumn{2}{c}{Best} & \multicolumn{2}{c}{Default} & \multicolumn{2}{c}{Best} \\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9}
  & Cover & F1 & Cover & F1 & Cover & F1 & Cover & F1\\\cmidrule(r){1-1}\cmidrule(lr){2-5}\cmidrule(l){6-9}
-\textsc{amoc}     & 0.702 & 0.664 & 0.746 & 0.783 &       &       &       &       \\
-\textsc{binseg}   & \textbf{0.706} & \textbf{0.680} & 0.780 & 0.803 &       &       &       &       \\
-\textsc{bocpd}    & 0.636 & 0.611 & \textbf{0.789} & \textbf{0.831} & 0.455 & 0.188 & \textbf{0.801} & \textbf{0.718} \\
-\textsc{bocpdms}  & 0.633 & 0.476 & 0.744 & 0.569 & \textbf{0.486} & 0.286 & 0.623 & 0.386 \\
-\textsc{cpnp}     & 0.535 & 0.534 & 0.552 & 0.567 &       &       &       &       \\
-\textsc{ecp}      & 0.523 & 0.551 & 0.720 & 0.706 & 0.402 & 0.238 & 0.590 & 0.388 \\
-\textsc{kcpa}     & 0.062 & 0.057 & 0.626 & 0.589 & 0.047 & 0.009 & 0.626 & 0.456 \\
-\textsc{pelt}     & 0.689 & 0.653 & 0.725 & 0.703 &       &       &       &       \\
-\textsc{prophet}  & 0.540 & 0.456 & 0.576 & 0.506 &       &       &       &       \\
-\textsc{rbocpdms} & 0.629 & 0.418 &       &       & 0.402 & 0.250 &       &       \\
-\textsc{rfpop}    & 0.392 & 0.372 & 0.414 & 0.392 &       &       &       &       \\
-\textsc{segneigh} & 0.676 & 0.626 & 0.784 & 0.806 &       &       &       &       \\
-\textsc{wbs}      & 0.330 & 0.300 & 0.428 & 0.390 &       &       &       &       \\
-\textsc{zero}     & 0.583 & 0.669 & 0.579 & 0.662 & 0.464 & \textbf{0.577} & 0.464 & 0.577 \\
+\textsc{amoc}     & 0.702 & 0.704 & 0.746 & 0.799 &       &       &       &       \\
+\textsc{binseg}   & \textbf{0.706} & \textbf{0.744} & 0.780 & 0.856 &       &       &       &       \\
+\textsc{bocpd}    & 0.636 & 0.690 & \textbf{0.789} & \textbf{0.880} & 0.455 & \textbf{0.610} & \textbf{0.801} & \textbf{0.941} \\
+\textsc{bocpdms}  & 0.633 & 0.507 & 0.744 & 0.620 & \textbf{0.486} & 0.429 & 0.623 & 0.533 \\
+\textsc{cpnp}     & 0.535 & 0.607 & 0.552 & 0.666 &       &       &       &       \\
+\textsc{ecp}      & 0.523 & 0.598 & 0.720 & 0.797 & 0.402 & 0.545 & 0.590 & 0.725 \\
+\textsc{kcpa}     & 0.062 & 0.111 & 0.626 & 0.683 & 0.047 & 0.071 & 0.626 & 0.747 \\
+\textsc{pelt}     & 0.689 & 0.710 & 0.725 & 0.787 &       &       &       &       \\
+\textsc{prophet}  & 0.540 & 0.488 & 0.576 & 0.534 &       &       &       &       \\
+\textsc{rbocpdms} & 0.629 & 0.447 &       &       & 0.402 & 0.356 &       &       \\
+\textsc{rfpop}    & 0.392 & 0.499 & 0.414 & 0.531 &       &       &       &       \\
+\textsc{segneigh} & 0.676 & 0.676 & 0.784 & 0.855 &       &       &       &       \\
+\textsc{wbs}      & 0.330 & 0.412 & 0.428 & 0.533 &       &       &       &       \\
+\textsc{zero}     & 0.583 & 0.669 & 0.579 & 0.662 & 0.464 & 0.577 & 0.464 & 0.577 \\
 \cmidrule(r){1-1}\cmidrule(lr){2-5}\cmidrule(l){6-9}
 \end{tabular}
-- 
cgit v1.2.3

