From 3236a83f60438894d7a1996571f947ce66150100 Mon Sep 17 00:00:00 2001
From: Alex Cunningham <alexgcunningham@gmail.com>
Date: Wed, 25 May 2011 14:35:36 +0000
Subject: [PATCH] more functionality in PartialPriorFactor

---
 gtsam/slam/PartialPriorFactor.h | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/gtsam/slam/PartialPriorFactor.h b/gtsam/slam/PartialPriorFactor.h
index d1ab0bb1d..55df8c4ca 100644
--- a/gtsam/slam/PartialPriorFactor.h
+++ b/gtsam/slam/PartialPriorFactor.h
@@ -41,11 +41,19 @@ namespace gtsam {
 		Vector prior_;            /// measurement on logmap parameters, in compressed form
 		std::vector<bool> mask_;  /// flags to mask all parameters not measured
 
-	public:
-
 		/** default constructor - only use for serialization */
 		PartialPriorFactor() {}
 
+		/**
+		 * constructor with just minimum requirements for a factor - allows more
+		 * computation in the constructor.  This should only be used by subclasses
+		 * Sets the size of the mask with all values off
+		 */
+		PartialPriorFactor(const KEY& key, const SharedGaussian& model)
+		  : Base(model, key), mask_(model->dim(), false) {}
+
+	public:
+
 		// shorthand for a smart pointer to a factor
 		typedef typename boost::shared_ptr<PartialPriorFactor> shared_ptr;
 
@@ -74,10 +82,7 @@ namespace gtsam {
 			Base(model, key), prior_(prior), mask_(T::Dim(), false) {
 			assert((size_t)prior_.size() == mask.size());
 			assert(model->dim() == (size_t) prior.size());
-			for (size_t i=0; i<mask.size(); ++i) {
-				assert(mask[i] < mask_.size());
-				mask_[mask[i]] = true;
-			}
+			setMask(mask);
 			assert(nrTrue() == this->dim());
 		}
 
@@ -114,6 +119,10 @@ namespace gtsam {
 			return masked_logmap - prior_;
 		}
 
+		// access
+		const Vector& prior() const { return prior_; }
+		const std::vector<bool>& mask() const { return  mask_; }
+
 	protected:
 
 		/** counts true elements in the mask */
@@ -124,6 +133,14 @@ namespace gtsam {
 			return result;
 		}
 
+		/** sets the mask using a set of indices */
+		void setMask(const std::vector<size_t>& mask) {
+			for (size_t i=0; i<mask.size(); ++i) {
+				assert(mask[i] < mask_.size());
+				mask_[mask[i]] = true;
+			}
+		}
+
 	private:
 		/** Serialization function */
 		friend class boost::serialization::access;