From 89c4242b3f957d60d6f72517866c88e86a8fbca2 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Thu, 20 Jun 2013 16:05:29 +0000 Subject: [PATCH] Updated friend declarations to match swap in unit test group/name --- gtsam/linear/GaussianConditional.h | 24 ++++++++++++------------ gtsam/linear/HessianFactor.h | 16 ++++++++-------- gtsam/linear/JacobianFactor.h | 12 ++++++------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gtsam/linear/GaussianConditional.h b/gtsam/linear/GaussianConditional.h index b8d064efe..f20d10ef9 100644 --- a/gtsam/linear/GaussianConditional.h +++ b/gtsam/linear/GaussianConditional.h @@ -27,12 +27,12 @@ #include // Forward declaration to friend unit tests -class eliminate2JacobianFactorTest; -class constructorGaussianConditionalTest; -class eliminationGaussianFactorGraphTest; -class complicatedMarginalGaussianJunctionTreeTest; -class informationGaussianConditionalTest; -class isGaussianFactorGaussianConditionalTest; +class JacobianFactoreliminate2Test; +class GaussianConditionalconstructorTest; +class GaussianFactorGrapheliminationTest; +class GaussianJunctionTreecomplicatedMarginalTest; +class GaussianConditionalinformationTest; +class GaussianConditionalisGaussianFactorTest; namespace gtsam { @@ -223,12 +223,12 @@ private: // Friends friend class JacobianFactor; - friend class ::eliminate2JacobianFactorTest; - friend class ::constructorGaussianConditionalTest; - friend class ::eliminationGaussianFactorGraphTest; - friend class ::complicatedMarginalGaussianJunctionTreeTest; - friend class ::informationGaussianConditionalTest; - friend class ::isGaussianFactorGaussianConditionalTest; + friend class ::JacobianFactoreliminate2Test; + friend class ::GaussianConditionalconstructorTest; + friend class ::GaussianFactorGrapheliminationTest; + friend class ::GaussianJunctionTreecomplicatedMarginalTest; + friend class ::GaussianConditionalinformationTest; + friend class ::GaussianConditionalisGaussianFactorTest; /** Serialization function */ friend class boost::serialization::access; diff --git a/gtsam/linear/HessianFactor.h b/gtsam/linear/HessianFactor.h index 9fd62fed6..9f44a0964 100644 --- a/gtsam/linear/HessianFactor.h +++ b/gtsam/linear/HessianFactor.h @@ -23,10 +23,10 @@ #include // Forward declarations for friend unit tests -class ConversionConstructorHessianFactorTest; -class Constructor1HessianFactorTest; -class Constructor1bHessianFactorTest; -class combineHessianFactorTest; +class HessianFactorConversionConstructorTest; +class HessianFactorConstructor1Test; +class HessianFactorConstructor1bTest; +class HessianFactorcombineTest; namespace gtsam { @@ -325,10 +325,10 @@ namespace gtsam { virtual Matrix information() const; // Friend unit test classes - friend class ::ConversionConstructorHessianFactorTest; - friend class ::Constructor1HessianFactorTest; - friend class ::Constructor1bHessianFactorTest; - friend class ::combineHessianFactorTest; + friend class ::HessianFactorConversionConstructorTest; + friend class ::HessianFactorConstructor1Test; + friend class ::HessianFactorConstructor1bTest; + friend class ::HessianFactorcombineTest; // Friend JacobianFactor for conversion friend class JacobianFactor; diff --git a/gtsam/linear/JacobianFactor.h b/gtsam/linear/JacobianFactor.h index f474123e4..01de4953a 100644 --- a/gtsam/linear/JacobianFactor.h +++ b/gtsam/linear/JacobianFactor.h @@ -27,9 +27,9 @@ #include // Forward declarations of friend unit tests -class Combine2JacobianFactorTest; -class eliminateFrontalsJacobianFactorTest; -class constructor2JacobianFactorTest; +class JacobianFactorCombine2Test; +class JacobianFactoreliminateFrontalsTest; +class JacobianFactorconstructor2Test; namespace gtsam { @@ -316,9 +316,9 @@ namespace gtsam { friend class HessianFactor; // Friend unit tests (see also forward declarations above) - friend class ::Combine2JacobianFactorTest; - friend class ::eliminateFrontalsJacobianFactorTest; - friend class ::constructor2JacobianFactorTest; + friend class ::JacobianFactorCombine2Test; + friend class ::JacobianFactoreliminateFrontalsTest; + friend class ::JacobianFactorconstructor2Test; /** Serialization function */ friend class boost::serialization::access;