use boost serialization macro instead of make_array
							parent
							
								
									018e6ba68c
								
							
						
					
					
						commit
						b735174707
					
				|  | @ -164,7 +164,7 @@ private: | |||
|   void serialize(ARCHIVE & ar, const unsigned int /*version*/) { | ||||
|     namespace bs = ::boost::serialization; | ||||
|     ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(PreintegrationType); | ||||
|     ar & bs::make_nvp("preintMeasCov_", bs::make_array(preintMeasCov_.data(), preintMeasCov_.size())); | ||||
|     ar & BOOST_SERIALIZATION_NVP(preintMeasCov_); | ||||
|   } | ||||
| }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -122,11 +122,11 @@ private: | |||
|     ar & BOOST_SERIALIZATION_NVP(deltaTij_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(deltaXij_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(biasHat_); | ||||
|     ar & bs::make_nvp("delRdelBiasOmega_", bs::make_array(delRdelBiasOmega_.data(), delRdelBiasOmega_.size())); | ||||
|     ar & bs::make_nvp("delPdelBiasAcc_", bs::make_array(delPdelBiasAcc_.data(), delPdelBiasAcc_.size())); | ||||
|     ar & bs::make_nvp("delPdelBiasOmega_", bs::make_array(delPdelBiasOmega_.data(), delPdelBiasOmega_.size())); | ||||
|     ar & bs::make_nvp("delVdelBiasAcc_", bs::make_array(delVdelBiasAcc_.data(), delVdelBiasAcc_.size())); | ||||
|     ar & bs::make_nvp("delVdelBiasOmega_", bs::make_array(delVdelBiasOmega_.data(), delVdelBiasOmega_.size())); | ||||
|     ar & BOOST_SERIALIZATION_NVP(delRdelBiasOmega_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(delPdelBiasAcc_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(delPdelBiasOmega_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(delVdelBiasAcc_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(delVdelBiasOmega_); | ||||
|   } | ||||
| }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -61,7 +61,7 @@ struct GTSAM_EXPORT PreintegratedRotationParams { | |||
|   template<class ARCHIVE> | ||||
|   void serialize(ARCHIVE & ar, const unsigned int /*version*/) { | ||||
|     namespace bs = ::boost::serialization; | ||||
|     ar & bs::make_nvp("gyroscopeCovariance", bs::make_array(gyroscopeCovariance.data(), gyroscopeCovariance.size())); | ||||
|     ar & BOOST_SERIALIZATION_NVP(gyroscopeCovariance); | ||||
|     ar & BOOST_SERIALIZATION_NVP(omegaCoriolis); | ||||
|     ar & BOOST_SERIALIZATION_NVP(body_P_sensor); | ||||
|   } | ||||
|  |  | |||
|  | @ -75,8 +75,8 @@ protected: | |||
|     namespace bs = ::boost::serialization; | ||||
|     ar & boost::serialization::make_nvp("PreintegratedRotation_Params", | ||||
|          boost::serialization::base_object<PreintegratedRotationParams>(*this)); | ||||
|     ar & bs::make_nvp("accelerometerCovariance", bs::make_array(accelerometerCovariance.data(), accelerometerCovariance.size())); | ||||
|     ar & bs::make_nvp("integrationCovariance", bs::make_array(integrationCovariance.data(), integrationCovariance.size())); | ||||
|     ar & BOOST_SERIALIZATION_NVP(accelerometerCovariance); | ||||
|     ar & BOOST_SERIALIZATION_NVP(integrationCovariance); | ||||
|     ar & BOOST_SERIALIZATION_NVP(use2ndOrderCoriolis); | ||||
|     ar & BOOST_SERIALIZATION_NVP(n_gravity); | ||||
|   } | ||||
|  |  | |||
|  | @ -135,9 +135,9 @@ private: | |||
|     ar & BOOST_SERIALIZATION_NVP(p_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(biasHat_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(deltaTij_); | ||||
|     ar & bs::make_nvp("preintegrated_", bs::make_array(preintegrated_.data(), preintegrated_.size())); | ||||
|     ar & bs::make_nvp("preintegrated_H_biasAcc_", bs::make_array(preintegrated_H_biasAcc_.data(), preintegrated_H_biasAcc_.size())); | ||||
|     ar & bs::make_nvp("preintegrated_H_biasOmega_", bs::make_array(preintegrated_H_biasOmega_.data(), preintegrated_H_biasOmega_.size())); | ||||
|     ar & BOOST_SERIALIZATION_NVP(preintegrated_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(preintegrated_H_biasAcc_); | ||||
|     ar & BOOST_SERIALIZATION_NVP(preintegrated_H_biasOmega_); | ||||
|   } | ||||
| 
 | ||||
| public: | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue