From 471e030a90b2b0e41373976b6fff80fcfd50169e Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Fri, 12 Feb 2016 13:23:27 +0100
Subject: [PATCH] Clean code
---
include/hpp/manipulation/graph/graph-component.hh | 4 ++--
include/hpp/manipulation/graph/node.hh | 8 --------
src/graph/node.cc | 10 ----------
3 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/include/hpp/manipulation/graph/graph-component.hh b/include/hpp/manipulation/graph/graph-component.hh
index 16480b67..1191a944 100644
--- a/include/hpp/manipulation/graph/graph-component.hh
+++ b/include/hpp/manipulation/graph/graph-component.hh
@@ -86,7 +86,7 @@ namespace hpp {
const NumericalConstraints_t& numericalConstraints() const;
/// Get a reference to the NumericalConstraints_t
- const std::vector <SizeIntervals_t>& passiveDofs() const;
+ const IntervalsContainer_t& passiveDofs() const;
/// Get a reference to the LockedJoints_t
const LockedJoints_t& lockedJoints () const;
@@ -110,7 +110,7 @@ namespace hpp {
/// Stores the numerical constraints.
NumericalConstraints_t numericalConstraints_;
/// Stores the passive dofs for each numerical constraints.
- std::vector <SizeIntervals_t> passiveDofs_;
+ IntervalsContainer_t passiveDofs_;
/// List of LockedJoint constraints
LockedJoints_t lockedJoints_;
/// A weak pointer to the parent graph.
diff --git a/include/hpp/manipulation/graph/node.hh b/include/hpp/manipulation/graph/node.hh
index 16eaf2f3..b5c6c590 100644
--- a/include/hpp/manipulation/graph/node.hh
+++ b/include/hpp/manipulation/graph/node.hh
@@ -54,14 +54,6 @@ namespace hpp {
/// Create a new node.
static NodePtr_t create (const std::string& name);
- /// Create a link from this node to the given node.
- /// \deprecated Use Edge->node(NodePtr_t) to give the node.
- EdgePtr_t linkTo (const std::string& name, const NodePtr_t& to,
- const Weight_t& w = 1,
- const bool& isInNodeFrom = false,
- EdgeFactory create = Edge::create)
- HPP_MANIPULATION_DEPRECATED;
-
/// Create a link from this node to the given node.
/// \param w if strictly negative, the edge is not included in the neighbor
/// list. Otherwise, it is included with Weight_t w
diff --git a/src/graph/node.cc b/src/graph/node.cc
index 50932ea8..f56672cc 100644
--- a/src/graph/node.cc
+++ b/src/graph/node.cc
@@ -50,16 +50,6 @@ namespace hpp {
wkPtr_ = weak;
}
- EdgePtr_t Node::linkTo(const std::string& name, const NodePtr_t& to,
- const Weight_t& w, const bool& isInNodeFrom,
- EdgeFactory create)
- {
- EdgePtr_t newEdge = create(name, graph_, wkPtr_, to);
- neighbors_.insert (newEdge, w);
- newEdge->isInNodeFrom (isInNodeFrom);
- return newEdge;
- }
-
EdgePtr_t Node::linkTo(const std::string& name, const NodePtr_t& to,
const size_type& w, EdgeFactory create)
{
--
GitLab