Fix circular

src/Tour.cpp

@@ -4,47 +4,140 @@
 // Also remove these comments here and add your own.
 // TODO: remove this comment header
 
-#include <iostream>
 #include "Tour.h"
 #include "Node.h"
 #include "Point.h"
+#include <iostream>
 
-Tour::Tour()
+Tour::Tour() : m_startNode(nullptr) {}
-{
+
-    // TODO: write this member
+Tour::~Tour() {
+    if (m_startNode == nullptr)
+        return;
+
+    Node *node = m_startNode;
+    if (node->next == m_startNode) {
+        delete node;
+        return;
+    }
+
+    do {
+        Node *next = node->next;
+        delete node;
+        node = next;
+    } while (node != m_startNode);
 }
 
-Tour::~Tour()
+void Tour::show() const {
-{
+    if (m_startNode == nullptr)
-    // TODO: write this member
+        return;
+
+    Node *node = m_startNode;
+    do {
+        Point &p = node->point;
+        // I'm not using std::endl here to avoid flushing stdout for every
+        // iteration.
+        std::cout << '(' << p.x << ", " << p.y << ")\n";
+        node = node->next;
+    } while (node != m_startNode);
+
+    // Finally, flush!
+    std::flush(std::cout);
 }
 
-void Tour::show()
+void Tour::draw(QGraphicsScene *scene) const {
-{
+    if (m_startNode == nullptr)
-    // TODO: write this member
+        return;
+
+    Node *node = m_startNode;
+    while (node->next != nullptr) {
+        node->point.drawTo(node->next->point, scene);
+        node = node->next;
+    }
 }
 
-void Tour::draw(QGraphicsScene *scene)
+int Tour::size() const {
-{
+    if (m_startNode == nullptr)
-    // TODO: write this member
+        return 0;
+
+    int count = 0;
+    Node *node = m_startNode;
+    do {
+        count++;
+        node = node->next;
+    } while (node != m_startNode);
+
+    return count;
 }
 
-int Tour::size()
+double Tour::distance() const {
-{
+    if (m_startNode == nullptr)
-    // TODO: write this member
+        return 0;
+
+    double totalDistance = 0;
+    Node *node = m_startNode;
+    do {
+        totalDistance += node->point.distanceTo(node->next->point);
+        node = node->next;
+    } while (node != m_startNode);
+
+    return totalDistance;
 }
 
-double Tour::distance()
+void Tour::insertNearest(Point p) {
-{
+    if (m_startNode == nullptr) {
-    // TODO: write this member
+        m_startNode = new Node(p);
+        return;
+    }
+    if (m_startNode->next == nullptr) {
+        auto newNode = new Node(p, m_startNode);
+        m_startNode->next = newNode;
+        return;
+    }
+
+    Node *nearest = m_startNode;
+    double minDistance = INFINITY;
+
+    Node *node = m_startNode;
+    do {
+        double currentDistance = node->point.distanceTo(p);
+        if (currentDistance < minDistance) {
+            minDistance = currentDistance;
+            nearest = node;
+        }
+        node = node->next;
+    } while (node != m_startNode);
+
+    auto *newNode = new Node(p, nearest->next);
+    nearest->next = newNode;
 }
 
-void Tour::insertNearest(Point p)
+void Tour::insertSmallest(Point p) {
-{
+    if (m_startNode == nullptr) {
-    // TODO: write this member
+        m_startNode = new Node(p);
-}
+        return;
+    }
+    if (m_startNode->next == nullptr) {
+        auto newNode = new Node(p, m_startNode);
+        m_startNode->next = newNode;
+        return;
+    }
 
-void Tour::insertSmallest(Point p)
+    Node *bestNode = m_startNode;
-{
+    double minIncrease = INFINITY;
-    // TODO: write this member
+
+    Node *node = m_startNode;
+    do {
+        double increase = node->point.distanceTo(p) +
+                          p.distanceTo(node->next->point) -
+                          node->point.distanceTo(node->next->point);
+        if (increase < minIncrease) {
+            minIncrease = increase;
+            bestNode = node;
+        }
+        node = node->next;
+    } while (node != m_startNode);
+
+    auto *newNode = new Node(p, bestNode->next);
+    bestNode->next = newNode;
 }

src/Tour.h

@@ -15,15 +15,15 @@ public:
 
     Tour();
     ~Tour();
-    void show();
+    void show() const;
-    void draw(QGraphicsScene* scene);
+    void draw(QGraphicsScene* scene) const;
-    int size();
+    int size() const;
-    double distance();
+    double distance() const;
     void insertNearest(Point p);
     void insertSmallest(Point p);
 
 private:
-
+    Node* m_startNode;
 };
 
 #endif // TOUR_H

src/tsp.cpp

@@ -19,6 +19,10 @@ int main(int argc, char *argv[]) {
     QApplication a(argc, argv);
 
     string filename = "tsp10.txt";
+#ifdef __APPLE__
+    filename.insert(0, "../../../");
+#endif
+
     ifstream input;
     input.open(filename);
 
@@ -45,7 +49,7 @@ int main(int argc, char *argv[]) {
         tour.insertNearest(p);
         //uncomment the 4 lines below to animate
         //tour.draw(scene);
-        //std::chrono::milliseconds dura(50);
+        //std::chrono::milliseconds dura(150);
         //std::this_thread::sleep_for(dura);
         //a.processEvents();
     }