feat: don't updateAll nodes when removing. Only neighbours of removed

Akhil-CM · Apr 22, 2024 · 5475bb5 · 5475bb5
1 parent 102549a
commit 5475bb5
Show file tree

Hide file tree

Showing 6 changed files with 187 additions and 105 deletions.
diff --git a/DiscreteENN_TSP_table.csv b/DiscreteENN_TSP_table.csv
@@ -0,0 +1,18 @@
+name,distance,points,error,time(ms)
+pr1002,280407.968750,1002.000000,0.082468,15315.000000
+pcb442,54114.605469,442.000000,0.065710,276.000000
+a280,1844.404663,181.000000,0.284837,10.000000
+eil76,560.789551,76.000000,0.042360,0.000000
+pr76,114190.000000,76.000000,0.055760,0.000000
+kroA100,22749.457031,100.000000,0.068953,1.000000
+pr2392,411187.187500,2392.000000,0.087705,1049157.000000
+st70,735.881836,70.000000,0.090195,0.000000
+kroC100,22543.697266,100.000000,0.086496,1.000000
+kroD100,22713.125000,100.000000,0.066644,1.000000
+berlin52,8191.641602,52.000000,0.086137,0.000000
+eil101,669.608093,101.000000,0.064560,2.000000
+rd100,8263.841797,100.000000,0.044733,1.000000
+lin105,15141.876953,105.000000,0.053055,1.000000
+ch130,6425.749023,130.000000,0.051677,3.000000
+ch150,6910.962891,150.000000,0.058665,5.000000
+tsp225,2754.485596,126.000000,0.296607,3.000000
diff --git a/DiscreteENN_TSP_table.txt b/DiscreteENN_TSP_table.txt
@@ -0,0 +1,18 @@
+name distance points error time(ms)
+pr1002 280407.968750 1002.000000 0.082468 15315.000000
+pcb442 54114.605469 442.000000 0.065710 276.000000
+a280 1844.404663 181.000000 0.284837 10.000000
+eil76 560.789551 76.000000 0.042360 0.000000
+pr76 114190.000000 76.000000 0.055760 0.000000
+kroA100 22749.457031 100.000000 0.068953 1.000000
+pr2392 411187.187500 2392.000000 0.087705 1049157.000000
+st70 735.881836 70.000000 0.090195 0.000000
+kroC100 22543.697266 100.000000 0.086496 1.000000
+kroD100 22713.125000 100.000000 0.066644 1.000000
+berlin52 8191.641602 52.000000 0.086137 0.000000
+eil101 669.608093 101.000000 0.064560 2.000000
+rd100 8263.841797 100.000000 0.044733 1.000000
+lin105 15141.876953 105.000000 0.053055 1.000000
+ch130 6425.749023 130.000000 0.051677 3.000000
+ch150 6910.962891 150.000000 0.058665 5.000000
+tsp225 2754.485596 126.000000 0.296607 3.000000
diff --git a/a.out b/a.out
diff --git a/main.cpp b/main.cpp
@@ -73,41 +73,67 @@ int main(int argc, char** argv)
  utils::MatchItem<std::string>{ "--input" });
  Data_Filename = *(it + 1);
  }
