Homework jgoppert#7

AlexanderJChapa · Oct 30, 2019 · eb0e90e · eb0e90e
1 parent 86f07d6
commit eb0e90e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/homework/hw7/a.out b/homework/hw7/a.out
diff --git a/homework/hw7/quad b/homework/hw7/quad
diff --git a/homework/hw7/quadtree.cpp b/homework/hw7/quadtree.cpp
@@ -121,7 +121,16 @@ class QuadTree
     std::list<Landmark> search(const Position &position, double radius)
     {
         std::list<Landmark> close_landmarks;
-		// just fill in your logic here
+        if (m_size < m_resolution) close_landmarks.splice(close_landmarks.end(), std::list<Landmark>(m_landmarks));
+        auto loc = sqrt((m_center.x-position.x)*(m_center.x-position.x) + (m_center.y-position.y)*(m_center.y-position.y));
+        auto dist = radius + m_size*sqrt(2);
+        if(loc<dist){
+            if (m_NE.get()) close_landmarks.splice(close_landmarks.end(), m_NE->search(position, radius));
+            if (m_NW.get()) close_landmarks.splice(close_landmarks.end(), m_NW->search(position, radius));
+            if (m_SE.get()) close_landmarks.splice(close_landmarks.end(), m_SE->search(position, radius));
+            if (m_SW.get()) close_landmarks.splice(close_landmarks.end(), m_SW->search(position, radius));
+        }
+
         return close_landmarks;
     }