Merge branch 'master' into feature_socket_server

leconize · Apr 24, 2018 · 1bcf8d4 · 1bcf8d4
2 parents 33d8871 + 512b916
commit 1bcf8d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CoreMLTest/EyeGazeLogic.swift b/CoreMLTest/EyeGazeLogic.swift
@@ -230,9 +230,8 @@ class EyeGazeLogic: EyeGazeLogicProtocol{
         return eyeRect
     }
 
-
-    func calculateFaceGrid(imageBound: CGRect, gridSize:CGFloat, faceBound:CGRect) -> MLMultiArray? {
-
+
+    func calculateFaceGrid(imageBound: CGRect, gridSize:CGFloat, faceBound:CGRect) -> MLMultiArray?{
         let scaleX = gridSize / imageBound.width
         let scaleY = gridSize / imageBound.height
 
@@ -257,7 +256,7 @@ class EyeGazeLogic: EyeGazeLogicProtocol{
         yHi = min(gridSize, max(1, yHi))
 
         for index in 0..<(Int(gridSize*gridSize)){
-            let row = floor(CGFloat(index) / gridSize)
+            let row = CGFloat(Int( CGFloat(index) / gridSize))
             let column = CGFloat(index%Int(gridSize))
             if(row <= yHi - 1 && row >= yLow - 1 && column <= xHi - 1 && column >= xLow - 1){
                 faceGridArray[index] = 1

diff --git a/Untitled Diagram.xml b/Untitled Diagram.xml
@@ -0,0 +1 @@
+<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Safari/537.36" version="7.8.4" editor="www.draw.io" type="github"><diagram id="386af383-f14a-56b8-7aee-563100a0c744" name="Page-1">3ZSxboMwEIafhh1wgtoxIWk7tFKlDJ0dcMCqzSFzBOjT18QHDkojdepQBnT+7j/7/NsQsFT3z4bX5RvkQgVxmPcB2wVx/JAk9j2CwYHV49qBwsjcociDg/wSBEOircxFsxAigEJZL2EGVSUyXDBuDHRL2QnUctWaF+IGHDKubumHzLGkba1Dz1+ELMpp5SikzJFnn4WBtqL1gpidLo9Laz7NRfqm5Dl0V4jtA5YaAHSR7lOhRmsn21zd053s3LcRFf6mIHYFZ65a2vomQzDUHA6TIbbPegxbrZyAbc/CoLSWvfKjUO/QSJRQWckREEFbgRoT29mQFNRYt/OW+Dk2ShZjLUJtaYla2UFkQ2rPykR/d4vRbJy9jwK0QDNYyVSwIq/pLsbTWXX+ZBmh8upQE2Kc7lIxz+z9tAFZ+rO97P/bm7A/s9cO/ZdxyV39fdj+Gw==</diagram></mxfile>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Safari/537.36" version="7.8.4" editor="www.draw.io" type="github"><diagram id="386af383-f14a-56b8-7aee-563100a0c744" name="Page-1">3ZSxboMwEIafhh1wgtoxIWk7tFKlDJ0dcMCqzSFzBOjT18QHDkojdepQBnT+7j/7/NsQsFT3z4bX5RvkQgVxmPcB2wVx/JAk9j2CwYHV49qBwsjcociDg/wSBEOircxFsxAigEJZL2EGVSUyXDBuDHRL2QnUctWaF+IGHDKubumHzLGkba1Dz1+ELMpp5SikzJFnn4WBtqL1gpidLo9Laz7NRfqm5Dl0V4jtA5YaAHSR7lOhRmsn21zd053s3LcRFf6mIHYFZ65a2vomQzDUHA6TIbbPegxbrZyAbc/CoLSWvfKjUO/QSJRQWckREEFbgRoT29mQFNRYt/OW+Dk2ShZjLUJtaYla2UFkQ2rPykR/d4vRbJy9jwK0QDNYyVSwIq/pLsbTWXX+ZBmh8upQE2Kc7lIxz+z9tAFZ+rO97P/bm7A/s9cO/ZdxyV39fdj+Gw==</diagram></mxfile>