Browse Source

remove unused parametes

master
philipp schoenberger 10 years ago
parent
commit
9496e6f4db
  1. 25
      lwrserv/BangBangTrajectroy.cpp
  2. 10
      lwrserv/LinearTrajectory.cpp
  3. 6
      lwrserv/Trajectroy.cpp
  4. 5
      lwrserv/include/BangBangTrajectroy.h
  5. 6
      lwrserv/include/LinearTrajectory.h
  6. 4
      lwrserv/include/Trajectroy.h

25
lwrserv/BangBangTrajectroy.cpp

@ -9,24 +9,13 @@ template <class T, unsigned SIZE>
BangBangJointTrajectroy::BangBangJointTrajectroy( BangBangJointTrajectroy::BangBangJointTrajectroy(
unsigned int steps_, unsigned int steps_,
float totalTime_, float totalTime_,
Vec<float,SIZE> jointMovement,
Vec<float,SIZE> maxJointRange,
Vec<float,SIZE> maxJointVelocityPerStep,
Vec<float,SIZE> maxJointAccelarationPerStep
Vec<float,SIZE> jointMovement
) )
{ {
super(steps_, totalTime_, jointMovement, maxJointVelocityPerStep, maxJointAccelarationPerStep);
//unused
(void) maxJointRange;
Vec<float,LBR_MNJ> currentInk(0.0f);
Vec<float,LBR_MNJ> currentInkLast(0.0f);
Vec<float,LBR_MNJ> currentDist(0.0f);
Vec<float,LBR_MNJ> currentDistLast(0.0f);
for (unsigned int currStep = 0 ; currStep < steps ; ++currStep)
{
for (unsigned int currJoint = 0 ; currJoint < joints ; currJoint++)
{
}
}
Vec< float, SIZE> velocity = jointMovement / steps * 1.5f;
LinearJointTrajectory(
steps_,
totalTime_,
jointMovement,
velocity);
} }

10
lwrserv/LinearTrajectory.cpp

@ -6,9 +6,7 @@ template <class T, unsigned SIZE>
LinearJointTrajectory::LinearJointTrajectory( LinearJointTrajectory::LinearJointTrajectory(
unsigned int steps_, unsigned int steps_,
float totalTime_, float totalTime_,
Vec<float,SIZE> jointMovement,
Vec<float,SIZE> maxJointVelocityPerStep,
Vec<float,SIZE> maxJointAccelarationPerStep
Vec<float,SIZE> jointMovement
) )
{ {
Vec< float, SIZE> velocity = jointMovement / steps * 1.5f; Vec< float, SIZE> velocity = jointMovement / steps * 1.5f;
@ -16,8 +14,6 @@ LinearJointTrajectory::LinearJointTrajectory(
steps_, steps_,
totalTime_, totalTime_,
jointMovement, jointMovement,
maxJointVelocityPerStep,
maxJointAccelarationPerStep,
velocity); velocity);
} }
@ -26,12 +22,10 @@ LinearJointTrajectory::LinearJointTrajectory(
unsigned int steps_, unsigned int steps_,
float totalTime_, float totalTime_,
Vec<float,SIZE> jointMovement, Vec<float,SIZE> jointMovement,
Vec<float,SIZE> maxJointVelocityPerStep,
Vec<float,SIZE> maxJointAccelarationPerStep,
Vec<float,SIZE> velocity Vec<float,SIZE> velocity
) )
{ {
super(steps_, totalTime_, jointMovement, maxJointVelocityPerStep, maxJointAccelarationPerStep);
super(steps_, totalTime_, jointMovement);
if ( velocity > jointMovement/totalTime) if ( velocity > jointMovement/totalTime)
{ {

6
lwrserv/Trajectroy.cpp

@ -6,9 +6,7 @@ template <class T, unsigned SIZE>
Trajectory::Trajectory( Trajectory::Trajectory(
unsigned int steps_, unsigned int steps_,
float totalTime_, float totalTime_,
Vec<float,SIZE> jointMovement,
Vec<float,SIZE> maxJointVelocityPerStep,
Vec<float,SIZE> maxJointAccelarationPerStep
Vec<float,SIZE> jointMovement
) )
{ {
steps = steps_; steps = steps_;
@ -19,8 +17,6 @@ Trajectory::Trajectory(
// unused // unused
(void) jointMovement; (void) jointMovement;
(void) maxJointVelocityPerStep;
(void) maxJointAccelarationPerStep;
} }
Trajectory::~Trajectory() Trajectory::~Trajectory()

5
lwrserv/include/BangBangTrajectroy.h

@ -11,10 +11,7 @@ class BangBangJointTrajectroy : public Trajectory
BangBangJointTrajectroy( BangBangJointTrajectroy(
unsigned int steps_, unsigned int steps_,
float totalTime_, float totalTime_,
Vec<float,SIZE> jointMovement,
Vec<float,SIZE> maxJointRange,
Vec<float,SIZE> maxJointVelocityPerStep,
Vec<float,SIZE> maxJointAccelarationPerStep);
Vec<float,SIZE> jointMovement);
~BangBangJointTrajectroy(); ~BangBangJointTrajectroy();
private: private:

6
lwrserv/include/LinearTrajectory.h

@ -10,16 +10,12 @@ class LinearJointTrajectory: public Trajectory
LinearJointTrajectory( LinearJointTrajectory(
unsigned int steps_, unsigned int steps_,
float totalTime_, float totalTime_,
Vec<float,SIZE> jointMovement,
Vec<float,SIZE> maxJointVelocityPerStep,
Vec<float,SIZE> maxJointAccelarationPerStep);
Vec<float,SIZE> jointMovement);
template <class T, unsigned SIZE> template <class T, unsigned SIZE>
LinearJointTrajectory( LinearJointTrajectory(
unsigned int steps_, unsigned int steps_,
float totalTime_, float totalTime_,
Vec<float,SIZE> jointMovement, Vec<float,SIZE> jointMovement,
Vec<float,SIZE> maxJointVelocityPerStep,
Vec<float,SIZE> maxJointAccelarationPerStep,
Vec<float,SIZE> velocity); Vec<float,SIZE> velocity);
~LinearJointTrajectory(); ~LinearJointTrajectory();
private: private:

4
lwrserv/include/Trajectroy.h

@ -9,9 +9,7 @@ class Trajectory
Trajectory ( Trajectory (
unsigned int steps_, unsigned int steps_,
float totalTime_, float totalTime_,
Vec<float,SIZE> jointMovement,
Vec<float,SIZE> maxJointVelocityPerStep,
Vec<float,SIZE> maxJointAccelarationPerStep
Vec<float,SIZE> jointMovement
); );
~Trajectory(); ~Trajectory();

Loading…
Cancel
Save