From f708672231d597c1482cae918e538f42a21efa90 Mon Sep 17 00:00:00 2001 From: Masaki Murooka Date: Sun, 4 Aug 2024 00:25:33 +0000 Subject: [PATCH] Update Doxygen HTML files from commit 2ff226b060140410e99d697fe009d6d57b88d86d --- doxygen/Contact_8h_source.html | 136 +++++++++--------- ...lassForceColl_1_1GraspContact-members.html | 5 +- doxygen/classForceColl_1_1GraspContact.html | 31 +++- ...ssForceColl_1_1SurfaceContact-members.html | 5 +- doxygen/classForceColl_1_1SurfaceContact.html | 23 +++ doxygen/functions.html | 4 + doxygen/functions_func.html | 4 + doxygen/search/all_d.js | 3 +- doxygen/search/all_e.js | 8 +- doxygen/search/all_f.js | 6 +- doxygen/search/classes_0.js | 4 +- doxygen/search/classes_1.js | 2 +- doxygen/search/classes_2.js | 2 +- doxygen/search/classes_3.js | 2 +- doxygen/search/classes_4.js | 2 +- doxygen/search/classes_5.js | 2 +- doxygen/search/classes_6.js | 2 +- doxygen/search/files_0.js | 6 +- doxygen/search/files_1.js | 2 +- doxygen/search/files_2.js | 2 +- doxygen/search/functions_0.js | 2 +- doxygen/search/functions_1.js | 16 +-- doxygen/search/functions_2.js | 2 +- doxygen/search/functions_3.js | 2 +- doxygen/search/functions_4.js | 4 +- doxygen/search/functions_5.js | 4 +- doxygen/search/functions_6.js | 2 +- doxygen/search/functions_7.js | 4 +- doxygen/search/functions_8.js | 2 +- doxygen/search/functions_9.js | 2 +- doxygen/search/functions_a.js | 3 +- doxygen/search/functions_b.js | 2 +- doxygen/search/functions_c.js | 2 +- doxygen/search/namespaces_0.js | 4 +- doxygen/search/variables_0.js | 4 +- doxygen/search/variables_1.js | 6 +- doxygen/search/variables_2.js | 2 +- doxygen/search/variables_3.js | 2 +- doxygen/search/variables_4.js | 6 +- doxygen/search/variables_5.js | 2 +- doxygen/search/variables_6.js | 2 +- doxygen/search/variables_7.js | 4 +- doxygen/search/variables_8.js | 10 +- doxygen/search/variables_9.js | 6 +- doxygen/search/variables_a.js | 2 +- 45 files changed, 206 insertions(+), 142 deletions(-) diff --git a/doxygen/Contact_8h_source.html b/doxygen/Contact_8h_source.html index cf9825e..853adba 100644 --- a/doxygen/Contact_8h_source.html +++ b/doxygen/Contact_8h_source.html @@ -207,78 +207,82 @@
206  return "Surface";
207  }
208 
-
210  virtual void updateGlobalVertices(const sva::PTransformd & pose) override;
+
210  void updateLocalVertices(const std::vector<Eigen::Vector3d> & localVertices);
211 
-
219  virtual void addToGUI(mc_rtc::gui::StateBuilder & gui,
-
220  const std::vector<std::string> & category,
-
221  double forceScale = constants::defaultForceScale,
-
222  double fricPyramidScale = constants::defaultFricPyramidScale,
-
223  const Eigen::VectorXd & wrenchRatio = Eigen::VectorXd::Zero(0)) override;
-
224 };
-
225 
-
227 class GraspContact : public Contact
-
228 {
-
229 public:
-
233  static void loadVerticesMap(const mc_rtc::Configuration & mcRtcConfig);
-
234 
-
236  static inline std::unordered_map<std::string, std::vector<sva::PTransformd>> verticesMap;
+
213  virtual void updateGlobalVertices(const sva::PTransformd & pose) override;
+
214 
+
222  virtual void addToGUI(mc_rtc::gui::StateBuilder & gui,
+
223  const std::vector<std::string> & category,
+
224  double forceScale = constants::defaultForceScale,
+
225  double fricPyramidScale = constants::defaultFricPyramidScale,
+
226  const Eigen::VectorXd & wrenchRatio = Eigen::VectorXd::Zero(0)) override;
+
227 };
+
228 
+
230 class GraspContact : public Contact
+
231 {
+
232 public:
+
236  static void loadVerticesMap(const mc_rtc::Configuration & mcRtcConfig);
237 
-
239  std::vector<sva::PTransformd> localVertices_;
+
239  static inline std::unordered_map<std::string, std::vector<sva::PTransformd>> verticesMap;
240 
-
241 public:
-
242  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+
242  std::vector<sva::PTransformd> localVertices_;
243 
-
251  GraspContact(const std::string & name,
-
252  double fricCoeff,
-
253  const std::vector<sva::PTransformd> & localVertices,
-
254  const sva::PTransformd & pose,
-
255  std::optional<sva::ForceVecd> maxWrench = std::nullopt);
-
256 
-
260  GraspContact(const mc_rtc::Configuration & mcRtcConfig);
-
261 
-
263  inline virtual std::string type() const override
-
264  {
-
265  return "Grasp";
-
266  }
-
267 
-
269  virtual void updateGlobalVertices(const sva::PTransformd & pose) override;
+
244 public:
+
245  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+
246 
+
254  GraspContact(const std::string & name,
+
255  double fricCoeff,
+
256  const std::vector<sva::PTransformd> & localVertices,
+
257  const sva::PTransformd & pose,
+
258  std::optional<sva::ForceVecd> maxWrench = std::nullopt);
+
259 
+
263  GraspContact(const mc_rtc::Configuration & mcRtcConfig);
+
264 
+
266  inline virtual std::string type() const override
+
267  {
+
268  return "Grasp";
+
269  }
270 
-
278  virtual void addToGUI(mc_rtc::gui::StateBuilder & gui,
-
279  const std::vector<std::string> & category,
-
280  double forceScale = constants::defaultForceScale,
-
281  double fricPyramidScale = constants::defaultFricPyramidScale,
-
282  const Eigen::VectorXd & wrenchRatio = Eigen::VectorXd::Zero(0)) override;
-
283 };
-
284 
-
291 sva::ForceVecd calcTotalWrench(const std::vector<std::shared_ptr<Contact>> & contactList,
-
292  const Eigen::VectorXd & wrenchRatio,
-
293  const Eigen::Vector3d & momentOrigin = Eigen::Vector3d::Zero());
-
294 
-
301 std::vector<sva::ForceVecd> calcWrenchList(const std::vector<std::shared_ptr<Contact>> & contactList,
-
302  const Eigen::VectorXd & wrenchRatio,
-
303  const Eigen::Vector3d & momentOrigin = Eigen::Vector3d::Zero());
-
304 
-
310 std::vector<sva::ForceVecd> calcLocalWrenchList(const std::vector<std::shared_ptr<Contact>> & contactList,
-
311  const Eigen::VectorXd & wrenchRatio);
-
312 
-
321 template<template<class...> class MapType, class KeyType, class... RestTypes>
-
322 MapType<KeyType, sva::ForceVecd> calcWrenchList(
-
323  const MapType<KeyType, std::shared_ptr<Contact>, RestTypes...> & contactList,
-
324  const Eigen::VectorXd & wrenchRatio,
-
325  const Eigen::Vector3d & momentOrigin = Eigen::Vector3d::Zero());
-
326 
-
333 template<template<class...> class MapType, class KeyType, class... RestTypes>
-
334 std::vector<std::shared_ptr<Contact>> getContactVecFromMap(
-
335  const MapType<KeyType, std::shared_ptr<Contact>, RestTypes...> & contactList);
-
336 } // namespace ForceColl
-
337 
-
338 #include <ForceColl/Contact.hpp>
+
272  void updateLocalVertices(const std::vector<sva::PTransformd> & localVertices);
+
273 
+
275  virtual void updateGlobalVertices(const sva::PTransformd & pose) override;
+
276 
+
284  virtual void addToGUI(mc_rtc::gui::StateBuilder & gui,
+
285  const std::vector<std::string> & category,
+
286  double forceScale = constants::defaultForceScale,
+
287  double fricPyramidScale = constants::defaultFricPyramidScale,
+
288  const Eigen::VectorXd & wrenchRatio = Eigen::VectorXd::Zero(0)) override;
+
289 };
+
290 
+
297 sva::ForceVecd calcTotalWrench(const std::vector<std::shared_ptr<Contact>> & contactList,
+
298  const Eigen::VectorXd & wrenchRatio,
+
299  const Eigen::Vector3d & momentOrigin = Eigen::Vector3d::Zero());
+
300 
+
307 std::vector<sva::ForceVecd> calcWrenchList(const std::vector<std::shared_ptr<Contact>> & contactList,
+
308  const Eigen::VectorXd & wrenchRatio,
+
309  const Eigen::Vector3d & momentOrigin = Eigen::Vector3d::Zero());
+
310 
+
316 std::vector<sva::ForceVecd> calcLocalWrenchList(const std::vector<std::shared_ptr<Contact>> & contactList,
+
317  const Eigen::VectorXd & wrenchRatio);
+
318 
+
327 template<template<class...> class MapType, class KeyType, class... RestTypes>
+
328 MapType<KeyType, sva::ForceVecd> calcWrenchList(
+
329  const MapType<KeyType, std::shared_ptr<Contact>, RestTypes...> & contactList,
+
330  const Eigen::VectorXd & wrenchRatio,
+
331  const Eigen::Vector3d & momentOrigin = Eigen::Vector3d::Zero());
+
332 
+
339 template<template<class...> class MapType, class KeyType, class... RestTypes>
+
340 std::vector<std::shared_ptr<Contact>> getContactVecFromMap(
+
341  const MapType<KeyType, std::shared_ptr<Contact>, RestTypes...> & contactList);
+
342 } // namespace ForceColl
+
343 
+
344 #include <ForceColl/Contact.hpp>
virtual std::string type() const =0
Get type of contact.
constexpr double defaultForceScale
Default scale of force markers.
Definition: Constants.h:8
sva::ForceVecd calcTotalWrench(const std::vector< std::shared_ptr< Contact >> &contactList, const Eigen::VectorXd &wrenchRatio, const Eigen::Vector3d &momentOrigin=Eigen::Vector3d::Zero())
Calculate total wrench.
-
std::vector< sva::PTransformd > localVertices_
List of local verticies.
Definition: Contact.h:239
+
std::vector< sva::PTransformd > localVertices_
List of local verticies.
Definition: Contact.h:242
int ridgeNum() const
Number of ridges.
Definition: Contact.h:29
EIGEN_MAKE_ALIGNED_OPERATOR_NEW SurfaceContact(const std::string &name, double fricCoeff, const std::vector< Eigen::Vector3d > &localVertices, const sva::PTransformd &pose, std::optional< sva::ForceVecd > maxWrench=std::nullopt)
Constructor.
sva::ForceVecd calcLocalWrench(const Eigen::VectorXd &wrenchRatio) const
Calculate the local wrench.
@@ -292,6 +296,7 @@
std::vector< sva::ForceVecd > calcLocalWrenchList(const std::vector< std::shared_ptr< Contact >> &contactList, const Eigen::VectorXd &wrenchRatio)
Calculate local contact wrench list.
EIGEN_MAKE_ALIGNED_OPERATOR_NEW Contact(const std::string &name, std::optional< sva::ForceVecd > maxWrench=std::nullopt)
Constructor.
+
void updateLocalVertices(const std::vector< sva::PTransformd > &localVertices)
Update localVertices_ and localGraspMat_ according to the input pose.
EIGEN_MAKE_ALIGNED_OPERATOR_NEW Eigen::Vector3d vertex
Vertex.
Definition: Contact.h:49
std::string name_
Name of contact.
Definition: Contact.h:120
virtual void updateGlobalVertices(const sva::PTransformd &pose) override
Update graspMat_ and vertexWithRidgeList_ according to the input pose.
@@ -301,9 +306,10 @@
virtual std::string type() const override
Get type of contact.
Definition: Contact.h:155
std::vector< Eigen::Vector3d > calcGlobalRidgeList(const Eigen::Matrix3d &rot) const
Calculate ridge vector list in global coordinates.
Empty contact.
Definition: Contact.h:139
+
void updateLocalVertices(const std::vector< Eigen::Vector3d > &localVertices)
Update localVertices_ and localGraspMat_ according to the input pose.
sva::ForceVecd calcWrench(const Eigen::VectorXd &wrenchRatio, const Eigen::Vector3d &momentOrigin=Eigen::Vector3d::Zero()) const
Calculate wrench.
EIGEN_MAKE_ALIGNED_OPERATOR_NEW GraspContact(const std::string &name, double fricCoeff, const std::vector< sva::PTransformd > &localVertices, const sva::PTransformd &pose, std::optional< sva::ForceVecd > maxWrench=std::nullopt)
Constructor.
-
Grasp contact.
Definition: Contact.h:227
+
Grasp contact.
Definition: Contact.h:230
static void loadVerticesMap(const mc_rtc::Configuration &mcRtcConfig)
Load map of surface vertices in local coordinates.
std::vector< sva::ForceVecd > calcWrenchList(const std::vector< std::shared_ptr< Contact >> &contactList, const Eigen::VectorXd &wrenchRatio, const Eigen::Vector3d &momentOrigin=Eigen::Vector3d::Zero())
Calculate contact wrench list.
virtual void addToGUI(mc_rtc::gui::StateBuilder &gui, const std::vector< std::string > &category, double forceScale=constants::defaultForceScale, double fricPyramidScale=constants::defaultFricPyramidScale, const Eigen::VectorXd &wrenchRatio=Eigen::VectorXd::Zero(0)) override
Add markers to GUI.
@@ -316,7 +322,7 @@
Definition: Constants.h:3
virtual void updateGlobalVertices(const sva::PTransformd &pose) override
Update graspMat_ and vertexWithRidgeList_ according to the input pose.
Vertex with ridges.
Definition: Contact.h:44
-
virtual std::string type() const override
Get type of contact.
Definition: Contact.h:263
+
virtual std::string type() const override
Get type of contact.
Definition: Contact.h:266
static std::shared_ptr< Contact > makeSharedFromConfig(const mc_rtc::Configuration &mcRtcConfig)
Make shared pointer from mc_rtc configuration.
static std::unordered_map< std::string, std::vector< Eigen::Vector3d > > verticesMap
Map of surface vertices in local coordinates.
Definition: Contact.h:177
VertexWithRidge(const Eigen::Vector3d &_vertex, const std::vector< Eigen::Vector3d > &_ridgeList)
Constructor.
Definition: Contact.h:58
@@ -324,7 +330,7 @@
Friction pyramid.
Definition: Contact.h:14
std::vector< Eigen::Vector3d > localRidgeList_
Local ridge list.
Definition: Contact.h:36
constexpr double defaultFricPyramidScale
Default scale of friction pyramid markers.
Definition: Constants.h:11
-
static std::unordered_map< std::string, std::vector< sva::PTransformd > > verticesMap
Map of grasp vertices in local coordinates.
Definition: Contact.h:236
+
static std::unordered_map< std::string, std::vector< sva::PTransformd > > verticesMap
Map of grasp vertices in local coordinates.
Definition: Contact.h:239
int ridgeNum() const
Get the number of ridges.
Definition: Contact.h:83
static void loadVerticesMap(const mc_rtc::Configuration &mcRtcConfig)
Load map of grasp vertices in local coordinates.
diff --git a/doxygen/classForceColl_1_1GraspContact-members.html b/doxygen/classForceColl_1_1GraspContact-members.html index c099016..73bacbf 100644 --- a/doxygen/classForceColl_1_1GraspContact-members.html +++ b/doxygen/classForceColl_1_1GraspContact-members.html @@ -96,8 +96,9 @@ ridgeNum() constForceColl::Contactinline type() const overrideForceColl::GraspContactinlinevirtual updateGlobalVertices(const sva::PTransformd &pose) overrideForceColl::GraspContactvirtual - vertexWithRidgeList_ForceColl::Contact - verticesMapForceColl::GraspContactinlinestatic + updateLocalVertices(const std::vector< sva::PTransformd > &localVertices)ForceColl::GraspContact + vertexWithRidgeList_ForceColl::Contact + verticesMapForceColl::GraspContactinlinestatic