From 86732e3389df8f9370e02800d94e1c018dabe922 Mon Sep 17 00:00:00 2001
From: alessiamarcolini <98marcolini@gmail.com>
Date: Tue, 8 Sep 2020 21:01:07 +0200
Subject: [PATCH] Address CR comments

---
 src/histolab/scorer.py | 3 +--
 src/histolab/tiler.py  | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/histolab/scorer.py b/src/histolab/scorer.py
index 849841da..c07fba36 100644
--- a/src/histolab/scorer.py
+++ b/src/histolab/scorer.py
@@ -64,7 +64,6 @@ def __call__(self, tile: Tile) -> float:
         float
             Nuclei score
         """
-        tissue_ratio = tile.tissue_ratio
 
         filters_raw_nuclei = imf.Compose(
             [imf.HematoxylinChannel(), imf.YenThreshold(operator.gt)]
@@ -79,4 +78,4 @@ def __call__(self, tile: Tile) -> float:
         mask_nuclei = mask_difference(mask_raw_nuclei, mask_nuclei_clean)
         nuclei_ratio = np.count_nonzero(mask_nuclei) / mask_nuclei.size
 
-        return nuclei_ratio * np.tanh(tissue_ratio)
+        return nuclei_ratio * np.tanh(tile.tissue_ratio)
diff --git a/src/histolab/tiler.py b/src/histolab/tiler.py
index 6fe5721e..d123e604 100644
--- a/src/histolab/tiler.py
+++ b/src/histolab/tiler.py
@@ -599,14 +599,15 @@ def _highest_score_tiles(self, slide: Slide) -> List[Tuple[float, CoordinatePair
         sorted_tiles_by_scaled_score = sorted(
             scaled_scores, key=lambda x: x[0], reverse=True
         )
+        if self.n_tiles < 0:
+            raise ValueError(f"'n_tiles' cannot be negative ({self.n_tiles})")
+
         if self.n_tiles > 0:
             highest_score_tiles = sorted_tiles_by_score[: self.n_tiles]
             highest_scaled_score_tiles = sorted_tiles_by_scaled_score[: self.n_tiles]
-        elif self.n_tiles == 0:
+        else:
             highest_score_tiles = sorted_tiles_by_score
             highest_scaled_score_tiles = sorted_tiles_by_scaled_score
-        else:
-            raise ValueError(f"'n_tiles' cannot be negative ({self.n_tiles})")
 
         return highest_score_tiles, highest_scaled_score_tiles