12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix use of non-standard array of non-constant length

release/4.3a0
Jose Luis Blanco-Claraco 2019-12-28 23:39:54 +01:00
parent c101e83b4b
commit 7d3b3f1172
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtsam_unstable/partition/FindSeparator-inl.h
View File

@ -12,6 +12,7 @@
#include <stdexcept> #include <stdexcept>
#include <iostream> #include <iostream>
#include <vector>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/shared_array.hpp> #include <boost/shared_array.hpp>
#include <boost/timer.hpp> #include <boost/timer.hpp>
@ -40,14 +41,14 @@ namespace gtsam { namespace partition {
const sharedInts& adjncy, const sharedInts& adjwgt, bool verbose) { const sharedInts& adjncy, const sharedInts& adjwgt, bool verbose) {
// control parameters // control parameters
idx_t vwgt[n]; // the weights of the vertices std::vector<idx_t> vwgt; // the weights of the vertices
idx_t options[METIS_NOPTIONS]; idx_t options[METIS_NOPTIONS];
METIS_SetDefaultOptions(options); // use defaults METIS_SetDefaultOptions(options); // use defaults
idx_t sepsize; // the size of the separator, output idx_t sepsize; // the size of the separator, output
sharedInts part_(new idx_t[n]); // the partition of each vertex, output sharedInts part_(new idx_t[n]); // the partition of each vertex, output
// set uniform weights on the vertices // set uniform weights on the vertices
std::fill(vwgt, vwgt+n, 1); vwgt.assign(n, 1);
// TODO: Fix at later time // TODO: Fix at later time
//boost::timer::cpu_timer TOTALTmr; //boost::timer::cpu_timer TOTALTmr;
@ -61,7 +62,7 @@ namespace gtsam { namespace partition {
// call metis parition routine // call metis parition routine
METIS_ComputeVertexSeparator(&n, xadj.get(), adjncy.get(), METIS_ComputeVertexSeparator(&n, xadj.get(), adjncy.get(),
vwgt, options, &sepsize, part_.get()); &vwgt[0], options, &sepsize, part_.get());
if (verbose) { if (verbose) {
//boost::cpu_times const elapsed_times(timer.elapsed()); //boost::cpu_times const elapsed_times(timer.elapsed());
@ -127,14 +128,14 @@ namespace gtsam { namespace partition {
const sharedInts& adjwgt, bool verbose) { const sharedInts& adjwgt, bool verbose) {
// control parameters // control parameters
idx_t vwgt[n]; // the weights of the vertices std::vector<idx_t> vwgt; // the weights of the vertices
idx_t options[METIS_NOPTIONS]; idx_t options[METIS_NOPTIONS];
METIS_SetDefaultOptions(options); // use defaults METIS_SetDefaultOptions(options); // use defaults
idx_t edgecut; // the number of edge cuts, output idx_t edgecut; // the number of edge cuts, output
sharedInts part_(new idx_t[n]); // the partition of each vertex, output sharedInts part_(new idx_t[n]); // the partition of each vertex, output
// set uniform weights on the vertices // set uniform weights on the vertices
std::fill(vwgt, vwgt+n, 1); vwgt.assign(n, 1);
//TODO: Fix later //TODO: Fix later
//boost::timer TOTALTmr; //boost::timer TOTALTmr;
@ -150,7 +151,7 @@ namespace gtsam { namespace partition {
//int wgtflag = 1; // only edge weights //int wgtflag = 1; // only edge weights
//int numflag = 0; // c style numbering starting from 0 //int numflag = 0; // c style numbering starting from 0
//int nparts = 2; // partition the graph to 2 submaps //int nparts = 2; // partition the graph to 2 submaps
modefied_EdgeComputeSeparator(&n, xadj.get(), adjncy.get(), vwgt, adjwgt.get(), modefied_EdgeComputeSeparator(&n, xadj.get(), adjncy.get(), &vwgt[0], adjwgt.get(),
options, &edgecut, part_.get()); options, &edgecut, part_.get());