]> granicus.if.org Git - graphviz/commitdiff
use range-based for loops to abbreviate some code in constraintGraphIsCyclic
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sat, 8 May 2021 03:27:05 +0000 (20:27 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Fri, 14 May 2021 15:26:49 +0000 (08:26 -0700)
lib/vpsc/solve_VPSC.cpp

index 420f5b37ffd8fb83715a1b27c8617463707fa001..f683de8e0ccc864aeea29340288ed2257a8b4405 100644 (file)
@@ -313,13 +313,13 @@ bool VPSC::constraintGraphIsCyclic(const unsigned n, Variable *vs[]) {
                varmap[vs[i]]=u;
        }
        for(unsigned i=0;i<n;i++) {
-               for(vector<Constraint*>::iterator c=vs[i]->in.begin();c!=vs[i]->in.end();c++) {
-                       Variable *l=(*c)->left;
+               for(Constraint *c : vs[i]->in) {
+                       Variable *l=c->left;
                        varmap[vs[i]]->in.insert(varmap[l]);
                }
 
-               for(vector<Constraint*>::iterator c=vs[i]->out.begin();c!=vs[i]->out.end();c++) {
-                       Variable *r=(*c)->right;
+               for(Constraint *c : vs[i]->out) {
+                       Variable *r=c->right;
                        varmap[vs[i]]->out.insert(varmap[r]);
                }
        }
@@ -337,8 +337,7 @@ bool VPSC::constraintGraphIsCyclic(const unsigned n, Variable *vs[]) {
                        return true;
                } else {
                        graph.erase(i);
-                       for(set<node*>::iterator j=u->out.begin();j!=u->out.end();j++) {
-                               node *v=*j;
+                       for(node *v : u->out) {
                                v->in.erase(u);
                        }
                        delete u;