From ef002c8b1c2fe752c49bad21adc3218bbd8207b9 Mon Sep 17 00:00:00 2001
From: Claudio Maggioni <maggicl@usi.ch>
Date: Mon, 21 Dec 2020 17:39:05 +0100
Subject: [PATCH] prep submission

---
 AI_cup_2020_ClaudioMaggioni.xls | Bin 28160 -> 28160 bytes
 code/results.csv                |  11 ++++++++++-
 code/run.py                     |   2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/AI_cup_2020_ClaudioMaggioni.xls b/AI_cup_2020_ClaudioMaggioni.xls
index 539d2d994467fe246f1f04811bbc87dc951841c1..869e54a78d51a9e7d533b2982bcd9e3eadcf4f62 100644
GIT binary patch
delta 54
zcmZp;!`N_#aYK(QpF9H#0|NsigFFzjuuOJv58nLN^$QD!f!Vh0*RL@$Z~o}T&p+9~
JlVeeo2mrBi5V`;W

delta 54
zcmZp;!`N_#aYK(QA3p;V0|Nsi13wTlF->-G58nLN^$QCJE92Jn*RL@$Z~o}T&p+9~
JlVeeo2mqm*5E}ph

diff --git a/code/results.csv b/code/results.csv
index 614d3c6..0dcc30d 100644
--- a/code/results.csv
+++ b/code/results.csv
@@ -1,2 +1,11 @@
 ,tour length,optimal solution,gap,time to solve
-"('./problems/rat783.tsp', ""'C++ ant colony optimization'"")",9218.0,8806.0,4.68,120.505
+"('./problems/pr439.tsp', ""'C++ ant colony optimization'"")",109721.0,107217.0,2.34,67.09
+"('./problems/pcb442.tsp', ""'C++ ant colony optimization'"")",52466.0,50778.0,3.32,51.523
+"('./problems/d198.tsp', ""'C++ ant colony optimization'"")",15871.0,15780.0,0.58,33.43
+"('./problems/fl1577.tsp', ""'C++ ant colony optimization'"")",23020.0,22249.0,3.47,112.319
+"('./problems/ch130.tsp', ""'C++ ant colony optimization'"")",6212.0,6110.0,1.67,21.834
+"('./problems/u1060.tsp', ""'C++ ant colony optimization'"")",235506.0,224094.0,5.09,104.112
+"('./problems/kroA100.tsp', ""'C++ ant colony optimization'"")",21378.0,21282.0,0.45,24.245
+"('./problems/eil76.tsp', ""'C++ ant colony optimization'"")",543.0,538.0,0.93,20.232
+"('./problems/rat783.tsp', ""'C++ ant colony optimization'"")",9218.0,8806.0,4.68,124.22
+"('./problems/lin318.tsp', ""'C++ ant colony optimization'"")",43171.0,42029.0,2.72,42.92
diff --git a/code/run.py b/code/run.py
index 89b85f3..fbc8666 100644
--- a/code/run.py
+++ b/code/run.py
@@ -9,7 +9,7 @@ def run(show_plots=False, verbose=False):
     os.system("rm -f " + " ".join(glob.glob("sol/*.sol") + glob.glob("c_prob/*.txt")))
     if sys.argv[1] == "all":
         os.system("c++ -O2 -lpthread --std=c++11 -o c_prob/aco aco.cc opt.cc")
-    problems = glob.glob('./problems/*.tsp') if sys.argv[1] == "all" else [f"./problems/{sys.argv[1]}.tsp"]
+    problems = glob.glob('./problems/*.tsp') if sys.argv[1] == "all" else ["./problems/"+sys.argv[1]+".tsp"]
 
     results = []
     index = []