diff --git a/gtsam/geometry/geometry.i b/gtsam/geometry/geometry.i index a40951d3e..0def84265 100644 --- a/gtsam/geometry/geometry.i +++ b/gtsam/geometry/geometry.i @@ -27,9 +27,6 @@ class Point2 { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; class Point2Pairs { @@ -104,9 +101,6 @@ class StereoPoint2 { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -131,9 +125,6 @@ class Point3 { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; class Point3Pairs { @@ -191,9 +182,6 @@ class Rot2 { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -372,9 +360,6 @@ class Rot3 { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -433,9 +418,6 @@ class Pose2 { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; boost::optional align(const gtsam::Point2Pairs& pairs); @@ -502,9 +484,6 @@ class Pose3 { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; class Pose3Pairs { @@ -547,9 +526,6 @@ class Unit3 { // enabling serialization functionality void serialize() const; - // enable pickling in python - void pickle() const; - // enabling function to compare objects bool equals(const gtsam::Unit3& expected, double tol) const; }; @@ -611,9 +587,6 @@ class Cal3_S2 { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -642,9 +615,6 @@ virtual class Cal3DS2_Base { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -668,9 +638,6 @@ virtual class Cal3DS2 : gtsam::Cal3DS2_Base { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -705,9 +672,6 @@ virtual class Cal3Unified : gtsam::Cal3DS2_Base { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -750,9 +714,6 @@ class Cal3Fisheye { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -811,9 +772,6 @@ class Cal3Bundler { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -847,9 +805,6 @@ class CalibratedCamera { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -889,9 +844,6 @@ class PinholeCamera { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -962,9 +914,6 @@ class StereoCamera { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include diff --git a/gtsam/gtsam.i b/gtsam/gtsam.i index 6ac63c93f..d4e959c3d 100644 --- a/gtsam/gtsam.i +++ b/gtsam/gtsam.i @@ -39,9 +39,6 @@ class KeyList { void remove(size_t key); void serialize() const; - - // enable pickling in python - void pickle() const; }; // Actually a FastSet @@ -67,9 +64,6 @@ class KeySet { bool count(size_t key) const; // returns true if value exists void serialize() const; - - // enable pickling in python - void pickle() const; }; // Actually a vector @@ -91,9 +85,6 @@ class KeyVector { void push_back(size_t key) const; void serialize() const; - - // enable pickling in python - void pickle() const; }; // Actually a FastMap diff --git a/gtsam/linear/linear.i b/gtsam/linear/linear.i index d882cb38b..7b1ce550f 100644 --- a/gtsam/linear/linear.i +++ b/gtsam/linear/linear.i @@ -34,9 +34,6 @@ virtual class Gaussian : gtsam::noiseModel::Base { // enabling serialization functionality void serializable() const; - - // enable pickling in python - void pickle() const; }; virtual class Diagonal : gtsam::noiseModel::Gaussian { @@ -52,9 +49,6 @@ virtual class Diagonal : gtsam::noiseModel::Gaussian { // enabling serialization functionality void serializable() const; - - // enable pickling in python - void pickle() const; }; virtual class Constrained : gtsam::noiseModel::Diagonal { @@ -72,9 +66,6 @@ virtual class Constrained : gtsam::noiseModel::Diagonal { // enabling serialization functionality void serializable() const; - - // enable pickling in python - void pickle() const; }; virtual class Isotropic : gtsam::noiseModel::Diagonal { @@ -87,9 +78,6 @@ virtual class Isotropic : gtsam::noiseModel::Diagonal { // enabling serialization functionality void serializable() const; - - // enable pickling in python - void pickle() const; }; virtual class Unit : gtsam::noiseModel::Isotropic { @@ -97,9 +85,6 @@ virtual class Unit : gtsam::noiseModel::Isotropic { // enabling serialization functionality void serializable() const; - - // enable pickling in python - void pickle() const; }; namespace mEstimator { @@ -270,9 +255,6 @@ class VectorValues { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -344,9 +326,6 @@ virtual class JacobianFactor : gtsam::GaussianFactor { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -379,9 +358,6 @@ virtual class HessianFactor : gtsam::GaussianFactor { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -463,9 +439,6 @@ class GaussianFactorGraph { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include diff --git a/gtsam/navigation/navigation.i b/gtsam/navigation/navigation.i index 1f9ffcf2e..c2a3bcdb4 100644 --- a/gtsam/navigation/navigation.i +++ b/gtsam/navigation/navigation.i @@ -44,9 +44,6 @@ class ConstantBias { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; }///\namespace imuBias @@ -73,9 +70,6 @@ class NavState { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -121,9 +115,6 @@ virtual class PreintegrationParams : gtsam::PreintegratedRotationParams { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -156,9 +147,6 @@ class PreintegratedImuMeasurements { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; virtual class ImuFactor: gtsam::NonlinearFactor { diff --git a/gtsam/nonlinear/nonlinear.i b/gtsam/nonlinear/nonlinear.i index 8407668cb..960b3ff27 100644 --- a/gtsam/nonlinear/nonlinear.i +++ b/gtsam/nonlinear/nonlinear.i @@ -131,9 +131,6 @@ class Ordering { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -196,9 +193,6 @@ class NonlinearFactorGraph { // enabling serialization functionality void serialize() const; - // enable pickling in python - void pickle() const; - void saveGraph(const string& s) const; }; @@ -290,9 +284,6 @@ class Values { // enabling serialization functionality void serialize() const; - // enable pickling in python - void pickle() const; - // New in 4.0, we have to specialize every insert/update/at to generate // wrappers Instead of the old: void insert(size_t j, const gtsam::Value& // value); void update(size_t j, const gtsam::Value& val); gtsam::Value @@ -851,9 +842,6 @@ virtual class PriorFactor : gtsam::NoiseModelFactor { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include diff --git a/gtsam/slam/slam.i b/gtsam/slam/slam.i index da1c197cb..d276c4f2e 100644 --- a/gtsam/slam/slam.i +++ b/gtsam/slam/slam.i @@ -21,9 +21,6 @@ virtual class BetweenFactor : gtsam::NoiseModelFactor { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; #include @@ -172,9 +169,6 @@ virtual class PoseTranslationPrior : gtsam::NoiseModelFactor { // enabling serialization functionality void serialize() const; - - // enable pickling in python - void pickle() const; }; typedef gtsam::PoseTranslationPrior PoseTranslationPrior2D; @@ -234,9 +228,6 @@ class SfmTrack { // enabling serialization functionality void serialize() const; - // enable pickling in python - void pickle() const; - // enabling function to compare objects bool equals(const gtsam::SfmTrack& expected, double tol) const; }; @@ -253,9 +244,6 @@ class SfmData { // enabling serialization functionality void serialize() const; - // enable pickling in python - void pickle() const; - // enabling function to compare objects bool equals(const gtsam::SfmData& expected, double tol) const; };