diff --git a/decision_tree/tree_as_txt.txt b/decision_tree/tree_as_txt.txt index 0bc5127..c90e57a 100644 --- a/decision_tree/tree_as_txt.txt +++ b/decision_tree/tree_as_txt.txt @@ -16,22 +16,22 @@ | | | | | |--- feature_1 <= 2.50 | | | | | | |--- feature_0 <= 2.50 | | | | | | | |--- feature_1 <= 1.50 -| | | | | | | | |--- feature_2 <= 2.50 +| | | | | | | | |--- feature_4 <= 2.50 | | | | | | | | | |--- class: 1 -| | | | | | | | |--- feature_2 > 2.50 -| | | | | | | | | |--- feature_4 <= 2.00 +| | | | | | | | |--- feature_4 > 2.50 +| | | | | | | | | |--- feature_2 <= 2.00 | | | | | | | | | | |--- class: 1 -| | | | | | | | | |--- feature_4 > 2.00 +| | | | | | | | | |--- feature_2 > 2.00 | | | | | | | | | | |--- class: 0 | | | | | | | |--- feature_1 > 1.50 | | | | | | | | |--- class: 0 | | | | | | |--- feature_0 > 2.50 -| | | | | | | |--- feature_4 <= 2.50 +| | | | | | | |--- feature_2 <= 2.50 | | | | | | | | |--- class: 1 -| | | | | | | |--- feature_4 > 2.50 -| | | | | | | | |--- feature_2 <= 2.50 +| | | | | | | |--- feature_2 > 2.50 +| | | | | | | | |--- feature_4 <= 2.50 | | | | | | | | | |--- class: 1 -| | | | | | | | |--- feature_2 > 2.50 +| | | | | | | | |--- feature_4 > 2.50 | | | | | | | | | |--- class: 0 | | | | | |--- feature_1 > 2.50 | | | | | | |--- feature_1 <= 3.50 @@ -73,19 +73,19 @@ | | |--- feature_2 > 1.50 | | | |--- class: 0 |--- feature_2 > 3.50 -| |--- feature_4 <= 1.50 -| | |--- feature_1 <= 1.50 +| |--- feature_1 <= 1.50 +| | |--- feature_4 <= 1.50 | | | |--- feature_2 <= 4.50 -| | | | |--- feature_0 <= 1.50 -| | | | | |--- class: 0 -| | | | |--- feature_0 > 1.50 -| | | | | |--- feature_3 <= 4.50 -| | | | | | |--- class: 1 -| | | | | |--- feature_3 > 4.50 +| | | | |--- feature_3 <= 4.50 +| | | | | |--- feature_0 <= 1.50 | | | | | | |--- class: 0 +| | | | | |--- feature_0 > 1.50 +| | | | | | |--- class: 1 +| | | | |--- feature_3 > 4.50 +| | | | | |--- class: 0 | | | |--- feature_2 > 4.50 | | | | |--- class: 0 -| | |--- feature_1 > 1.50 +| | |--- feature_4 > 1.50 | | | |--- class: 0 -| |--- feature_4 > 1.50 +| |--- feature_1 > 1.50 | | |--- class: 0 diff --git a/decision_tree/tree_model b/decision_tree/tree_model index 6097820..ff87493 100644 Binary files a/decision_tree/tree_model and b/decision_tree/tree_model differ diff --git a/last_map.nparr b/last_map.nparr index c7831e4..dab7671 100644 Binary files a/last_map.nparr and b/last_map.nparr differ diff --git a/main.py b/main.py index b196ec0..4c37699 100644 --- a/main.py +++ b/main.py @@ -113,6 +113,7 @@ class Game(): # print('----') # print(i) # print('----') + self.draw() def decsion_tree_move(self): for i in range(0,len(self.positive_decision)): @@ -169,7 +170,7 @@ class Game(): # dist = a_star.get_cost - self.tsp_list = TSP.geneticAlgorithmPlot(population=city_list, popSize=100, eliteSize=20, mutationRate=0.01, generations=200) + self.tsp_list = TSP.geneticAlgorithmPlot(population=city_list, popSize=100, eliteSize=20, mutationRate=0.01, generations=300) print(self.tsp_list) def load_data(self): diff --git a/settings.py b/settings.py index cfa31a3..72c250a 100644 --- a/settings.py +++ b/settings.py @@ -7,7 +7,7 @@ RED = (255, 0, 0) #game settings -WIDTH = 1024+200 +WIDTH = 1024 HEIGHT = 768 FPS = 60