diff options
Diffstat (limited to 'lib/src/problem.cpp')
| -rw-r--r-- | lib/src/problem.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/src/problem.cpp b/lib/src/problem.cpp index ab87b0c..a029d66 100644 --- a/lib/src/problem.cpp +++ b/lib/src/problem.cpp @@ -9,8 +9,8 @@ problem::problem(const graph& G, unsigned axis, cholmod_sparse* vcmat, cholmod_c : G(G), axis(axis), voltcurmat(vcmat), c(c) { b = CHOL_F(zeros)(G.vertices.size(), 1, CHOLMOD_REAL, c); for (unsigned i = 0; i < G.edges.size(); i++) { - graph::coordinate v0 = G.vertices[G.edges[i].v[0]].r; - graph::coordinate v1 = G.vertices[G.edges[i].v[1]].r; + coordinate v0 = G.vertices[G.edges[i].v[0]].r; + coordinate v1 = G.vertices[G.edges[i].v[1]].r; if (G.edges[i].crossings[axis]) { bool ind; @@ -131,8 +131,8 @@ void problem::solve(std::vector<bool>& fuses) { } else { sol.currents[i] = ((double*)y->x)[i]; - graph::coordinate v0 = G.vertices[G.edges[i].v[0]].r; - graph::coordinate v1 = G.vertices[G.edges[i].v[1]].r; + coordinate v0 = G.vertices[G.edges[i].v[0]].r; + coordinate v1 = G.vertices[G.edges[i].v[1]].r; if (G.edges[i].crossings[axis]) { bool comp; @@ -196,8 +196,8 @@ void problem::break_edge(unsigned e, bool unbreak) { CHOL_F(free_sparse)(&perm_update_mat, c); CHOL_F(free_sparse)(&update_mat, c); - graph::coordinate r0 = G.vertices[v0].r; - graph::coordinate r1 = G.vertices[v1].r; + coordinate r0 = G.vertices[v0].r; + coordinate r1 = G.vertices[v1].r; if (G.edges[e].crossings[axis]) { bool ind; |