← Back to branch summary

~ubuntu-branches/ubuntu/utopic/inkscape/utopic-proposed

« back to all changes in this revision

Viewing changes to src/libcola/shortest_paths.cpp

  • Committer: Alex Valavanis
  • Date: 2012-02-16 09:51:14 UTC
  • mto: (63.1.1 fix-933188) (1.4.4) (2.5.4 sid)
  • mto: This revision was merged to the branch mainline in revision 64.
  • Revision ID: valavanisalex@gmail.com-20120216095114-vxo1i071bw0xxxf3
Tags: upstream-0.48.3
Import upstream version 0.48.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libcola/shortest_paths.cpp
73
73
        }
74
74
    }
75
75
}
 
76
 
76
77
void dijkstra(
77
78
        unsigned s,
78
79
        unsigned n,
80
81
        vector<Edge>& es,
81
82
        double* eweights)
82
83
{
83
 
    assert(s<n);
84
 
    Node vs[n];
85
 
    dijkstra_init(vs,es,eweights);
86
 
    dijkstra(s,n,vs,d);
 
84
    assert(s < n);
 
85
    std::vector<Node> vs(n);
 
86
    dijkstra_init(&vs[0], es, eweights);
 
87
    dijkstra(s, n, &vs[0], d);
87
88
}
 
89
 
88
90
void johnsons(
89
91
        unsigned n,
90
92
        double** D, 
91
93
        vector<Edge>& es,
92
94
        double* eweights) 
93
95
{
94
 
    Node vs[n];
95
 
    dijkstra_init(vs,es,eweights);
96
 
    for(unsigned k=0;k<n;k++) {
97
 
        dijkstra(k,n,vs,D[k]);
 
96
    std::vector<Node> vs(n);
 
97
    dijkstra_init(&vs[0], es, eweights);
 
98
    for (unsigned k = 0; k < n; k++) {
 
99
        dijkstra(k,n,&vs[0],D[k]);
98
100
    }
99
101
}
100
102
}