From 64f2700499d14e822bd5641b1a673ba10654b16c Mon Sep 17 00:00:00 2001
From: Wu Han <wuhanstudio@qq.com>
Date: Mon, 18 Jan 2021 23:43:05 +0000
Subject: [PATCH] [simple] --> [easy]

---
 Workshop - 1 (Random, BFS, DFS, DP).ipynb    |  18 +++++++++---------
 Workshop - 2 (UCS, A, Hill-Climbing).ipynb   |  16 ++++++++--------
 Workshop - 4 (TSP SA).ipynb                  |  10 +++++-----
 Workshop - 5 (ACO, PSO).ipynb                |  10 +++++-----
 Workshop - 6 (GA, SOM).ipynb                 |  10 +++++-----
 template/data/{simple => easy}/att48.tsp     |   0
 template/data/{simple => easy}/st70.tsp      |   0
 template/data/{simple => easy}/ulysses16.tsp |   0
 template/main.py                             |  10 +++++-----
 template/model/my_model.py                   |   3 ++-
 template/tsp.py                              |  10 +++++-----
 template/tsp.pyc                             | Bin 0 -> 5421 bytes
 12 files changed, 44 insertions(+), 43 deletions(-)
 rename template/data/{simple => easy}/att48.tsp (100%)
 rename template/data/{simple => easy}/st70.tsp (100%)
 rename template/data/{simple => easy}/ulysses16.tsp (100%)
 create mode 100644 template/tsp.pyc

diff --git a/Workshop - 1 (Random, BFS, DFS, DP).ipynb b/Workshop - 1 (Random, BFS, DFS, DP).ipynb
index 4faa6ee..650c534 100644
--- a/Workshop - 1 (Random, BFS, DFS, DP).ipynb	
+++ b/Workshop - 1 (Random, BFS, DFS, DP).ipynb	
@@ -69,7 +69,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "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": {},
    "outputs": [],
    "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": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -399,7 +399,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -492,7 +492,7 @@
    },
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -604,7 +604,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -709,7 +709,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -782,7 +782,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_problem = './template/data/simple/ulysses16.tsp'"
+    "tsp_problem = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -954,7 +954,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Simple\n",
+    "# Easy\n",
     "# ulysses16:   77 (BFS),     84 (DFS)\n",
     "# att48:    39236 (BFS),  40763 (DFS)\n",
     "# st70:       761 (BFS),    901 (DFS)\n",
diff --git a/Workshop - 2 (UCS, A, Hill-Climbing).ipynb b/Workshop - 2 (UCS, A, Hill-Climbing).ipynb
index cf10744..06d9682 100644
--- a/Workshop - 2 (UCS, A, Hill-Climbing).ipynb	
+++ b/Workshop - 2 (UCS, A, Hill-Climbing).ipynb	
@@ -69,7 +69,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "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": {},
    "outputs": [],
    "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": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -430,7 +430,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -548,7 +548,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -674,7 +674,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -747,7 +747,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_problem = './template/data/simple/ulysses16.tsp'"
+    "tsp_problem = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -892,7 +892,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Simple\n",
+    "# Easy\n",
     "# ulysses16:  77.12 (UCS-BFS),     77.02 (A-Star)\n",
     "# att48:      39236 (UCS-BFS),     47853 (A-Star)\n",
     "# st70:         761 (UCS-BFS),  time-out (A-Star)\n",
diff --git a/Workshop - 4 (TSP SA).ipynb b/Workshop - 4 (TSP SA).ipynb
index fc21548..2343f09 100644
--- a/Workshop - 4 (TSP SA).ipynb	
+++ b/Workshop - 4 (TSP SA).ipynb	
@@ -69,7 +69,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "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": {},
    "outputs": [],
    "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": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -444,7 +444,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -521,7 +521,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
