Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
bob.pad.base
Commits
dcdbbe4d
Commit
dcdbbe4d
authored
Apr 29, 2019
by
Amir MOHAMMADI
Browse files
Fix strings, fix corner cases
parent
a772a3d5
Pipeline
#29690
passed with stage
in 13 minutes and 35 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bob/pad/base/script/pad_figure.py
View file @
dcdbbe4d
...
...
@@ -81,16 +81,19 @@ class Metrics(bio_figure.Metrics):
def
_strings
(
self
,
metrics
):
n_dec
=
".%df"
%
self
.
_decimal
for
k
,
v
in
metrics
.
items
():
if
k
in
(
"prec"
,
"recall"
,
"f1"
):
if
k
in
(
"prec
ision
"
,
"recall"
,
"f1
_score
"
):
metrics
[
k
]
=
"%s"
%
format
(
v
,
n_dec
)
elif
k
in
(
"np"
,
"nn"
,
"fp"
,
"fn"
):
continue
elif
k
in
(
"fpr"
,
"fnr"
):
metrics
[
k
]
=
"%s%% (%d/%d)"
%
(
format
(
100
*
v
,
n_dec
),
metrics
[
"fp"
if
k
==
"fpr"
else
"fn"
],
metrics
[
"np"
if
k
==
"fpr"
else
"nn"
],
)
if
"fp"
in
metrics
:
metrics
[
k
]
=
"%s%% (%d/%d)"
%
(
format
(
100
*
v
,
n_dec
),
metrics
[
"fp"
if
k
==
"fpr"
else
"fn"
],
metrics
[
"np"
if
k
==
"fpr"
else
"nn"
],
)
else
:
metrics
[
k
]
=
"%s%%"
%
format
(
100
*
v
,
n_dec
)
elif
k
==
"apcer_pais"
:
metrics
[
k
]
=
{
k1
:
"%s%%"
%
format
(
100
*
v1
,
n_dec
)
for
k1
,
v1
in
v
.
items
()
...
...
@@ -191,15 +194,15 @@ class MultiMetrics(Metrics):
def
_compute_headers
(
self
,
pais
):
names
=
list
(
self
.
names
)
i
dx
=
names
.
index
(
"apcer_pais"
)
if
idx
>
-
1
:
i
f
"apcer_pais"
in
names
:
idx
=
names
.
index
(
"apcer_pais"
)
names
=
(
[
n
.
upper
()
for
n
in
names
[:
idx
]]
+
self
.
pais
+
[
n
.
upper
()
for
n
in
names
[
idx
+
1
:]]
)
self
.
headers
=
[
"Methods"
]
+
names
if
self
.
_eval
:
if
self
.
_eval
and
"hter"
in
self
.
names
:
self
.
headers
.
insert
(
1
,
"HTER (dev)"
)
def
_strings
(
self
,
metrics
):
...
...
@@ -223,8 +226,8 @@ class MultiMetrics(Metrics):
def
_structured_array
(
self
,
metrics
):
names
=
list
(
metrics
[
0
].
keys
())
i
dx
=
names
.
index
(
"apcer_pais"
)
if
idx
>
-
1
:
i
f
"apcer_pais"
in
names
:
idx
=
names
.
index
(
"apcer_pais"
)
pais
=
list
(
f
"APCER (
{
pai
}
)"
for
pai
in
metrics
[
0
][
"apcer_pais"
].
keys
())
names
=
names
[:
idx
]
+
pais
+
names
[
idx
+
1
:]
self
.
pais
=
self
.
pais
or
pais
...
...
@@ -274,9 +277,9 @@ class MultiMetrics(Metrics):
dev_metrics
=
self
.
_strings
(
self
.
_dev_metrics
)
if
self
.
_eval
:
if
self
.
_eval
and
"hter"
in
dev_metrics
:
self
.
rows
.
append
([
title
,
dev_metrics
[
"hter"
]])
el
se
:
el
if
not
self
.
_eval
:
row
=
[
title
]
for
name
in
self
.
names
:
if
name
==
"apcer_pais"
:
...
...
@@ -285,6 +288,8 @@ class MultiMetrics(Metrics):
else
:
row
+=
[
dev_metrics
[
name
]]
self
.
rows
.
append
(
row
)
else
:
self
.
rows
.
append
([
title
])
if
self
.
_eval
:
eval_metrics
=
self
.
_strings
(
self
.
_eval_metrics
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment