Merge pull request #2067 from jwnimmer-tri/kill-Core.h

Remove Core.h
RobotLocomotion · Apr 12, 2016 · 8f6d48c · 8f6d48c
2 parents b06552b + a49289f
commit 8f6d48c
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ Unreleased: changes on master, not yet released
 [//]: # "Lost functionality or APIs."
 ### Removed / Deprecated
 
+ - [#2067][] `core/Core.h` is removed.
  - [#2039][] Ubuntu 12.04 Trusty is no longer supported.
 
 [//]: # "Smaller bug fixes.  No API changes."
@@ -50,6 +51,7 @@ Changes in version v0.9.11 and before are not provided.
 
 [//]: # "You can use PimpMyChangelog to auto-update this list."
 [//]: # "https://github.com/pcreux/pimpmychangelog"
+[#2067]: https://github.com/RobotLocomotion/drake/issues/2067
 [#2039]: https://github.com/RobotLocomotion/drake/issues/2039
 [#2027]: https://github.com/RobotLocomotion/drake/issues/2027
 [#1953]: https://github.com/RobotLocomotion/drake/issues/1953

diff --git a/drake/core/CMakeLists.txt b/drake/core/CMakeLists.txt
@@ -1,4 +1,4 @@
 
 add_subdirectory(test)
 
-drake_install_headers(Core.h Function.h Gradient.h Vector.h)
+drake_install_headers(Function.h Gradient.h Vector.h)
diff --git a/drake/core/Core.h b/drake/core/Core.h
diff --git a/drake/core/test/vector_test.cc b/drake/core/test/vector_test.cc
@@ -1,6 +1,7 @@
 #include "gtest/gtest.h"
 
-#include "drake/core/Core.h"
+#include "drake/core/Function.h"
+#include "drake/core/Vector.h"
 #include "drake/core/test/pendulum.h"
 #include "drake/util/eigen_matrix_compare.h"
 #include "drake/util/testUtil.h"

diff --git a/drake/examples/Acrobot/test/urdfDynamicsTest.cpp b/drake/examples/Acrobot/test/urdfDynamicsTest.cpp
@@ -1,3 +1,4 @@
+#include "drake/Path.h"
 #include "drake/examples/Acrobot/Acrobot.h"
 #include "drake/systems/plants/RigidBodySystem.h"
 #include "drake/util/eigen_matrix_compare.h"

diff --git a/drake/examples/Pendulum/runDynamics.cpp b/drake/examples/Pendulum/runDynamics.cpp
@@ -1,5 +1,7 @@
 
 #include <iostream>
+
+#include "drake/Path.h"
 #include "drake/util/Polynomial.h"
 #include "drake/examples/Pendulum/Pendulum.h"
 #include "drake/systems/Simulation.h"

diff --git a/drake/examples/Pendulum/runEnergyShaping.cpp b/drake/examples/Pendulum/runEnergyShaping.cpp
@@ -1,4 +1,6 @@
 #include <iostream>
+
+#include "drake/Path.h"
 #include "drake/examples/Pendulum/Pendulum.h"
 #include "drake/systems/Simulation.h"
 #include "drake/systems/plants/BotVisualizer.h"

diff --git a/drake/examples/Pendulum/runLQR.cpp b/drake/examples/Pendulum/runLQR.cpp
@@ -1,4 +1,6 @@
 #include <iostream>
+
+#include "drake/Path.h"
 #include "drake/examples/Pendulum/Pendulum.h"
 #include "drake/systems/Simulation.h"
 #include "drake/systems/controllers/LQR.h"

diff --git a/drake/examples/Pendulum/test/urdfDynamicsTest.cpp b/drake/examples/Pendulum/test/urdfDynamicsTest.cpp
@@ -1,3 +1,4 @@
+#include "drake/Path.h"
 #include "drake/examples/Pendulum/Pendulum.h"
 #include "drake/systems/plants/RigidBodySystem.h"
 #include "drake/util/eigen_matrix_compare.h"

diff --git a/drake/examples/Quadrotor/runDynamics.cpp b/drake/examples/Quadrotor/runDynamics.cpp
@@ -1,5 +1,7 @@
 
 #include <iostream>
+
+#include "drake/Path.h"
 #include "drake/systems/LCMSystem.h"
 #include "drake/systems/LinearSystem.h"
 #include "drake/systems/cascade_system.h"

diff --git a/drake/examples/Quadrotor/runLQR.cpp b/drake/examples/Quadrotor/runLQR.cpp
@@ -1,4 +1,6 @@
 #include <iostream>
+
+#include "drake/Path.h"
 #include "drake/examples/Quadrotor/Quadrotor.h"
 #include "drake/systems/Simulation.h"
 #include "drake/systems/controllers/LQR.h"

diff --git a/drake/examples/Quadrotor/test/urdfDynamicsTest.cpp b/drake/examples/Quadrotor/test/urdfDynamicsTest.cpp
@@ -2,6 +2,7 @@
 
 #include "gtest/gtest.h"
 
+#include "drake/Path.h"
 #include "drake/systems/plants/RigidBodySystem.h"
 #include "drake/util/eigen_matrix_compare.h"
 #include "drake/util/testUtil.h"

diff --git a/drake/solvers/Optimization.h b/drake/solvers/Optimization.h
@@ -6,7 +6,10 @@
 #include <memory>
 #include <initializer_list>
 #include <Eigen/Core>
-#include "drake/core/Core.h"
+
+#include "drake/core/Function.h"
+#include "drake/core/Gradient.h"
+#include "drake/core/Vector.h"
 #include "drake/drakeOptimization_export.h"
 #include "drake/solvers/Constraint.h"
 #include "drake/solvers/MathematicalProgram.h"

diff --git a/drake/systems/System.h b/drake/systems/System.h
@@ -4,7 +4,10 @@
 #include <memory>
 #include <Eigen/Core>
 #include <Eigen/Dense>
-#include "drake/core/Core.h"
+
+#include "drake/core/Function.h"
+#include "drake/core/Gradient.h"
+#include "drake/core/Vector.h"
 
 namespace Drake {
 

diff --git a/drake/systems/cascade_system.h b/drake/systems/cascade_system.h
@@ -2,7 +2,10 @@
 #define DRAKE_SYSTEMS_CASCADE_SYSTEM_H_
 
 #include <memory>
-#include "drake/core/Core.h"
+
+#include "drake/core/Function.h"
+#include "drake/core/Gradient.h"
+#include "drake/core/Vector.h"
 #include "drake/systems/System.h"
 
 namespace Drake {

diff --git a/drake/systems/controllers/LQR.h b/drake/systems/controllers/LQR.h
@@ -1,7 +1,9 @@
 #ifndef DRAKE_SYSTEMS_CONTROLLERS_LQR_H_
 #define DRAKE_SYSTEMS_CONTROLLERS_LQR_H_
 
-#include "drake/core/Core.h"
+#include "drake/core/Function.h"
+#include "drake/core/Gradient.h"
+#include "drake/core/Vector.h"
 #include "drake/systems/LinearSystem.h"
 #include "drake/util/drakeGradientUtil.h"
 #include "drake/util/drakeUtil.h"

diff --git a/drake/systems/feedback_system.h b/drake/systems/feedback_system.h
@@ -2,7 +2,10 @@
 #define DRAKE_SYSTEMS_FEEDBACK_SYSTEM_H_
 
 #include <memory>
-#include "drake/core/Core.h"
+
+#include "drake/core/Function.h"
+#include "drake/core/Gradient.h"
+#include "drake/core/Vector.h"
 #include "drake/systems/System.h"
 
 namespace Drake {

diff --git a/drake/systems/pd_control_system.h b/drake/systems/pd_control_system.h
@@ -2,7 +2,10 @@
 #define DRAKE_SYSTEMS_PD_CONTROL_SYSTEM_H_
 
 #include <memory>
-#include "drake/core/Core.h"
+
+#include "drake/core/Function.h"
+#include "drake/core/Gradient.h"
+#include "drake/core/Vector.h"
 #include "drake/systems/System.h"
 
 namespace Drake {

diff --git a/drake/systems/plants/test/lidarTest.cpp b/drake/systems/plants/test/lidarTest.cpp
@@ -1,6 +1,7 @@
 
 #include <cmath>
 #include "lcmtypes/bot_core/planar_lidar_t.hpp"
+#include "drake/Path.h"
 #include "drake/systems/LCMSystem.h"
 #include "drake/systems/plants/RigidBodySystem.h"
 #include "drake/systems/plants/BotVisualizer.h"

diff --git a/drake/systems/plants/test/testAccelerometer.cpp b/drake/systems/plants/test/testAccelerometer.cpp
@@ -1,5 +1,6 @@
 #include "gtest/gtest.h"
 
+#include "drake/Path.h"
 #include "drake/systems/plants/RigidBodySystem.h"
 #include "drake/util/eigen_matrix_compare.h"
 #include "drake/util/testUtil.h"

diff --git a/drake/systems/plants/test/testGyroscope.cpp b/drake/systems/plants/test/testGyroscope.cpp
@@ -1,5 +1,6 @@
 #include "gtest/gtest.h"
 
+#include "drake/Path.h"
 #include "drake/systems/plants/RigidBodySystem.h"
 #include "drake/util/eigen_matrix_compare.h"
 #include "drake/util/testUtil.h"

diff --git a/drake/systems/plants/test/testMagnetometer.cpp b/drake/systems/plants/test/testMagnetometer.cpp
@@ -1,5 +1,6 @@
 #include "gtest/gtest.h"
 
+#include "drake/Path.h"
 #include "drake/systems/plants/RigidBodySystem.h"
 #include "drake/util/eigen_matrix_compare.h"
 #include "drake/util/testUtil.h"

diff --git a/drake/systems/plants/test/testMassSpringDamper.cpp b/drake/systems/plants/test/testMassSpringDamper.cpp
@@ -1,5 +1,6 @@
 #include "gtest/gtest.h"
 
+#include "drake/Path.h"
 #include "drake/systems/plants/RigidBodySystem.h"
 #include "drake/util/eigen_matrix_compare.h"
 #include "drake/util/testUtil.h"