Index: trunk/src/plugins/rt_topo/crbs.h =================================================================== --- trunk/src/plugins/rt_topo/crbs.h (revision 1486) +++ trunk/src/plugins/rt_topo/crbs.h (revision 1487) @@ -54,7 +54,6 @@ htad_t addrs; unsigned disable_vconcave:1; /* when set to 1, so not do the virtual-concave optimization */ - unsigned enable_mid_virt:1; /* when set to 1, insert a virtual point in between any two real points in the original cdt; this allows convex-only routing to emulate concave in corridors */ /* routing */ grbs_detached_addr_t *first; /* the address the twonet is starting from */ Index: trunk/src/plugins/rt_topo/crbs_cdt.c =================================================================== --- trunk/src/plugins/rt_topo/crbs_cdt.c (revision 1486) +++ trunk/src/plugins/rt_topo/crbs_cdt.c (revision 1487) @@ -146,47 +146,6 @@ ; } } - - if (crbs->enable_mid_virt) { - vtd0_t np = {0}; - double minlen2, minlen = (rt_topo_cfg.wire_thick + rt_topo_cfg.wire_clr/2) * 16; /* minimum length of an edge to split */ - - minlen2 = minlen * minlen; - - for(n = 0; n < cdt->edges.used; n++) { - edge_t *e = cdt->edges.array[n]; - double dx, dy, len2; - - if (e->is_constrained) - continue; - - dx = e->endp[0]->pos.x - e->endp[1]->pos.x; - dy = e->endp[0]->pos.y - e->endp[1]->pos.y; - len2 = dx*dx + dy*dy; - if (len2 > minlen2) { - long i; - int bad = 0; - double x = (e->endp[0]->pos.x + e->endp[1]->pos.x)/2, y = (e->endp[0]->pos.y + e->endp[1]->pos.y)/2; - - /* avoid multiple splits too close */ - for(i = 0; i < np.used; i++) { - if ((fabs(x - np.array[i]) < minlen) && (fabs(y - np.array[i+1]) < minlen)) { - bad = 1; - break; - } - } - if (!bad) { - vtd0_append(&np, x); - vtd0_append(&np, y); - } - } - } -#warning TODO: this should be 0,0 for copper and clearance once grbs supports convex implicit attachments - for(n = 0; n < np.used; n+=2) - crbs_make_point(crbs, np.array[n], np.array[n+1], rt_topo_cfg.wire_thick/2, rt_topo_cfg.wire_clr, NULL, NULL); - vtd0_uninit(&np); - } - } void rt_topo_crbs_cdt_create_edges(rtrnd_t *ctx, rtrnd_layer_t *ly, crbs_t *crbs) Index: trunk/src/plugins/rt_topo/crbs_route.c =================================================================== --- trunk/src/plugins/rt_topo/crbs_route.c (revision 1486) +++ trunk/src/plugins/rt_topo/crbs_route.c (revision 1487) @@ -723,7 +723,6 @@ memset(&crbs, 0, sizeof(crbs_t)); crbs.disable_vconcave = 0; - crbs.enable_mid_virt = rt_topo_cfg.mid_virt; crbs_init(&crbs, ctx); rt_topo_crbs_cdt_init(ctx, &crbs); Index: trunk/src/plugins/rt_topo/rt_topo.c =================================================================== --- trunk/src/plugins/rt_topo/rt_topo.c (revision 1486) +++ trunk/src/plugins/rt_topo/rt_topo.c (revision 1487) @@ -43,8 +43,7 @@ RTRND_CONF_COORD("wire_clr", 0.20, 0.01, 10, "clearance around signal wire", &rt_topo_cfg.wire_clr) RTRND_CONF_COORD("via_dia", 1.2, 0.01, 10, "via copper ring outer diameter", &rt_topo_cfg.via_dia) RTRND_CONF_COORD("via_clr", 0.20, 0.01, 10, "clearance around via copper", &rt_topo_cfg.via_clr) - RTRND_CONF_DOUBLE("beta", 50, 0, 100, "via vs. wire length preference; high value = short wires, low value = less vias", &rt_topo_cfg.beta) - RTRND_CONF_BOOLEAN("mid_virt", 0, "split long triangulation edges in half by inserting 0 sized virtual points; makes more routes possible but also makes tracks longer with unnecessary curves and detours", &rt_topo_cfg.beta) + RTRND_CONF_DOUBLE("beta", 1, 0, 100, "via vs. wire length preference; high value = short wires, low value = less vias", &rt_topo_cfg.beta) RTRND_CONF_DOUBLE("max_hop_mult", 1, 0.1, 10000, "when to give up the search for a route on a layer; higher value means give up later", &rt_topo_cfg.max_hop_mult) RTRND_CONF_DOUBLE("junction_penalty", 1, 0.25, 1000, "higher value results in less junctions (Stenier points)", &rt_topo_cfg.junction_penalty) RTRND_CONF_DOUBLE("via_via_space", 1, 0.1, 10, "higher value makes newly placed vias keep more space between each other so more wires can pass", &rt_topo_cfg.via_via_space) Index: trunk/src/plugins/rt_topo/rt_topo.h =================================================================== --- trunk/src/plugins/rt_topo/rt_topo.h (revision 1486) +++ trunk/src/plugins/rt_topo/rt_topo.h (revision 1487) @@ -18,7 +18,7 @@ typedef struct { /* configured */ double wire_thick, wire_clr, via_dia, via_clr, beta; - int octilin, algo, mid_virt; + int octilin, algo; double max_hop_mult, junction_penalty, via_via_space; /* calculated */