fix online judge

Author: leezekee

utils/ga_calc.py

@@ -63,6 +63,22 @@ def crossover_and_mutation(F, NP, N, D):
 	return F
 
 
+def online_judge(f, T, NP):
+	# prin t(f)
+	v = 0
+	for i in range(0, T):
+		for j in range(0, NP):
+			v += f[i][j]
+	return v / (T * NP)
+
+
+def offline_judge(f_, T):
+	v = 0
+	for i in range(0, T):
+		v += f_[i]
+	return v / T
+
+
 class GAThread(QThread):
 	"""线程函数"""
 
@@ -95,6 +111,7 @@ def genetic_algorithm(self, C, NP=200, G=200):
 		f = np.array([np.random.permutation(N) for _ in range(NP)])
 		R = None
 		Rlength = []
+		f_list = []
 
 		for gen in range(G):
 			# 计算路径长度
@@ -119,15 +136,20 @@ def genetic_algorithm(self, C, NP=200, G=200):
 			f = F.copy()
 			f[0] = R
 			Rlength.append(minlen)
+			f_list.append(fitness)
 
-			v_on = self.online_judge(fitness, gen + 1)
-			v_off = self.offline_judge(Rlength, gen + 1)
+			v_on = online_judge(f_list, gen + 1, NP)
+			# print(v_on)
+			v_off = offline_judge(Rlength, gen + 1)
 			self.onEpochChanged.emit([minlen, v_on, v_off])
 			path = []
 			for r_ in R:
 				path.append([self.graph.nodes[r_]["x"], self.graph.nodes[r_]["y"]])
 			self.onPathChanged.emit(path, minlen.round(2))
 
+			# 休眠10ms
+			self.msleep(10)
+
 		return R, Rlength[-1].round(2)
 
 	def run(self):
@@ -142,15 +164,3 @@ def stop(self):
 
 	def set_G(self, G):
 		self.G = G
-
-	def online_judge(self, f, T):
-		v = 0
-		for i in range(0, T - 1):
-			v += f[i]
-		return v / T
-
-	def offline_judge(self, f_, T):
-		v = 0
-		for i in range(0, T - 1):
-			v += f_[i]
-		return v / T

utils/test-tsp.py

@@ -61,8 +61,8 @@ def init_ui(self):
 		self.saveButton.clicked.connect(self.graphView.save)
 		self.loadButton.clicked.connect(self.graphView.load)
 
-		self.graphToolLayout.addWidget(self.saveButton)
 		self.graphToolLayout.addWidget(self.loadButton)
+		self.graphToolLayout.addWidget(self.saveButton)
 
 		self.mainLayout.addLayout(self.titleLayout, 0)
 		self.mainLayout.addLayout(self.toolBoxLayout, 0)

view/graphWidget.py

@@ -66,10 +66,9 @@ def init_ui(self):
 		self.setObjectName(self.text.replace(' ', '-'))
 
 	def handle_data_change(self, best_distance):
-		print(best_distance)
 		self.distance = best_distance
 		# self.path = best_path
-		self.distanceLabel.setText(f"Distance: {abs(self.distance)}")
+		self.distanceLabel.setText(f"Distance: {self.distance}")
 
 	def sync_data(self, path, distance):
 		self.path_list.append(path)