X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FClassifier.fs;h=1db8b03e73d362b973e82d556d4bf174866a9571;hp=5a6dcbeed914e61d11fdaa9246beedee71ba82fd;hb=1b8e45987bde692ab5602c281f878707f70459b7;hpb=32ef4bbb0381f822c4df124595d401ad2f502c1b diff --git a/Parasitemia/ParasitemiaCore/Classifier.fs b/Parasitemia/ParasitemiaCore/Classifier.fs index 5a6dcbe..1db8b03 100644 --- 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 - 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 @@ -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 - 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 @@ -204,8 +204,8 @@ let findCells (ellipses: Ellipse list) (parasites: ParasitesMarker.Result) (widt let mutable nbElement = 0 let elements = new Matrix(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