diff --git a/Workshop - 5 (ACO, PSO).ipynb b/Workshop - 5 (ACO, PSO).ipynb
index 865c9b5..ac2c89d 100644
--- a/Workshop - 5 (ACO, PSO).ipynb	
+++ b/Workshop - 5 (ACO, PSO).ipynb	
@@ -69,7 +69,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "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": {},
    "outputs": [],
    "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": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -498,7 +498,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -564,7 +564,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_problem = './template/data/simple/ulysses16.tsp'"
+    "tsp_problem = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
diff --git a/Workshop - 6 (GA, SOM).ipynb b/Workshop - 6 (GA, SOM).ipynb
index d5dca89..ebc33bb 100644
--- a/Workshop - 6 (GA, SOM).ipynb	
+++ b/Workshop - 6 (GA, SOM).ipynb	
@@ -69,7 +69,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "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": {},
    "outputs": [],
    "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": {},
    "outputs": [],
    "source": [
-    "tsp_file = './template/data/simple/ulysses16.tsp'"
+    "tsp_file = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
@@ -524,7 +524,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_problem = \"./template/data/simple/ulysses16.tsp\""
+    "tsp_problem = \"./template/data/easy/ulysses16.tsp\""
    ]
   },
   {
@@ -621,7 +621,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tsp_problem = './template/data/simple/ulysses16.tsp'"
+    "tsp_problem = './template/data/easy/ulysses16.tsp'"
    ]
   },
   {
diff --git a/template/data/simple/att48.tsp b/template/data/easy/att48.tsp
similarity index 100%
rename from template/data/simple/att48.tsp
rename to template/data/easy/att48.tsp
diff --git a/template/data/simple/st70.tsp b/template/data/easy/st70.tsp
similarity index 100%
rename from template/data/simple/st70.tsp
rename to template/data/easy/st70.tsp
diff --git a/template/data/simple/ulysses16.tsp b/template/data/easy/ulysses16.tsp
similarity index 100%
rename from template/data/simple/ulysses16.tsp
rename to template/data/easy/ulysses16.tsp
diff --git a/template/main.py b/template/main.py
index 32851b7..22acfdb 100644
--- a/template/main.py
+++ b/template/main.py
@@ -9,18 +9,18 @@ if __name__ == "__main__":
 
     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('-d', '--difficult', action='store_true', help='Benchmark all difficult level TSP')
 
     args = parser.parse_args()
 
-    if (args.simple):
-        TSP_Bench_PATH("./data/simple/", MyModel, timeout=60)
+    if (args.easy):
+        TSP_Bench_PATH("./data/easy/", MyModel, timeout=60)
     if (args.medium):
     	TSP_Bench_PATH("./data/medium/", MyModel, timeout=180)
     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)
diff --git a/template/model/my_model.py b/template/model/my_model.py
index a0fcc62..301adec 100644
--- a/template/model/my_model.py
+++ b/template/model/my_model.py
@@ -1,5 +1,6 @@
 import math
-import random
+import numpy as np
+
 from model.base_model import Model
 
 class MyModel(Model):
diff --git a/template/tsp.py b/template/tsp.py
index 2fbade1..1dd746c 100644
--- a/template/tsp.py
+++ b/template/tsp.py
@@ -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:
                 outfile.write("-3")
         elif (len(best_solution) == 0):
-            print(exec)
+            print(exc)
             log("No Answer -1")
             with open('output/' + os.path.splitext(os.path.basename(tsp_file))[0] + '.txt', "w") as outfile:
                 outfile.write("-1")
@@ -145,19 +145,19 @@ def TSP_Bench_ALL(root, model):
     fitness_lists_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_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_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_difficult)
 
-    times_all.append(times_simple)
+    times_all.append(times_easy)
     times_all.append(times_medium)
     times_all.append(times_difficult)
 
diff --git a/template/tsp.pyc b/template/tsp.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3bfd49187478b1f809c0722ecd81b8c4cccb68c9
GIT binary patch
literal 5421
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

literal 0
HcmV?d00001