wuhanstudio
/
com2014-template
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[simple] --> [easy]

This commit is contained in:
Wu Han 2021-01-18 23:43:05 +00:00
parent c15357f153
commit 64f2700499
12 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Workshop - 1 (Random, BFS, DFS, DP).ipynb
View File

@ -69,7 +69,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"There are problems at different levels. **3 simple, 2 medium, 1 difficult**." "There are problems at different levels. **3 easy, 2 medium, 1 difficult**."
] ]
}, },
{ {
@ -92,7 +92,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"ulysses16 = np.array(load_data(\"./template/data/simple/ulysses16.tsp\"))" "ulysses16 = np.array(load_data(\"./template/data/easy/ulysses16.tsp\"))"
] ]
}, },
{ {
@ -313,7 +313,7 @@
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -399,7 +399,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -492,7 +492,7 @@
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -604,7 +604,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -709,7 +709,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -782,7 +782,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_problem = './template/data/simple/ulysses16.tsp'" "tsp_problem = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -954,7 +954,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"# Simple\n", "# Easy\n",
"# ulysses16: 77 (BFS), 84 (DFS)\n", "# ulysses16: 77 (BFS), 84 (DFS)\n",
"# att48: 39236 (BFS), 40763 (DFS)\n", "# att48: 39236 (BFS), 40763 (DFS)\n",
"# st70: 761 (BFS), 901 (DFS)\n", "# st70: 761 (BFS), 901 (DFS)\n",

16
Workshop - 2 (UCS, A, Hill-Climbing).ipynb
View File

@ -69,7 +69,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"There are problems at different levels. **3 simple, 2 medium, 1 difficult**." "There are problems at different levels. **3 easy, 2 medium, 1 difficult**."
] ]
}, },
{ {
@ -92,7 +92,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"ulysses16 = np.array(load_data(\"./template/data/simple/ulysses16.tsp\"))" "ulysses16 = np.array(load_data(\"./template/data/easy/ulysses16.tsp\"))"
] ]
}, },
{ {
@ -315,7 +315,7 @@
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -430,7 +430,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -548,7 +548,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -674,7 +674,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -747,7 +747,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_problem = './template/data/simple/ulysses16.tsp'" "tsp_problem = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -892,7 +892,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"# Simple\n", "# Easy\n",
"# ulysses16: 77.12 (UCS-BFS), 77.02 (A-Star)\n", "# ulysses16: 77.12 (UCS-BFS), 77.02 (A-Star)\n",
"# att48: 39236 (UCS-BFS), 47853 (A-Star)\n", "# att48: 39236 (UCS-BFS), 47853 (A-Star)\n",
"# st70: 761 (UCS-BFS), time-out (A-Star)\n", "# st70: 761 (UCS-BFS), time-out (A-Star)\n",

10
Workshop - 4 (TSP SA).ipynb
View File

@ -69,7 +69,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"There are problems at different levels. **3 simple, 2 medium, 1 difficult**." "There are problems at different levels. **3 easy, 2 medium, 1 difficult**."
] ]
}, },
{ {
@ -92,7 +92,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"ulysses16 = np.array(load_data(\"./template/data/simple/ulysses16.tsp\"))" "ulysses16 = np.array(load_data(\"./template/data/easy/ulysses16.tsp\"))"
] ]
}, },
{ {
@ -309,7 +309,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -444,7 +444,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -521,7 +521,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {

10
Workshop - 5 (ACO, PSO).ipynb
View File

@ -69,7 +69,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"There are problems at different levels. **3 simple, 2 medium, 1 difficult**." "There are problems at different levels. **3 easy, 2 medium, 1 difficult**."
] ]
}, },
{ {
@ -92,7 +92,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"ulysses16 = np.array(load_data(\"./template/data/simple/ulysses16.tsp\"))" "ulysses16 = np.array(load_data(\"./template/data/easy/ulysses16.tsp\"))"
] ]
}, },
{ {
@ -311,7 +311,7 @@
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -498,7 +498,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -564,7 +564,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_problem = './template/data/simple/ulysses16.tsp'" "tsp_problem = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {

10
Workshop - 6 (GA, SOM).ipynb
View File

@ -69,7 +69,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"metadata": {}, "metadata": {},
"source": [ "source": [
"There are problems at different levels. **3 simple, 2 medium, 1 difficult**." "There are problems at different levels. **3 easy, 2 medium, 1 difficult**."
] ]
}, },
{ {
@ -92,7 +92,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"ulysses16 = np.array(load_data(\"./template/data/simple/ulysses16.tsp\"))" "ulysses16 = np.array(load_data(\"./template/data/easy/ulysses16.tsp\"))"
] ]
}, },
{ {
@ -309,7 +309,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_file = './template/data/simple/ulysses16.tsp'" "tsp_file = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {
@ -524,7 +524,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_problem = \"./template/data/simple/ulysses16.tsp\"" "tsp_problem = \"./template/data/easy/ulysses16.tsp\""
] ]
}, },
{ {
@ -621,7 +621,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"tsp_problem = './template/data/simple/ulysses16.tsp'" "tsp_problem = './template/data/easy/ulysses16.tsp'"
] ]
}, },
{ {

0
template/data/simple/att48.tsp → template/data/easy/att48.tsp
View File

0
template/data/simple/st70.tsp → template/data/easy/st70.tsp
View File

0
template/data/simple/ulysses16.tsp → template/data/easy/ulysses16.tsp
View File

10
template/main.py
View File

@ -9,18 +9,18 @@ if __name__ == "__main__":
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('-s', '--simple', action='store_true', help='Benchmark all simple level TSP') parser.add_argument('-e', '--easy', action='store_true', help='Benchmark all easy level TSP')
parser.add_argument('-m', '--medium', action='store_true', help='Benchmark all medium level TSP') parser.add_argument('-m', '--medium', action='store_true', help='Benchmark all medium level TSP')
parser.add_argument('-d', '--difficult', action='store_true', help='Benchmark all difficult level TSP') parser.add_argument('-d', '--difficult', action='store_true', help='Benchmark all difficult level TSP')
args = parser.parse_args() args = parser.parse_args()
if (args.simple): if (args.easy):
TSP_Bench_PATH("./data/simple/", MyModel, timeout=60) TSP_Bench_PATH("./data/easy/", MyModel, timeout=60)
if (args.medium): if (args.medium):
TSP_Bench_PATH("./data/medium/", MyModel, timeout=180) TSP_Bench_PATH("./data/medium/", MyModel, timeout=180)
if (args.difficult): if (args.difficult):
TSP_Bench_PATH("data/difficult/", MyModel, timeout=300) TSP_Bench_PATH("./data/difficult/", MyModel, timeout=300)
if( (not args.simple) and (not args.medium) and (not args.difficult) ): if( (not args.easy) and (not args.medium) and (not args.difficult) ):
TSP_Bench_ALL('./', MyModel) TSP_Bench_ALL('./', MyModel)

3
template/model/my_model.py
View File

@ -1,5 +1,6 @@
import math import math
import random import numpy as np
from model.base_model import Model from model.base_model import Model
class MyModel(Model): class MyModel(Model):

10
template/tsp.py
View File

@ -51,7 +51,7 @@ def TSP(tsp_file, model, timeout=60):
with open('output/' + os.path.splitext(os.path.basename(tsp_file))[0] + '.txt', "w") as outfile: with open('output/' + os.path.splitext(os.path.basename(tsp_file))[0] + '.txt', "w") as outfile:
outfile.write("-3") outfile.write("-3")
elif (len(best_solution) == 0): elif (len(best_solution) == 0):
print(exec) print(exc)
log("No Answer -1") log("No Answer -1")
with open('output/' + os.path.splitext(os.path.basename(tsp_file))[0] + '.txt', "w") as outfile: with open('output/' + os.path.splitext(os.path.basename(tsp_file))[0] + '.txt', "w") as outfile:
outfile.write("-1") outfile.write("-1")
@ -145,19 +145,19 @@ def TSP_Bench_ALL(root, model):
fitness_lists_all = [] fitness_lists_all = []
times_all = [] times_all = []
best_solutions_simple, fitness_lists_simple, times_simple = TSP_Bench_PATH(os.path.join(root, "data/simple/"), model, timeout=60) best_solutions_easy, fitness_lists_easy, times_easy = TSP_Bench_PATH(os.path.join(root, "data/easy/"), model, timeout=60)
best_solutions_medium, fitness_lists_medium, times_medium = TSP_Bench_PATH(os.path.join(root, "data/medium/"), model, timeout=180) best_solutions_medium, fitness_lists_medium, times_medium = TSP_Bench_PATH(os.path.join(root, "data/medium/"), model, timeout=180)
best_solutions_difficult, fitness_lists_difficult, times_difficult = TSP_Bench_PATH(os.path.join(root, "data/difficult/"), model, timeout=300) best_solutions_difficult, fitness_lists_difficult, times_difficult = TSP_Bench_PATH(os.path.join(root, "data/difficult/"), model, timeout=300)
best_solutions_all.append(best_solutions_simple) best_solutions_all.append(best_solutions_easy)
best_solutions_all.append(best_solutions_medium) best_solutions_all.append(best_solutions_medium)
best_solutions_all.append(best_solutions_difficult) best_solutions_all.append(best_solutions_difficult)
fitness_lists_all.append(fitness_lists_simple) fitness_lists_all.append(fitness_lists_easy)
fitness_lists_all.append(fitness_lists_medium) fitness_lists_all.append(fitness_lists_medium)
fitness_lists_all.append(fitness_lists_difficult) fitness_lists_all.append(fitness_lists_difficult)
times_all.append(times_simple) times_all.append(times_easy)
times_all.append(times_medium) times_all.append(times_medium)
times_all.append(times_difficult) times_all.append(times_difficult)

BIN
template/tsp.pyc Normal file
View File

Binary file not shown.