X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;ds=sidebyside;f=Parasitemia%2FParasitemiaCore%2FEllipse.fs;h=b39ab4d61d46c11d249c3a264346f6bb016fb876;hb=2e3cd07dd099944059ef5e7a7f5ef57ffe3d677b;hp=e95cf2780c988461d8223e284a53fa7922892a18;hpb=85adb74195fe7145535d3d36263aec2f7879cd60;p=master-thesis.git
diff --git a/Parasitemia/ParasitemiaCore/Ellipse.fs b/Parasitemia/ParasitemiaCore/Ellipse.fs
index e95cf27..b39ab4d 100644
--- a/Parasitemia/ParasitemiaCore/Ellipse.fs
+++ b/Parasitemia/ParasitemiaCore/Ellipse.fs
@@ -122,6 +122,9 @@ let private areVectorsValid (p1x: float32) (p1y: float32) (p2x: float32) (p2y: f
else
None
+///
+/// Build a set of ellipses as a 'MatchingEllipses' object by finding ellipses with the given edges and gradient.
+///
let find (edges: Matrix)
(xGradient: Matrix)
(yGradient: Matrix)
@@ -176,8 +179,8 @@ let find (edges: Matrix)
// Add the new elements.
let newElemsBegin_j = window_j + windowSize - increment
let newElemsEnd_j = window_j + windowSize - 1
- for j in (if newElemsBegin_j < 0 then 0 else newElemsBegin_j) .. (if newElemsEnd_j >= w then w - 1 else newElemsEnd_j) do
- for i in window_i_begin .. window_i_end do
+ for j = (if newElemsBegin_j < 0 then 0 else newElemsBegin_j) to (if newElemsEnd_j >= w then w - 1 else newElemsEnd_j) do
+ for i = window_i_begin to window_i_end do
if edgesData.[i, j] = 1uy
then currentElements.Add(Point(j, i))