This commit is contained in:
Love 2024-09-06 16:22:59 +02:00
parent df936f747d
commit a7dee833f3

View File

@ -18,7 +18,7 @@
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
QApplication a(argc, argv); QApplication a(argc, argv);
string filename = "tsp10.txt"; string filename = "tsp1000.txt";
#ifdef __APPLE__ #ifdef __APPLE__
// On macOS the resources are copeied to build/<release-target>/ // On macOS the resources are copeied to build/<release-target>/
// whilst, the running binary is under build/<release-target>/TSP.app/Contents/MacOS/ // whilst, the running binary is under build/<release-target>/TSP.app/Contents/MacOS/
@ -46,22 +46,25 @@ int main(int argc, char *argv[]) {
Tour tour; Tour tour;
double x; double x;
double y; double y;
auto timeStart = std::chrono::high_resolution_clock::now();
while (input >> x >> y) { while (input >> x >> y) {
Point p(x, y); Point p(x, y);
tour.insertNearest(p); tour.insertNearest(p);
//uncomment the 4 lines below to animate //uncomment the 4 lines below to animate
tour.draw(scene); //tour.draw(scene);
std::chrono::milliseconds dura(50); //std::chrono::milliseconds dura(50);
std::this_thread::sleep_for(dura); //std::this_thread::sleep_for(dura);
a.processEvents(); //a.processEvents();
} }
input.close(); input.close();
auto took = std::chrono::high_resolution_clock::now() - timeStart;
// print tour to standard output // print tour to standard output
cout << "Tour distance: " << std::fixed << std::setprecision(4) cout << "Tour distance: " << std::fixed << std::setprecision(4)
<< std::showpoint << tour.distance() << endl; << std::showpoint << tour.distance() << endl;
cout << "Number of points: " << tour.size() << endl; cout << "Number of points: " << tour.size() << endl;
tour.show(); tour.show();
cout << "Calculation took: " << took.count()*1E-6 << "ms" << endl;
// draw tour // draw tour
tour.draw(scene); tour.draw(scene);