removed redundancy in naming

gtsam.h

@@ -156,7 +156,7 @@ virtual class Value {
   size_t dim() const;
 };
 
-#include <gtsam/base/LieScalar_Deprecated.h>
+#include <gtsam/base/deprecated/LieScalar.h>
 class LieScalar {
   // Standard constructors
   LieScalar();
@@ -185,7 +185,7 @@ class LieScalar {
   static Vector Logmap(const gtsam::LieScalar& p);
 };
 
-#include <gtsam/base/LieVector_Deprecated.h>
+#include <gtsam/base/deprecated/LieVector.h>
 class LieVector {
   // Standard constructors
   LieVector();
@@ -217,7 +217,7 @@ class LieVector {
   void serialize() const;
 };
 
-#include <gtsam/base/LieMatrix_Deprecated.h>
+#include <gtsam/base/deprecated/LieMatrix.h>
 class LieMatrix {
   // Standard constructors
   LieMatrix();

gtsam/base/deprecated/LieMatrix.h

@@ -60,8 +60,9 @@ struct LieMatrix : public Matrix {
   /// @{
 
   /** print @param s optional string naming the object */
-  GTSAM_EXPORT void print(const std::string& name="") const;
-
+  GTSAM_EXPORT void print(const std::string& name = "") const {
+    gtsam::print(matrix(), name);
+  }
   /** equality up to tolerance */
   inline bool equals(const LieMatrix& expected, double tol=1e-5) const {
     return gtsam::equal_with_abs_tol(matrix(), expected.matrix(), tol);

gtsam/base/deprecated/LieScalar.h

@@ -48,8 +48,10 @@ namespace gtsam {
 
     /// @name Testable
     /// @{
-    void print(const std::string& name="") const;
-    bool equals(const LieScalar& expected, double tol=1e-5) const {
+    void print(const std::string& name = "") const {
+      std::cout << name << ": " << d_ << std::endl;
+    }
+    bool equals(const LieScalar& expected, double tol = 1e-5) const {
       return fabs(expected.d_ - d_) <= tol;
     }
     /// @}

gtsam/base/deprecated/LieVector.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include <gtsam/base/VectorSpace.h>
+#include <cstdarg>
 
 namespace gtsam {
 
@@ -50,11 +51,15 @@ struct LieVector : public Vector {
   LieVector(double d) : Vector((Vector(1) << d).finished()) {}
 
   /** constructor with size and initial data, row order ! */
-  GTSAM_EXPORT LieVector(size_t m, const double* const data);
+  GTSAM_EXPORT LieVector(size_t m, const double* const data) : Vector(m) {
+    for (size_t i = 0; i < m; i++) (*this)(i) = data[i];
+  }
 
   /// @name Testable
   /// @{
-  GTSAM_EXPORT void print(const std::string& name="") const;
+  GTSAM_EXPORT void print(const std::string& name="") const {
+    gtsam::print(vector(), name);
+  }
   bool equals(const LieVector& expected, double tol=1e-5) const {
     return gtsam::equal(vector(), expected.vector(), tol);
   }

gtsam/base/tests/testLieMatrix.cpp

@@ -15,7 +15,7 @@
  */
 
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/deprecated/LieMatrix_Deprecated.h>
+#include <gtsam/base/deprecated/LieMatrix.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/Manifold.h>
 

gtsam/base/tests/testLieScalar.cpp

@@ -15,7 +15,7 @@
  */
 
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/deprecated/LieScalar_Deprecated.h>
+#include <gtsam/base/deprecated/LieScalar.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/Manifold.h>
 

gtsam/base/tests/testLieVector.cpp

@@ -15,7 +15,7 @@
  */
 
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/deprecated/LieVector_Deprecated.h>
+#include <gtsam/base/deprecated/LieVector.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/Manifold.h>
 

gtsam/base/tests/testTestableAssertions.cpp

@@ -15,7 +15,7 @@
  */
 
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/deprecated/LieScalar_Deprecated.h>
+#include <gtsam/base/deprecated/LieScalar.h>
 #include <gtsam/base/TestableAssertions.h>
 
 using namespace gtsam;

gtsam_unstable/gtsam_unstable.h

@@ -452,7 +452,7 @@ virtual class DGroundConstraint : gtsam::NonlinearFactor {
   DGroundConstraint(size_t key, Vector constraint, const gtsam::noiseModel::Base* model);
 };
 
-#include <gtsam/base/LieScalar_Deprecated.h>
+#include <gtsam/base/deprecated/LieScalar.h>
 
 #include <gtsam_unstable/dynamics/VelocityConstraint3.h>
 virtual class VelocityConstraint3 : gtsam::NonlinearFactor {

gtsam_unstable/slam/tests/testGaussMarkov1stOrderFactor.cpp

@@ -21,7 +21,7 @@
 #include <gtsam/inference/Key.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/deprecated/LieVector_Deprecated.h>
+#include <gtsam/base/deprecated/LieVector.h>
 
 using namespace std;
 using namespace gtsam;

tests/testGaussianISAM2.cpp

@@ -25,7 +25,7 @@
 #include <gtsam/base/treeTraversal-inst.h>
 #include <boost/foreach.hpp>
 #include <boost/assign/list_of.hpp>
-#include <gtsam/base/deprecated/LieScalar_Deprecated.h>
+#include <gtsam/base/deprecated/LieScalar.h>
 using namespace boost::assign;
 #include <boost/range/adaptor/map.hpp>
 namespace br { using namespace boost::adaptors; using namespace boost::range; }