X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FUtils.fs;fp=Parasitemia%2FParasitemiaCore%2FUtils.fs;h=77e5e6fe70a012d88831c9a30f3f3671cb8b9411;hb=b87b35b922551f122228df1fd9c530bbb807935a;hp=d83bf8d0151d62da5257c10e40150976b4f3ca7c;hpb=2e3cd07dd099944059ef5e7a7f5ef57ffe3d677b;p=master-thesis.git diff --git a/Parasitemia/ParasitemiaCore/Utils.fs b/Parasitemia/ParasitemiaCore/Utils.fs index d83bf8d..77e5e6f 100644 --- a/Parasitemia/ParasitemiaCore/Utils.fs +++ b/Parasitemia/ParasitemiaCore/Utils.fs @@ -10,29 +10,32 @@ let inline roundInt v = v |> round |> int let inline dprintfn fmt = Printf.ksprintf System.Diagnostics.Debug.WriteLine fmt -let inline lineFromTwoPoints (p1: PointF) (p2: PointF) : Line = +let inline lineFromTwoPoints (p1 : PointF) (p2 : PointF) : Line = let a = (p1.Y - p2.Y) / (p1.X - p2.X) let b = -(p2.X * p1.Y - p1.X * p2.Y) / (p1.X - p2.X) Line(a, b) -let inline pointFromTwoLines (l1: Line) (l2: Line) : PointF = +let inline pointFromTwoLines (l1 : Line) (l2 : Line) : PointF = let x = -(l1.B - l2.B) / (l1.A - l2.A) let y = -(l2.A * l1.B - l1.A * l2.B) / (l1.A - l2.A) PointF(x, y) -let inline linePassThroughSegment (l: Line) (p1: PointF) (p2: PointF) : bool = +let inline linePassThroughSegment (l : Line) (p1 : PointF) (p2 : PointF) : bool = let p = pointFromTwoLines l (lineFromTwoPoints p1 p2) sign (p.X - p1.X) <> sign (p.X - p2.X) -let inline squaredDistanceTwoPoints (p1: PointF) (p2: PointF) = +let inline squaredDistanceTwoPoints (p1 : PointF) (p2 : PointF) = (p1.X - p2.X) ** 2.f + (p1.Y - p2.Y) ** 2.f -let inline distanceTwoPoints (p1: PointF) (p2: PointF) = +let inline distanceTwoPoints (p1 : PointF) (p2 : PointF) = squaredDistanceTwoPoints p1 p2 |> sqrt -let countCells (cells: Cell list) : int * int = - cells |> List.fold (fun (total, infected) { cellClass = cellClass } -> - match cellClass with - | HealthyRBC -> (total + 1, infected) - | InfectedRBC -> (total + 1, infected + 1) - | Peculiar -> (total, infected)) (0, 0) \ No newline at end of file +let countCells (cells : Cell list) : int * int = + cells + |> List.fold ( + fun (total, infected) { cellClass = cellClass } -> + match cellClass with + | HealthyRBC -> (total + 1, infected) + | InfectedRBC -> (total + 1, infected + 1) + | Peculiar -> (total, infected) + ) (0, 0) \ No newline at end of file