silence angle constraint

Author: zasexton

svv/tree/branch/bifurcation.py

@@ -1899,7 +1899,7 @@ def cost(x, func=tree_cost_2, d_min=d_min, terminal=terminal,
              terminal_flow=tree.parameters.terminal_flow, root_pressure=tree.parameters.root_pressure,
              terminal_pressure=tree.parameters.terminal_pressure, radius_exponent=tree.parameters.radius_exponent,
              length_exponent=tree.parameters.length_exponent, triad=triad, lines=lines, penalty=penalty,
-             scale=tree_scale,connectivity=tree.connectivity):
+             scale=tree_scale,connectivity=tree.connectivity, parent_vessel=parent_vessel):
         x = triad(x)
         #dists = close_exact_point(lines, x)
         dists = numpy.array([numpy.linalg.norm(lines[0, 0:3] - x),
@@ -1920,13 +1920,14 @@ def cost(x, func=tree_cost_2, d_min=d_min, terminal=terminal,
             angle_penalty = penalty
         else:
             angle_penalty = 0.0
-        if parent_vessel != numpy.nan:
+        if not isinstance(parent_vessel,type(numpy.nan)):
             parent_vessel = int(parent_vessel)
             vec4 = data[parent_vessel, 3:6] - data[parent_vessel, 0:3]
             vec4 = vec4/numpy.linalg.norm(vec4)
             angle3 = numpy.arccos(numpy.dot(vec3, vec4))*(180/numpy.pi)
             if angle3 > 90:
                 angle_penalty += penalty
+        angle_penalty = 0.0
         triad_penalty = numpy.max([0.0, -1.0 * numpy.min(dists - d_min)])/d_min * penalty
         #[TODO] angle penalty
         #[TODO] require that resulting parent vessel is at least a certain length? remove buffer region around triad