Skip to content

Commit

Permalink
address JS's comment
Browse files Browse the repository at this point in the history
  • Loading branch information
Daqing Yi committed Apr 19, 2017
1 parent 03082ad commit a77b734
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
8 changes: 6 additions & 2 deletions include/aikido/constraint/TSR.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ class TSR : public Sampleable,
bool project(const statespace::StateSpace::State* _s,
statespace::StateSpace::State* _out) const override;

double getSatisfiableTolerance();

void setSatisfiableTolerance(const double satisfiableTolerance);

/// Transformation from origin frame into the TSR frame "w".
/// "w" is usually centered at the origin of an object held by the hand
/// or at a location on an object that is useful for grasping.
Expand All @@ -126,10 +130,10 @@ class TSR : public Sampleable,
/// This often represent an offset from "w" to the origin of the end-effector.
Eigen::Isometry3d mTw_e;

/// Tolerance for checking satisfiability
double mSatisfiableTolerance;

private:
/// Tolerance for checking satisfiability
double mSatisfiableTolerance;
std::unique_ptr<util::RNG> mRng;
std::shared_ptr<statespace::SE3> mStateSpace;
};
Expand Down
12 changes: 12 additions & 0 deletions src/constraint/TSR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,17 @@ bool TSRSampleGenerator::sample(statespace::StateSpace::State* _state)
return true;
}

//=============================================================================
double TSR::getSatisfiableTolerance()
{
return mSatisfiableTolerance;
}

//=============================================================================
void TSR::setSatisfiableTolerance(const double satisfiableTolerance)
{
mSatisfiableTolerance = satisfiableTolerance;
}

//=============================================================================
bool TSRSampleGenerator::canSample() const
Expand All @@ -437,6 +448,7 @@ int TSRSampleGenerator::getNumSamples() const

return NO_LIMIT;
}

} // namespace constraint
} // namespace aikido

0 comments on commit a77b734

Please sign in to comment.