From 873a9f9bedbbfb07d475e271923a7b86464e515f Mon Sep 17 00:00:00 2001 From: pants Date: Wed, 7 Sep 2016 14:55:30 -0400 Subject: more major refactoring --- src/break_edge.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/break_edge.c') diff --git a/src/break_edge.c b/src/break_edge.c index 7b94160..4e1559b 100644 --- a/src/break_edge.c +++ b/src/break_edge.c @@ -3,7 +3,6 @@ bool break_edge(net_t *instance, unsigned int edge, cholmod_common *c) { instance->fuses[edge] = true; - instance->num_remaining_edges--; unsigned int v1 = instance->graph->ev_break[2 * edge]; unsigned int v2 = instance->graph->ev_break[2 * edge + 1]; @@ -56,10 +55,10 @@ bool break_edge(net_t *instance, unsigned int edge, cholmod_common *c) { double v1x, v1y, v2x, v2y; v1 = instance->graph->dev[2 * ee + !side]; v2 = instance->graph->dev[2 * ee + side]; - v1x = instance->graph->dual_vert_coords[2 * v1]; - v1y = instance->graph->dual_vert_coords[2 * v1 + 1]; - v2x = instance->graph->dual_vert_coords[2 * v2]; - v2y = instance->graph->dual_vert_coords[2 * v2 + 1]; + v1x = instance->graph->dvx[2 * v1]; + v1y = instance->graph->dvx[2 * v1 + 1]; + v2x = instance->graph->dvx[2 * v2]; + v2y = instance->graph->dvx[2 * v2 + 1]; double dx = v1x - v2x; double dy = v1y - v2y; if (((v1x > 0.5 && v2x < 0.5) || (v1x < 0.5 && v2x > 0.5)) && fabs(dx) < 0.5) { -- cgit v1.2.3-70-g09d2