projects
/
master-thesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace "for [..] in [..]" by "for [..] to [..]" for consistency.
[master-thesis.git]
/
Parasitemia
/
ParasitemiaCore
/
Classifier.fs
diff --git
a/Parasitemia/ParasitemiaCore/Classifier.fs
b/Parasitemia/ParasitemiaCore/Classifier.fs
index
ea3f9dd
..
1db8b03
100644
(file)
--- a/
Parasitemia/ParasitemiaCore/Classifier.fs
+++ b/
Parasitemia/ParasitemiaCore/Classifier.fs
@@
-145,8
+145,8
@@
let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (widt
let minX, minY, maxX, maxY = ellipseWindow e
let mutable area = 0
let minX, minY, maxX, maxY = ellipseWindow e
let mutable area = 0
- for y
in (if minY < 0 then 0 else minY) ..
(if maxY >= height then height - 1 else maxY) do
- for x
in (if minX < 0 then 0 else minX) ..
(if maxX >= width then width - 1 else maxX) do
+ for y
= (if minY < 0 then 0 else minY) to
(if maxY >= height then height - 1 else maxY) do
+ for x
= (if minX < 0 then 0 else minX) to
(if maxX >= width then width - 1 else maxX) do
let p = PointF(float32 x, float32 y)
if pixelOwnedByE p e neighbors
then
let p = PointF(float32 x, float32 y)
if pixelOwnedByE p e neighbors
then
@@
-167,8
+167,8
@@
let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (widt
let mutable darkStainPixels = 0
let mutable nbElement = 0
let minX, minY, maxX, maxY = ellipseWindow e
let mutable darkStainPixels = 0
let mutable nbElement = 0
let minX, minY, maxX, maxY = ellipseWindow e
- for y
in minY ..
maxY do
- for x
in minX ..
maxX do
+ for y
= minY to
maxY do
+ for x
= minX to
maxX do
let p = PointF(float32 x, float32 y)
if pixelOwnedByE p e neighbors
then
let p = PointF(float32 x, float32 y)
if pixelOwnedByE p e neighbors
then
@@
-178,6
+178,8
@@
let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (widt
darkStainPixels <- darkStainPixels + 1
if float darkStainPixels > config.Parameters.maxDarkStainRatio * (float nbElement) then Some e else None)
darkStainPixels <- darkStainPixels + 1
if float darkStainPixels > config.Parameters.maxDarkStainRatio * (float nbElement) then Some e else None)
+
+ // We do not change the state during the process to avoid to have peculiar neighbors which change the behavior of 'pixelOwnedByE'.
|> List.iter (fun e -> e.State <- CellState.Peculiar)
// 5) Define pixels associated to each ellipse and create the cells.
|> List.iter (fun e -> e.State <- CellState.Peculiar)
// 5) Define pixels associated to each ellipse and create the cells.
@@
-202,8
+204,8
@@
let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (widt
let mutable nbElement = 0
let elements = new Matrix<byte>(maxY - minY + 1, maxX - minX + 1)
let mutable nbElement = 0
let elements = new Matrix<byte>(maxY - minY + 1, maxX - minX + 1)
- for y
in minY ..
maxY do
- for x
in minX ..
maxX do
+ for y
= minY to
maxY do
+ for x
= minX to
maxX do
let p = PointF(float32 x, float32 y)
if pixelOwnedByE p e neighbors
then
let p = PointF(float32 x, float32 y)
if pixelOwnedByE p e neighbors
then