Merge pull request #110 from borglab/fix/subgraphbuilder

Several fixes in legacy code
borglab · Sep 8, 2019 · 675f27b · 675f27b
2 parents 5cbcfda + cb80f27
commit 675f27b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gtsam/linear/SubgraphBuilder.cpp b/gtsam/linear/SubgraphBuilder.cpp
@@ -107,7 +107,7 @@ static vector<size_t> UniqueSampler(const vector<double> &weight,
   const size_t m = weight.size();
   if (n > m) throw std::invalid_argument("UniqueSampler: invalid input size");
 
-  vector<size_t> samples;
+  vector<size_t> results;
 
   size_t count = 0;
   vector<bool> touched(m, false);
@@ -130,12 +130,12 @@ static vector<size_t> UniqueSampler(const vector<double> &weight,
     for (const size_t &index : samples) {
       if (touched[index] == false) {
         touched[index] = true;
-        samples.push_back(index);
+        results.push_back(index);
         if (++count >= n) break;
       }
     }
   }
-  return samples;
+  return results;
 }
 
 /****************************************************************************/

diff --git a/gtsam_unstable/slam/PartialPriorFactor.h b/gtsam_unstable/slam/PartialPriorFactor.h
@@ -121,7 +121,7 @@ namespace gtsam {
 
     // access
     const Vector& prior() const { return prior_; }
-    const std::vector<bool>& mask() const { return  mask_; }
+    const std::vector<size_t>& mask() const { return  mask_; }
     const Matrix& H() const { return H_; }
 
   protected: