Skip to content

Commit

Permalink
Merge pull request #1358 from borglab/hybrid/gaussian-mixture-factor
Browse files Browse the repository at this point in the history
  • Loading branch information
dellaert authored Dec 31, 2022
2 parents d0821a5 + 2a16751 commit be27e3a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gtsam/hybrid/HybridConditional.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class GTSAM_EXPORT HybridConditional
}

/// Get the type-erased pointer to the inner type
boost::shared_ptr<Factor> inner() { return inner_; }
boost::shared_ptr<Factor> inner() const { return inner_; }

/// Return the error of the underlying conditional.
/// Currently only implemented for Gaussian mixture.
Expand Down
2 changes: 1 addition & 1 deletion gtsam/hybrid/HybridDiscreteFactor.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class GTSAM_EXPORT HybridDiscreteFactor : public HybridFactor {
/// @name Standard Interface
/// @{

/// Return pointer to the internal discrete factor
/// Return pointer to the internal discrete factor.
DiscreteFactor::shared_ptr inner() const { return inner_; }

/// Return the error of the underlying Discrete Factor.
Expand Down
2 changes: 1 addition & 1 deletion gtsam/hybrid/HybridGaussianFactor.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class GTSAM_EXPORT HybridGaussianFactor : public HybridFactor {
/// @name Standard Interface
/// @{

/// Return pointer to the internal discrete factor
/// Return pointer to the internal Gaussian factor.
GaussianFactor::shared_ptr inner() const { return inner_; }

/// Return the error of the underlying Discrete Factor.
Expand Down
1 change: 1 addition & 0 deletions gtsam/hybrid/HybridNonlinearFactor.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class HybridNonlinearFactor : public HybridFactor {
/// @name Standard Interface
/// @{

/// Return pointer to the internal nonlinear factor.
NonlinearFactor::shared_ptr inner() const { return inner_; }

/// Error for HybridValues is not provided for nonlinear factor.
Expand Down

0 comments on commit be27e3a

Please sign in to comment.