From b6b0ae6226bea8c541ac7493c925b119a56b1875 Mon Sep 17 00:00:00 2001
From: olivier-stasse <olivier.stasse@aist.go.jp>
Date: Sat, 6 Nov 2010 23:22:11 +0900
Subject: [PATCH] Fix problems with further improvment of
abstract-robot-dynamics normalization.
---
include/jrl/walkgen/patterngeneratorinterface.hh | 2 +-
src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.h | 2 +-
.../LeftAndRightFootTrajectoryGenerationMultiple.h | 2 +-
src/GlobalStrategyManagers/GlobalStrategyManager.h | 2 +-
src/Mathematics/FootConstraintsAsLinearSystem.h | 2 +-
src/Mathematics/FootConstraintsAsLinearSystemForVelRef.h | 2 +-
src/MotionGeneration/ComAndFootRealization.h | 2 +-
src/MotionGeneration/StepOverPlanner.h | 2 +-
src/ZMPRefTrajectoryGeneration/OrientationsPreview.h | 2 +-
src/ZMPRefTrajectoryGeneration/ZMPDiscretization.h | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/jrl/walkgen/patterngeneratorinterface.hh b/include/jrl/walkgen/patterngeneratorinterface.hh
index 63a02ad3..94c0a6b7 100644
--- 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
diff --git a/src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.h b/src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.h
index 77265d60..f1ace79c 100644
--- 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 */
diff --git a/src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.h b/src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.h
index f1e9af47..514d6bc4 100644
--- 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 */
diff --git a/src/GlobalStrategyManagers/GlobalStrategyManager.h b/src/GlobalStrategyManagers/GlobalStrategyManager.h
index 96fdabf0..bff5766f 100644
--- 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
diff --git a/src/Mathematics/FootConstraintsAsLinearSystem.h b/src/Mathematics/FootConstraintsAsLinearSystem.h
index da0d4722..94a91059 100644
--- 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>
diff --git a/src/Mathematics/FootConstraintsAsLinearSystemForVelRef.h b/src/Mathematics/FootConstraintsAsLinearSystemForVelRef.h
index b489cf00..739b1365 100644
--- 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>
diff --git a/src/MotionGeneration/ComAndFootRealization.h b/src/MotionGeneration/ComAndFootRealization.h
index ff5d7852..bcb16e15 100644
--- 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>
diff --git a/src/MotionGeneration/StepOverPlanner.h b/src/MotionGeneration/StepOverPlanner.h
index 9154e5d9..257ae770 100644
--- 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 */
diff --git a/src/ZMPRefTrajectoryGeneration/OrientationsPreview.h b/src/ZMPRefTrajectoryGeneration/OrientationsPreview.h
index 0fe7994e..adfc561f 100644
--- 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
{
diff --git a/src/ZMPRefTrajectoryGeneration/ZMPDiscretization.h b/src/ZMPRefTrajectoryGeneration/ZMPDiscretization.h
index 4a0f8632..4a0041ee 100644
--- 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>
--
GitLab