From 93e20565fb7e9412820c2c15250cea93ee534248 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Mon, 21 Dec 2020 16:54:54 +0100 Subject: [PATCH] Created code directory --- .gitignore | 8 ++++++-- aco.cc => code/aco.cc | 0 {aco => code/aco}/TSP_solver.py | 0 {aco => code/aco}/__init__.py | 0 {aco => code/aco}/ant_colony.py | 0 {aco => code/aco}/io_tsp.py | 0 {aco => code/aco}/utils.py | 0 {c_prob => code/c_prob}/.gitkeep | 0 opt.cc => code/opt.cc | 0 opt.h => code/opt.h | 0 {problems => code/problems}/.DS_Store | Bin {problems => code/problems}/ch130.tsp | 0 {problems => code/problems}/d198.tsp | 0 {problems => code/problems}/eil76.opt.tour | 0 {problems => code/problems}/eil76.tsp | 0 {problems => code/problems}/fl1577.tsp | 0 {problems => code/problems}/kroA100.opt.tour | 0 {problems => code/problems}/kroA100.tsp | 0 {problems => code/problems}/lin318.tsp | 0 {problems => code/problems}/pcb442.tsp | 0 {problems => code/problems}/pr439.tsp | 0 {problems => code/problems}/rat783.tsp | 0 {problems => code/problems}/u1060.tsp | 0 readme.md => code/readme.md | 0 code/results.csv | 2 ++ run.py => code/run.py | 0 code/sol/.gitkeep | 0 27 files changed, 8 insertions(+), 2 deletions(-) rename aco.cc => code/aco.cc (100%) rename {aco => code/aco}/TSP_solver.py (100%) rename {aco => code/aco}/__init__.py (100%) rename {aco => code/aco}/ant_colony.py (100%) rename {aco => code/aco}/io_tsp.py (100%) rename {aco => code/aco}/utils.py (100%) rename {c_prob => code/c_prob}/.gitkeep (100%) rename opt.cc => code/opt.cc (100%) rename opt.h => code/opt.h (100%) rename {problems => code/problems}/.DS_Store (100%) rename {problems => code/problems}/ch130.tsp (100%) rename {problems => code/problems}/d198.tsp (100%) rename {problems => code/problems}/eil76.opt.tour (100%) rename {problems => code/problems}/eil76.tsp (100%) rename {problems => code/problems}/fl1577.tsp (100%) rename {problems => code/problems}/kroA100.opt.tour (100%) rename {problems => code/problems}/kroA100.tsp (100%) rename {problems => code/problems}/lin318.tsp (100%) rename {problems => code/problems}/pcb442.tsp (100%) rename {problems => code/problems}/pr439.tsp (100%) rename {problems => code/problems}/rat783.tsp (100%) rename {problems => code/problems}/u1060.tsp (100%) rename readme.md => code/readme.md (100%) create mode 100644 code/results.csv rename run.py => code/run.py (100%) create mode 100644 code/sol/.gitkeep diff --git a/.gitignore b/.gitignore index 3a9801d..9543e25 100644 --- a/.gitignore +++ b/.gitignore @@ -163,5 +163,9 @@ dmypy.json # Cython debug symbols cython_debug/ -c_prob/* -!c_prob/.gitkeep +code/.idea/ + +code/c_prob/* +code/sol/* +!code/c_prob/.gitkeep +!code/sol/.gitkeep diff --git a/aco.cc b/code/aco.cc similarity index 100% rename from aco.cc rename to code/aco.cc diff --git a/aco/TSP_solver.py b/code/aco/TSP_solver.py similarity index 100% rename from aco/TSP_solver.py rename to code/aco/TSP_solver.py diff --git a/aco/__init__.py b/code/aco/__init__.py similarity index 100% rename from aco/__init__.py rename to code/aco/__init__.py diff --git a/aco/ant_colony.py b/code/aco/ant_colony.py similarity index 100% rename from aco/ant_colony.py rename to code/aco/ant_colony.py diff --git a/aco/io_tsp.py b/code/aco/io_tsp.py similarity index 100% rename from aco/io_tsp.py rename to code/aco/io_tsp.py diff --git a/aco/utils.py b/code/aco/utils.py similarity index 100% rename from aco/utils.py rename to code/aco/utils.py diff --git a/c_prob/.gitkeep b/code/c_prob/.gitkeep similarity index 100% rename from c_prob/.gitkeep rename to code/c_prob/.gitkeep diff --git a/opt.cc b/code/opt.cc similarity index 100% rename from opt.cc rename to code/opt.cc diff --git a/opt.h b/code/opt.h similarity index 100% rename from opt.h rename to code/opt.h diff --git a/problems/.DS_Store b/code/problems/.DS_Store similarity index 100% rename from problems/.DS_Store rename to code/problems/.DS_Store diff --git a/problems/ch130.tsp b/code/problems/ch130.tsp similarity index 100% rename from problems/ch130.tsp rename to code/problems/ch130.tsp diff --git a/problems/d198.tsp b/code/problems/d198.tsp similarity index 100% rename from problems/d198.tsp rename to code/problems/d198.tsp diff --git a/problems/eil76.opt.tour b/code/problems/eil76.opt.tour similarity index 100% rename from problems/eil76.opt.tour rename to code/problems/eil76.opt.tour diff --git a/problems/eil76.tsp b/code/problems/eil76.tsp similarity index 100% rename from problems/eil76.tsp rename to code/problems/eil76.tsp diff --git a/problems/fl1577.tsp b/code/problems/fl1577.tsp similarity index 100% rename from problems/fl1577.tsp rename to code/problems/fl1577.tsp diff --git a/problems/kroA100.opt.tour b/code/problems/kroA100.opt.tour similarity index 100% rename from problems/kroA100.opt.tour rename to code/problems/kroA100.opt.tour diff --git a/problems/kroA100.tsp b/code/problems/kroA100.tsp similarity index 100% rename from problems/kroA100.tsp rename to code/problems/kroA100.tsp diff --git a/problems/lin318.tsp b/code/problems/lin318.tsp similarity index 100% rename from problems/lin318.tsp rename to code/problems/lin318.tsp diff --git a/problems/pcb442.tsp b/code/problems/pcb442.tsp similarity index 100% rename from problems/pcb442.tsp rename to code/problems/pcb442.tsp diff --git a/problems/pr439.tsp b/code/problems/pr439.tsp similarity index 100% rename from problems/pr439.tsp rename to code/problems/pr439.tsp diff --git a/problems/rat783.tsp b/code/problems/rat783.tsp similarity index 100% rename from problems/rat783.tsp rename to code/problems/rat783.tsp diff --git a/problems/u1060.tsp b/code/problems/u1060.tsp similarity index 100% rename from problems/u1060.tsp rename to code/problems/u1060.tsp diff --git a/readme.md b/code/readme.md similarity index 100% rename from readme.md rename to code/readme.md diff --git a/code/results.csv b/code/results.csv new file mode 100644 index 0000000..614d3c6 --- /dev/null +++ b/code/results.csv @@ -0,0 +1,2 @@ +,tour length,optimal solution,gap,time to solve +"('./problems/rat783.tsp', ""'C++ ant colony optimization'"")",9218.0,8806.0,4.68,120.505 diff --git a/run.py b/code/run.py similarity index 100% rename from run.py rename to code/run.py diff --git a/code/sol/.gitkeep b/code/sol/.gitkeep new file mode 100644 index 0000000..e69de29