diff --git a/genetic.py b/genetic.py index 23cd50b..3a4f13f 100644 --- a/genetic.py +++ b/genetic.py @@ -5,7 +5,7 @@ class genetic: def __init__(self, chrome): self.chrome = chrome self.key = 10 - self.pop_size = 50 + self.pop_size = 500 self.gen_max = 20 self.length = len(chrome) - 1 self.div = self.length // 2 diff --git a/main.py b/main.py index d0c4593..ccdcc70 100644 --- a/main.py +++ b/main.py @@ -1,8 +1,6 @@ # from collections import deque from queue import PriorityQueue -import matplotlib.pyplot as plt - from neural import * from path_algorithms.a_star import a_star # from path_algorithms.bfs import bfs @@ -57,8 +55,8 @@ for i in range(15): rubbish_list.append(Rubbish(screen, j * 60, i * 60)) path = [] -X,y = create_training_data() -model = learn_neural_network(X,y) +x, y = create_training_data() +model = learn_neural_network(x, y) gen = [(truck.y / 60, truck.x / 60)] fl = 0 @@ -128,9 +126,9 @@ while True: number = np.random.randint(2077) path_img = "images/bbb" - img = Image.open(path_img+'/'+str(number)+'.jpg') + img = Image.open(path_img + '/' + str(number) + '.jpg') img.show() - prediction = predict(model,path_img+'/'+str(number)+'.jpg') + prediction = predict(model, path_img + '/' + str(number) + '.jpg') result(prediction) data = rubbish_list[order[0]].data_for_decision_tree() print(f'----------\n' diff --git a/neural.py b/neural.py index 814d00d..3dbe6ad 100644 --- a/neural.py +++ b/neural.py @@ -1,7 +1,6 @@ import math import os import cv2 -import matplotlib.pyplot as plt import numpy as np from keras.layers import Conv2D, MaxPooling2D from keras.layers import Dense, Activation, Flatten diff --git a/trash.xlsx b/trash.xlsx index b91e5af..0771d17 100644 Binary files a/trash.xlsx and b/trash.xlsx differ