Fix problems with further improvment of abstract-robot-dynamics normalization.

b6b0ae62 · Olivier Stasse · 1e47612e · b6b0ae62 · b6b0ae62 · b6b0ae62
Commit b6b0ae62 authored 14 years ago by Olivier Stasse
--- a/include/jrl/walkgen/patterngeneratorinterface.hh
+++ b/include/jrl/walkgen/patterngeneratorinterface.hh
@@ -35,7 +35,7 @@
 #define _PATTERN_GENERATOR_INTERFACE_H_

 #include <deque>
-#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
+#include <abstract-robot-dynamics/humanoid-dynamic-robot.hh>
 #include <jrl/walkgen/pgtypes.hh>

 namespace PatternGeneratorJRL

--- a/src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.h
+++ b/src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.h
@@ -39,7 +39,7 @@
 #include <jrl/mal/matrixabstractlayer.hh>

 /* dynamics JRL Japan related inclusions */
-#include <abstract-robot-dynamics/jrlfoot.hh>
+#include <abstract-robot-dynamics/foot.hh>

 /* Walking pattern generation related inclusions */


--- a/src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.h
+++ b/src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.h
@@ -33,7 +33,7 @@
 #include <jrl/mal/matrixabstractlayer.hh>

 /* abstractRobotDynamics inclusion */
-#include <abstract-robot-dynamics/jrlfoot.hh>
+#include <abstract-robot-dynamics/foot.hh>

 /* Walking Pattern Generator inclusion */


--- a/src/GlobalStrategyManagers/GlobalStrategyManager.h
+++ b/src/GlobalStrategyManagers/GlobalStrategyManager.h
@@ -33,7 +33,7 @@
 #include <jrl/mal/matrixabstractlayer.hh>

 // Dynamics
-#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
+#include <abstract-robot-dynamics/humanoid-dynamic-robot.hh>

 // PG


--- a/src/Mathematics/FootConstraintsAsLinearSystem.h
+++ b/src/Mathematics/FootConstraintsAsLinearSystem.h
@@ -38,7 +38,7 @@

 #include <jrl/mal/matrixabstractlayer.hh>

-#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
+#include <abstract-robot-dynamics/humanoid-dynamic-robot.hh>


 #include <jrl/walkgen/pgtypes.hh>

--- a/src/Mathematics/FootConstraintsAsLinearSystemForVelRef.h
+++ b/src/Mathematics/FootConstraintsAsLinearSystemForVelRef.h
@@ -39,7 +39,7 @@

 #include <jrl/mal/matrixabstractlayer.hh>

-#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
+#include <abstract-robot-dynamics/humanoid-dynamic-robot.hh>


 #include <jrl/walkgen/pgtypes.hh>

--- a/src/MotionGeneration/ComAndFootRealization.h
+++ b/src/MotionGeneration/ComAndFootRealization.h
@@ -29,7 +29,7 @@
 #ifndef _COM_AND_FOOT_REALIZATION_H_
 #define _COM_AND_FOOT_REALIZATION_H_

-#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
+#include <abstract-robot-dynamics/humanoid-dynamic-robot.hh>

 #include <SimplePlugin.h>
 #include <StepStackHandler.h>

--- a/src/MotionGeneration/StepOverPlanner.h
+++ b/src/MotionGeneration/StepOverPlanner.h
@@ -44,7 +44,7 @@
 #include <jrl/mal/matrixabstractlayer.hh>

 /*! Abstract Interface for dynamic robot. */
-#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
+#include <abstract-robot-dynamics/humanoid-dynamic-robot.hh>

 /*! Humanoid Walking Pattern Generator */


--- a/src/ZMPRefTrajectoryGeneration/OrientationsPreview.h
+++ b/src/ZMPRefTrajectoryGeneration/OrientationsPreview.h
@@ -41,7 +41,7 @@

 /*! Framework includes */
 #include <jrl/walkgen/pgtypes.hh>
-#include <abstract-robot-dynamics/jrljoint.hh>
+#include <abstract-robot-dynamics/joint.hh>

 namespace PatternGeneratorJRL
 {

--- a/src/ZMPRefTrajectoryGeneration/ZMPDiscretization.h
+++ b/src/ZMPRefTrajectoryGeneration/ZMPDiscretization.h
@@ -45,7 +45,7 @@
 using namespace::std;

 /*! Abstract robot dynamics includes */
-#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
+#include <abstract-robot-dynamics/humanoid-dynamic-robot.hh>

 /*! Framework includes */
 #include <Mathematics/PolynomeFoot.h>