X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FClassifier.fs;h=b01a0412deceecaa31da61da83e78210f8a35a24;hb=31078fdde95f1b239110dfe29998e9b03e3a9bea;hp=a2d9e4f446b08ac1dde5a18bd549d7f6ad2f1be8;hpb=d247f3a07ca3c7b192d8c2381ea85ba731fcc359;p=master-thesis.git diff --git a/Parasitemia/ParasitemiaCore/Classifier.fs b/Parasitemia/ParasitemiaCore/Classifier.fs index a2d9e4f..b01a041 100644 --- a/Parasitemia/ParasitemiaCore/Classifier.fs +++ b/Parasitemia/ParasitemiaCore/Classifier.fs @@ -5,7 +5,6 @@ open System.Collections.Generic open System.Drawing open Emgu.CV -open Emgu.CV.Structure open Types open Utils @@ -91,7 +90,7 @@ let findCells (ellipses : Ellipse list) (parasites : ParasitesMarker.Result) (wi if e.State <> CellState.Removed then tree.Search (searchRegion e) // We only keep the ellipses touching 'e'. - |> List.choose ( + |> Seq.choose ( fun otherE -> if e <> otherE then match EEOver.EEOverlapArea e otherE with @@ -105,6 +104,7 @@ let findCells (ellipses : Ellipse list) (parasites : ParasitesMarker.Result) (wi else None ) + |> List.ofSeq else []