X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FGranulometry.fs;h=bbb6d66fd6e88346060bf54638f7b9d458e50c00;hb=b87b35b922551f122228df1fd9c530bbb807935a;hp=877df99384d1f2671cd7481fc3d34dc3f78dfc9f;hpb=04d4504e7b248a82ddfc1a41d325e59d24146590;p=master-thesis.git
diff --git a/Parasitemia/ParasitemiaCore/Granulometry.fs b/Parasitemia/ParasitemiaCore/Granulometry.fs
index 877df99..bbb6d66 100644
--- a/Parasitemia/ParasitemiaCore/Granulometry.fs
+++ b/Parasitemia/ParasitemiaCore/Granulometry.fs
@@ -15,7 +15,7 @@ open Utils
///
/// Minimum radius * maximum radius
/// le 1.0, to speed up the process.
-let findRadiusByClosing (img: Image) (range: int * int) (scale: float) (useOctagon: bool) : int =
+let findRadiusByClosing (img : Image) (range : int * int) (scale : float) (useOctagon : bool) : int =
use scaledImg = if scale = 1. then img else img.Resize(scale, CvEnum.Inter.Area)
let r1, r2 = range
@@ -25,14 +25,13 @@ let findRadiusByClosing (img: Image) (range: int * int) (scale: f
let intensityImg = scaledImg.GetSum().Intensity
// 's' must be odd.
- let octagon (s: int) : Matrix =
+ let octagon (s : int) : Matrix =
if s % 2 = 0 then failwith "s must be odd"
let m = new Matrix(Array2D.create s s 1uy)
let r = (float s) / (Math.Sqrt 2. + 2.) |> roundInt
- for i in 0 .. r - 1 do
- for j in 0 .. r - 1 do
- if i + j < r
- then
+ for i = 0 to r - 1 do
+ for j = 0 to r - 1 do
+ if i + j < r then
m.[i, j] <- 0uy
m.[s - i - 1, j] <- 0uy
m.[i, s - j - 1] <- 0uy
@@ -40,17 +39,18 @@ let findRadiusByClosing (img: Image) (range: int * int) (scale: f
m
let mutable previous_n = Double.NaN
- for r in r1' .. r2' do
- let se = if useOctagon
- then (octagon (2 * r - 1)).Mat // It doesn't speed up the process.
- else CvInvoke.GetStructuringElement(CvEnum.ElementShape.Ellipse, Size(2 * r, 2 * r), Point(-1, -1))
+ for r = r1' to r2' do
+ let se =
+ if useOctagon then
+ (octagon (2 * r - 1)).Mat // It doesn't speed up the process.
+ else
+ CvInvoke.GetStructuringElement(CvEnum.ElementShape.Ellipse, Size(2 * r, 2 * r), Point(-1, -1))
use closed = scaledImg.MorphologyEx(CvEnum.MorphOp.Close, se, Point(-1, -1), 1, CvEnum.BorderType.Replicate, MCvScalar(0.0))
let n = closed.GetSum().Intensity
- if not (Double.IsNaN previous_n)
- then
+ if not (Double.IsNaN previous_n) then
patternSpectrum.[r - r1' - 1] <- abs (n - previous_n)
previous_n <- n
@@ -61,11 +61,11 @@ let findRadiusByClosing (img: Image) (range: int * int) (scale: f
///
/// Granulometry by area closing on the image 'img' by testing the circle area into the given radius range.
///
-let findRadiusByAreaClosing (img: Image) (radiusRange: int * int) : int =
+let findRadiusByAreaClosing (img : Image) (radiusRange : int * int) : int =
let r1, r2 = radiusRange
- if r1 > r2
- then failwithf "'radiusRange' invalid : %A" radiusRange
+ if r1 > r2 then
+ failwithf "'radiusRange' invalid : %O" radiusRange
use imgCopy = img.Copy()
@@ -73,8 +73,7 @@ let findRadiusByAreaClosing (img: Image) (radiusRange: int * int)
let mutable max_r = r1
Morpho.areaCloseFWithFun imgCopy [ for r in r1 .. r2 -> Math.PI * float r ** 2. |> roundInt, r ] (fun r diff ->
- if r <> r1 && diff > maxDiff
- then
+ if r <> r1 && diff > maxDiff then
maxDiff <- diff
max_r <- r - 1)
max_r