update

geom_solver.py

@@ -16,7 +16,9 @@ def my_empty_solution():
 class GeomSolver(object):
 
 	def __init__(self):
-		self.min_vertices = 18
+		self.min_vertices = 12
+		self.mean_vertices = 18 
+		self.max_vertices = 25
 		self.kmeans_th = 130
 		self.point_dist_th = 60
 		self.th_min_support = 3
@@ -140,24 +142,29 @@ class GeomSolver(object):
 
 		self.vertices = centers
 		nvert = centers.shape[0]
+		# desired_vertices = (self.xyz[:,-1] > z_th).sum() // 300
+		# if desired_vertices < self.min_vertices:
+		# 	desired_vertices = self.mean_vertices
+		# if desired_vertices > self.max_vertices:
+		desired_vertices = self.mean_vertices
 		if self.broken_cams.any():
 			vertices = centers
 			print("There are broken cams.")
-		elif nvert >= self.min_vertices:
+		elif nvert >= desired_vertices:
 			vertices = centers
 			print("Enough vertices.")
 		else:
 			vertices = centers
 			if self.repeat_predicted:
-				while vertices.shape[0] < self.min_vertices:
-					vertices = np.concatenate((vertices, centers))
-				vertices = vertices[:self.min_vertices]
+				while vertices.shape[0] < desired_vertices:
+					vertices = np.concatenate((vertices, centers[~self.is_apex]))
+				vertices = vertices[:desired_vertices]
 			else:
 				if self.mean_fixed:
-					added_one = (self.min_vertices * self.wf_center - self.vertices.sum(0)) / (self.min_vertices - nvert)
+					added_one = (desired_vertices * self.wf_center - self.vertices.sum(0)) / (desired_vertices - nvert)
 				else:
 					added_one = self.wf_center
-				added = added_one[None].repeat(self.min_vertices - nvert,0)
+				added = added_one[None].repeat(desired_vertices - nvert,0)
 				vertices = np.concatenate((self.vertices, added))
 		self.vertices_aug = vertices