X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FClassifier.fs;h=96532f8701214b00dfe3d19b9bdce91c217f30cc;hp=a3bfa9c92aa3f139776f08282296dde26ce5d1eb;hb=3b645f8ff5259f88a33ffbd9a63b10a8640c439f;hpb=db49e167a602ef1df02a8b5f7de334355a4917dd diff --git a/Parasitemia/ParasitemiaCore/Classifier.fs b/Parasitemia/ParasitemiaCore/Classifier.fs index a3bfa9c..96532f8 100644 --- a/Parasitemia/ParasitemiaCore/Classifier.fs +++ b/Parasitemia/ParasitemiaCore/Classifier.fs @@ -148,12 +148,8 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (img: e.Removed <- true // 5) Define pixels associated to each ellipse and create the cells. - let radiusParasiteRatio = 0.4f - let radiusParasite = config.RBCRadius.Pixel * 0.5f - let perimeterParasiteSquared = (2.f * radiusParasite) ** 2.f |> roundInt - let parasiteOccupation = 0.08f // 8 % - let minimumParasiteArea = Const.PI * radiusParasite ** 2.f * parasiteOccupation |> roundInt - //let minimumStainArea = roundInt <| config.RBCRadius.Area * 0.02f // 1.5 % + let perimeterParasiteSquared = (2.f * config.RBCRadius.ParasiteRadius) ** 2.f |> roundInt + let minimumParasiteArea = config.RBCRadius.MinimumParasiteArea |> roundInt ellipsesWithNeigbors |> List.choose (fun (e, neighbors) -> if e.Removed