From 0a5f2205343eb95f75d63c70f09cdb049985243e Mon Sep 17 00:00:00 2001
From: alexhagiopol <alexhagiopol@gmail.com>
Date: Fri, 20 Feb 2015 14:33:15 -0500
Subject: [PATCH] 10% reduction in lines of code included by Vector.h.

---
 gtsam/base/Matrix.h   |  6 ++++++
 gtsam/base/Vector.cpp |  5 +++--
 gtsam/base/Vector.h   | 12 +++++++-----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/gtsam/base/Matrix.h b/gtsam/base/Matrix.h
index c3cbfa341..294b5e63a 100644
--- a/gtsam/base/Matrix.h
+++ b/gtsam/base/Matrix.h
@@ -27,6 +27,12 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 
+#include <gtsam/3rdparty/Eigen/Eigen/Core>
+#include <gtsam/3rdparty/Eigen/Eigen/Cholesky>
+#include <gtsam/3rdparty/Eigen/Eigen/SVD> 
+#include <gtsam/3rdparty/Eigen/Eigen/LU>
+
+
 /**
  * Matrix is a typedef in the gtsam namespace
  * TODO: make a version to work with matlab wrapping
diff --git a/gtsam/base/Vector.cpp b/gtsam/base/Vector.cpp
index a9ef8fe10..5368e708e 100644
--- a/gtsam/base/Vector.cpp
+++ b/gtsam/base/Vector.cpp
@@ -16,9 +16,10 @@
  * @author  Frank Dellaert
  */
 
+
 #include <cstdarg>
 #include <limits>
-#include <iostream>
+//#include <iostream>
 #include <fstream>
 #include <sstream>
 #include <iomanip>
@@ -27,7 +28,7 @@
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <cstdio>
-
+#include <vector> //added by alex
 #include <gtsam/base/Vector.h>
 
 
diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h
index 74cd248a1..58e1d2ff6 100644
--- a/gtsam/base/Vector.h
+++ b/gtsam/base/Vector.h
@@ -18,14 +18,16 @@
 
 // \callgraph
 
+
 #pragma once
-
 #include <list>
-#include <vector>
-#include <iostream>
+//#include <vector>
+//#include <iostream>
 #include <gtsam/global_includes.h>
-#include <gtsam/3rdparty/gtsam_eigen_includes.h>
-
+//#include <gtsam/3rdparty/gtsam_eigen_includes.h>
+//#include <gtsam/3rdparty/Eigen/Eigen/src/Core/Matrix.h>
+//#include <gtsam/3rdparty/Eigen/Eigen/src/Core/MatrixBase.h> 
+#include <gtsam/3rdparty/Eigen/Eigen/Core>
 namespace gtsam {
 
 // Vector is just a typedef of the Eigen dynamic vector type