Skip to content

Commit 9d0c5c1

Browse files
Finalize removal of liblog4cxx dependency
1 parent 88d3fe7 commit 9d0c5c1

1 file changed

Lines changed: 0 additions & 47 deletions

File tree

include/roboptim/trajectory/b-spline.hxx

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,6 @@ namespace trajectory
221221
typename BSpline<N>::cox_map
222222
BSpline<N>::cox_de_boor (size_type j, size_type n) const
223223
{
224-
ROBOPTIM_DEBUG_ONLY(std::stringstream label;
225-
label << "[j=" << j << "/n=" << n << "]");
226-
227224
if (n == 0) //end of recursion
228225
{
229226
cox_map map;
@@ -233,10 +230,6 @@ namespace trajectory
233230
ROBOPTIM_DEBUG_ONLY (std::pair<cox_map_itr_t BOOST_PP_COMMA() bool> ptr =)
234231
map.insert (std::make_pair (j, polynomial_t (0., temp_params)));
235232

236-
ROBOPTIM_DEBUG_ONLY (LOG4CXX_DEBUG (this->logger,
237-
label.str() << "return(end) : "
238-
<< ptr.first->second));
239-
240233
return map;
241234
}
242235
else
@@ -253,53 +246,24 @@ namespace trajectory
253246
polynomial_t p_1_rat;
254247
if (tn > t0) p_1_rat = 1. / (tn - t0) * monomial_t (t0);
255248

256-
ROBOPTIM_DEBUG_ONLY (LOG4CXX_DEBUG (this->logger,
257-
label.str() << "p_1_rat : "
258-
<< p_1_rat));
259-
260249
cox_map p_1_cox = cox_de_boor (j, n - 1);
261250
cox_map p_1;
262251

263252
for (cox_map_itr_t itr = p_1_cox.begin (); itr != p_1_cox.end(); itr++)
264253
{
265-
ROBOPTIM_DEBUG_ONLY (LOG4CXX_DEBUG (this->logger,
266-
label.str()
267-
<< "p_1_cox : "
268-
<< itr->first
269-
<< " : " << itr->second));
270-
271254
polynomial_t p_prod = itr->second * p_1_rat;
272255

273-
ROBOPTIM_DEBUG_ONLY (LOG4CXX_DEBUG (this->logger,
274-
label.str() << "p_prod (1) : "
275-
<< p_prod));
276256
p_1.insert (std::make_pair (itr->first, p_prod));
277257
}
278258

279259
polynomial_t p_2_rat;
280260
if (tn1 > t1) p_2_rat = 1. / (t1 - tn1) * monomial_t (tn1);
281261

282-
ROBOPTIM_DEBUG_ONLY (LOG4CXX_DEBUG (this->logger,
283-
label.str() << "p_2_rat : "
284-
<< p_2_rat));
285-
286262
cox_map p_2_cox = cox_de_boor (j + 1, n - 1);
287263
cox_map p_2;
288264
for (cox_map_itr_t itr = p_2_cox.begin(); itr != p_2_cox.end(); itr++)
289265
{
290-
ROBOPTIM_DEBUG_ONLY (LOG4CXX_DEBUG (this->logger,
291-
label.str()
292-
<< "p_2_cox : "
293-
<< itr->first
294-
<< " : " << itr->second));
295-
296266
polynomial_t p_prod = itr->second * p_2_rat;
297-
298-
ROBOPTIM_DEBUG_ONLY (LOG4CXX_DEBUG (this->logger,
299-
label.str()
300-
<< "p_prod (2) : "
301-
<< p_prod));
302-
303267
p_2.insert (std::make_pair (itr->first, p_prod));
304268
}
305269

@@ -314,17 +278,6 @@ namespace trajectory
314278
p.insert (std::make_pair (itr->first, itr->second));
315279
}
316280

317-
ROBOPTIM_DEBUG_ONLY (LOG4CXX_DEBUG (this->logger,
318-
label.str()
319-
<< "result of recursion branch"));
320-
321-
for (cox_map_itr_t itr = p.begin(); itr != p.end(); itr++)
322-
{
323-
ROBOPTIM_DEBUG_ONLY (LOG4CXX_DEBUG (this->logger,
324-
label.str() << "B_" << j
325-
<< "_" << itr->first << " : "
326-
<< itr->second));
327-
}
328281
return p;
329282
}
330283
}

0 commit comments

Comments
 (0)