+ int runs_failed;
  DistanceMap_t distance_map;
  if(single_input) {
  if (Data_Filename.empty()) {
  Data_Filename = Data_Filename_berlin;
  }
  Data_FilePath = Data_Path / stdfs::path(Data_Filename);
  DistanceMap_t::mapped_type info{};
- if (runPipelineSingle(Data_FilePath, rng, draw_path, draw_coords, info) == 0) {
+ runs_failed = runPipelineSingle(Data_FilePath, rng, draw_path, draw_coords, info);
+ if (runs_failed == 0) {
  const std::string& filename{Data_FilePath.stem().string()};
  distance_map[filename] = info;
  } else {
  utils::printErr("Single input pipeline failed for path : " + Data_FilePath.string(), "main");
- return EXIT_FAILURE;
  }
  } else {
  if (not Data_Filename.empty()) {
  Data_Path = getCleanPath(Data_Filename);
  }
- runPipelineDir(Data_Path, rng, draw_path, draw_coords, distance_map, optimal_distance_map);
+ runs_failed = runPipelineDir(Data_Path, rng, draw_path, draw_coords, distance_map, optimal_distance_map);
+ }
+ if (runs_failed != 0) {
+ utils::printErr("Runs failed " + std::to_string(runs_failed) + " Data_Path " + Data_Path.string() + " Data_FilePath " + Data_FilePath.string(), "main");
+ return EXIT_FAILURE;
  }
  for (auto it{ distance_map.begin() }; it != distance_map.end(); ++it) {
  const auto [name, info] = *it;
  if (optimal_distance_map.count(name) == 0) {
  utils::printErr("data name : " + name + " not found in optimal_distance_map", "main");
  continue;
  }
+ // if (name == "pr2392") {
+ // utils::printInfo("skipping file pr2392 because of long run time.", "runPipelineDir");
+ // continue;;
+ // }
  auto& optimal_info{ optimal_distance_map[name] };
  const auto error = std::abs(info[0] - optimal_info[0])/optimal_info[0];
  distance_map[name][2] = error;
  }
- utils::printInfo("name\tpoints\terror\ttime");
- for (auto it{ distance_map.begin() }; it != distance_map.end(); ++it) {
- const auto [name, info] = *it;
+ utils::printInfo("name\tdistance\tpoints\terror\ttime(ms)");
+ for (auto it{ optimal_distance_map.begin() }; it != optimal_distance_map.end(); ++it) {
+ const auto [name, discard] = *it;
+ const auto info{ distance_map[name] };
  utils::printInfo(name + "\t" + std::to_string(info[0]) + "\t" + std::to_string(info[1]) + "\t" + std::to_string(info[2]) + "\t" + std::to_string(info[3]));
  }
+ std::ofstream table_file{"DiscreteENN_TSP_table.txt"};
+ table_file << "name\tdistance\tpoints\terror\ttime(ms)\n";
+ for (auto it{ optimal_distance_map.begin() }; it != optimal_distance_map.end(); ++it) {
+ const auto [name, discard] = *it;
+ const auto info{ distance_map[name] };
+ table_file << (name + "\t" + std::to_string(info[0]) + "\t" + std::to_string(info[1]) + "\t" + std::to_string(info[2]) + "\t" + std::to_string(info[3])) << std::endl;
+ }
+ table_file.close();
+ std::ofstream csv_file{"DiscreteENN_TSP_table.csv"};
+ csv_file << "name,distance,points,error,time(ms)\n";
+ for (auto it{ optimal_distance_map.begin() }; it != optimal_distance_map.end(); ++it) {
+ const auto [name, discard] = *it;
+ const auto info{ distance_map[name] };
+ csv_file << (name + "," + std::to_string(info[0]) + "," + std::to_string(info[1]) + "," + std::to_string(info[2]) + "," + std::to_string(info[3])) << std::endl;
+ }
+ csv_file.close();
 
  return 0;
 }
@@ -117,7 +143,7 @@ int runPipelineDir(const stdfs::path& data_path, std::default_random_engine& rng
 
  if (not stdfs::is_directory(data_path)) {
  utils::printErr("provided path " + data_path.string() + " doesn't exit.", "runPipelineDir");
- return EXIT_FAILURE;
+ return 1;
  }
  distance_map.clear();
  int runs_failed{0};
@@ -132,6 +158,10 @@ int runPipelineDir(const stdfs::path& data_path, std::default_random_engine& rng
  utils::printInfo("skipping file " + filepath.string() + " without optimal distance for TSP.", "runPipelineDir");
  continue;;
  }
+ // if (filename == "pr2392") {
+ // utils::printInfo("skipping file pr2392 because of long run time.", "runPipelineDir");
+ // continue;;
+ // }
  DistanceMap_t::mapped_type info{};
  if (runPipelineSingle(filepath, rng, draw, show_coords, info) != 0) {
  utils::printErr("pipeline failed for the path " + filepath.string(), "runPipelineDir");
@@ -195,7 +225,7 @@ int runPipelineSingle(const stdfs::path&data_path, std::default_random_engine& r
  std::printf(
  "[Info]: Algorithm complete. Only %d number of cities provided.",
  num_cities);
- return EXIT_SUCCESS;
+ return 0;
  }
 
  // -------------------------------------------
@@ -210,7 +240,7 @@ int runPipelineSingle(const stdfs::path&data_path, std::default_random_engine& r
  NodeExp_t<bool> erased = enn_tsp.validatePath();
  if (erased.err()) {
  std::cerr << "[Error] (main): validatePath failed\n";
- return EXIT_FAILURE;
+ return 1;
  }
 
 #if (TSP_DEBUG_PRINT > 0)
@@ -220,7 +250,7 @@ int runPipelineSingle(const stdfs::path&data_path, std::default_random_engine& r
  if (err) {
  std::cerr << "[Error] (main): updateCostAll failed at index "
  << idx_fail << '\n';
- return EXIT_FAILURE;
+ return 1;
  }
  }
 
@@ -233,7 +263,7 @@ int runPipelineSingle(const stdfs::path&data_path, std::default_random_engine& r
  TimePoint_t end_time = std::chrono::steady_clock::now();
  if (not success) {
  std::cerr << "[Error] (main): Discrete ENN run failed.\n";
- return EXIT_FAILURE;
+ return 1;
  }
  auto delta = std::chrono::duration_cast<TimeUnit_t>(end_time - start_time);
  const auto duration = delta.count();
@@ -253,17 +283,17 @@ int runPipelineSingle(const stdfs::path&data_path, std::default_random_engine& r
  if (err) {
  std::cerr
  << "[Error] (main): Algoirthm has not found the optimal path\n";
- return EXIT_FAILURE;
+ return 1;
  }
  }
  NodeExp_t<bool> erased = enn_tsp.validatePath();
  if (erased.err()) {
  std::cerr << "[Error] (main): final validatePath failed\n";
- return EXIT_FAILURE;
+ return 1;
  }
  if (erased.has_value()) {
  std::cerr << "[Error] (main): final validatePath removed node(s)\n";
- return EXIT_FAILURE;
+ return 1;
  }
 
  // -------------------------------------------
@@ -287,5 +317,5 @@ int runPipelineSingle(const stdfs::path&data_path, std::default_random_engine& r
  drawPath(path, enn_tsp.stack(), show_coords);
  }
  utils::printInfo("Finished algorithm for " + data_path.string(), "runPipelineSingle");
- return EXIT_SUCCESS;
+ return 0;
 }