Update geom_solver.py
Browse files- geom_solver.py +6 -5
geom_solver.py
CHANGED
|
@@ -143,10 +143,11 @@ class GeomSolver(object):
|
|
| 143 |
self.vertices = centers
|
| 144 |
nvert = centers.shape[0]
|
| 145 |
# desired_vertices = (self.xyz[:,-1] > z_th).sum() // 300
|
| 146 |
-
|
| 147 |
-
|
| 148 |
-
|
| 149 |
-
desired_vertices
|
|
|
|
| 150 |
if self.broken_cams.any():
|
| 151 |
vertices = centers
|
| 152 |
print("There are broken cams.")
|
|
@@ -157,7 +158,7 @@ class GeomSolver(object):
|
|
| 157 |
vertices = centers
|
| 158 |
if self.repeat_predicted:
|
| 159 |
while vertices.shape[0] < desired_vertices:
|
| 160 |
-
vertices = np.concatenate((vertices, centers[~self.is_apex]
|
| 161 |
vertices = vertices[:desired_vertices]
|
| 162 |
else:
|
| 163 |
if self.mean_fixed:
|
|
|
|
| 143 |
self.vertices = centers
|
| 144 |
nvert = centers.shape[0]
|
| 145 |
# desired_vertices = (self.xyz[:,-1] > z_th).sum() // 300
|
| 146 |
+
desired_vertices = 2*nvert
|
| 147 |
+
if desired_vertices < self.min_vertices:
|
| 148 |
+
desired_vertices = self.mean_vertices
|
| 149 |
+
if desired_vertices > self.max_vertices:
|
| 150 |
+
desired_vertices = self.mean_vertices
|
| 151 |
if self.broken_cams.any():
|
| 152 |
vertices = centers
|
| 153 |
print("There are broken cams.")
|
|
|
|
| 158 |
vertices = centers
|
| 159 |
if self.repeat_predicted:
|
| 160 |
while vertices.shape[0] < desired_vertices:
|
| 161 |
+
vertices = np.concatenate((vertices, centers)) # [~self.is_apex]
|
| 162 |
vertices = vertices[:desired_vertices]
|
| 163 |
else:
|
| 164 |
if self.mean_fixed:
|