formatting headers and removing debugging code

release/4.3a0
akrishnan86 2020-07-08 23:52:36 -07:00
parent b4e58795b7
commit 90e7fb8229
2 changed files with 3 additions and 17 deletions

View File

@ -6,9 +6,8 @@
All rights reserved. All rights reserved.
*/ */
#include "mfas.h" #include <gtsam/sfm/mfas.h>
#include <iostream>
#include <map> #include <map>
#include <set> #include <set>
#include <vector> #include <vector>
@ -54,16 +53,6 @@ void mfasRatio(const std::vector<KeyPair> &edges,
onbrs[i].push_back(pair<int, double>(j, w)); onbrs[i].push_back(pair<int, double>(j, w));
} }
for (auto &node : nodes) {
std::cout << node << " " << win_deg[node] << " " << wout_deg[node]
<< std::endl;
for (auto it = inbrs[node].begin(); it != inbrs[node].end(); it++)
std::cout << it->first << "," << it->second << " ";
std::cout << std::endl;
for (auto it = onbrs[node].begin(); it != onbrs[node].end(); it++)
std::cout << it->first << "," << it->second << " ";
std::cout << std::endl;
}
unsigned int ordered_count = 0; unsigned int ordered_count = 0;
while (ordered_count < nodes.size()) { while (ordered_count < nodes.size()) {
// choose an unchosen node // choose an unchosen node
@ -84,7 +73,6 @@ void mfasRatio(const std::vector<KeyPair> &edges,
} }
} }
} }
std::cout << "choice is " << choice << std::endl;
// find its inbrs, adjust their wout_deg // find its inbrs, adjust their wout_deg
for (auto it = inbrs[choice].begin(); it != inbrs[choice].end(); ++it) for (auto it = inbrs[choice].begin(); it != inbrs[choice].end(); ++it)
wout_deg[it->first] -= it->second; wout_deg[it->first] -= it->second;

View File

@ -1,9 +1,7 @@
#include <gtsam/sfm/mfas.h>
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <iostream>
#include "gtsam/sfm/mfas.h"
using namespace std; using namespace std;
using namespace gtsam; using namespace gtsam;