Skip to content

Commit 7eed9f1

Browse files
committed
Routine updates.
1 parent a0d19c6 commit 7eed9f1

File tree

4 files changed

+42
-13
lines changed

4 files changed

+42
-13
lines changed

augmentation/transform.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def apply(self, img: _npndarray) -> _npndarray:
8686
smoke_mask[i] = row
8787
smoke_mask = _repeat(_expand_dims(smoke_mask, -1), 3, 2)
8888
smoke_mask += smoke_mask[::-1, :, :]
89-
smoke_mask += smoke_mask * tex / 255
89+
smoke_mask += smoke_mask * tex / 256
9090
result = _array(img) * (_ones((height, width, 3)) - smoke_mask) + smoke_mask * self._smoke_color
9191
return _nparray(result)
9292

cached_augment.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from cv2 import imread, imwrite
44

5-
from augmentation import TransformBase, Smoke, LowBrightness, Blood
5+
from augmentation import TransformBase, Smoke
66
from utils import get_items
77

88

@@ -18,7 +18,7 @@ def augment_with_structure(src: str, output_dir: str, transform: TransformBase)
1818
if __name__ == '__main__':
1919
augment_with_structure("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/val",
2020
"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/smoke", Smoke())
21-
augment_with_structure("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/val",
22-
"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/lb", LowBrightness())
23-
augment_with_structure("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/val",
24-
"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/blood", Blood(20))
21+
# augment_with_structure("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/val",
22+
# "S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/lb", LowBrightness())
23+
# augment_with_structure("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/val",
24+
# "S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/blood", Blood(20))

rearrange.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def rearrange(src: str, output_dir: str) -> None:
1717
if __name__ == '__main__':
1818
rearrange("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/smoke",
1919
"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/smoke_nnunet")
20-
rearrange("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/lb",
21-
"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/lb_nnunet")
22-
rearrange("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/blood",
23-
"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/blood_nnunet")
20+
# rearrange("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/lb",
21+
# "S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/lb_nnunet")
22+
# rearrange("S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/blood",
23+
# "S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/blood_nnunet")

validate.py

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,40 @@
1-
from numpy import ndarray, logical_and
1+
from typing import Callable
2+
3+
from cv2 import imread, cvtColor, COLOR_RGB2GRAY
4+
from numpy import ndarray, logical_and, load
5+
from rich.progress import Progress
6+
7+
from utils import get_items
28

39

410
def calculate_dcs(a: ndarray, b: ndarray) -> float:
5-
a = a.astype(bool)
6-
b = b.astype(bool)
11+
a, b = a.astype(bool), b.astype(bool)
712
return float(2 * logical_and(a, b).sum() / (a.sum() + b.sum()))
813

914

1015
def calculate_nsd(a: ndarray, b: ndarray) -> float:
1116
return abs(a - b).sum() / max(a.sum(), b.sum())
17+
18+
19+
def evaluate(src: str, val: str, method: Callable[[ndarray, ndarray], float]) -> float:
20+
i = 0
21+
r = 0
22+
items = get_items(val)
23+
with Progress() as progress:
24+
task = progress.add_task("[white]Evaluating...", total=int(len(items) / 3))
25+
for path in get_items(val):
26+
if not path.endswith(".npy"):
27+
continue
28+
r += method(load(f"{val}/{path}"),
29+
cvtColor(imread(f"{src}/case_{str(i).zfill(4)}.png"), COLOR_RGB2GRAY) / 256)
30+
i += 1
31+
progress.update(task, advance=1)
32+
return r / i
33+
34+
35+
if __name__ == '__main__':
36+
predicted = "lb"
37+
print("DCS:", evaluate(f"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/{predicted}_predicted",
38+
"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/val", calculate_dcs))
39+
print("NSD:", evaluate(f"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/{predicted}_predicted",
40+
"S:/SharedDatasets/SegSTRONGC_release/SegSTRONGC_release/val", calculate_nsd))

0 commit comments

Comments
 (0)