songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc verbose changes

This commit is contained in:
Mael Rouxel-Labbé 2020-03-25 18:47:30 +01:00
parent 31e478a33c
commit 34dd14ced4
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/evolution.h
View File

@ -139,7 +139,7 @@ public:
std::size_t gen_iter = 0; std::size_t gen_iter = 0;
for(;;) for(;;)
{ {
#ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG #ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG_PP
std::cout << "- - - - generation #" << gen_iter << "\n"; std::cout << "- - - - generation #" << gen_iter << "\n";
#endif #endif
@ -165,7 +165,7 @@ public:
m_best_v = &(m_population.get_best_vertex()); m_best_v = &(m_population.get_best_vertex());
Matrix& best_m = m_best_v->matrix(); Matrix& best_m = m_best_v->matrix();
#ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG #ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG_PP
std::cout << "new best matrix: " << std::endl << best_m << std::endl; std::cout << "new best matrix: " << std::endl << best_m << std::endl;
std::cout << "fitness: " << m_best_v->fitness() << std::endl; std::cout << "fitness: " << m_best_v->fitness() << std::endl;
#endif #endif
@ -177,7 +177,7 @@ public:
const FT new_fit_value = m_best_v->fitness(); const FT new_fit_value = m_best_v->fitness();
const FT difference = new_fit_value - prev_fit_value; const FT difference = new_fit_value - prev_fit_value;
#ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG #ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG_PP
std::cout << "post 2D optimization matrix: " << std::endl << best_m << std::endl; std::cout << "post 2D optimization matrix: " << std::endl << best_m << std::endl;
std::cout << "new fit value: " << new_fit_value << std::endl; std::cout << "new fit value: " << new_fit_value << std::endl;
std::cout << "difference: " << difference << std::endl; std::cout << "difference: " << difference << std::endl;

2
Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h
View File

@ -163,7 +163,7 @@ void optimize_along_OBB_axes(typename Traits::Matrix& rot,
auto it = std::min_element(volumes.begin(), volumes.end()); auto it = std::min_element(volumes.begin(), volumes.end());
typename std::iterator_traits<decltype(it)>::difference_type d = std::distance(volumes.begin(), it); typename std::iterator_traits<decltype(it)>::difference_type d = std::distance(volumes.begin(), it);
#ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG #ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG_PP
std::cout << "volumes: " << volumes[0] << " " << volumes[1] << " " << volumes[2] << std::endl; std::cout << "volumes: " << volumes[0] << " " << volumes[1] << " " << volumes[2] << std::endl;
std::cout << "angles: " << angles[0] << " " << angles[1] << " " << angles[2] << std::endl; std::cout << "angles: " << angles[0] << " " << angles[1] << " " << angles[2] << std::endl;
std::cout << "min at " << d << std::endl; std::cout << "min at " << d << std::endl;

5
Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h
View File

@ -86,7 +86,12 @@ void construct_oriented_bounding_box(const PointRange& points,
// Apply the inverse rotation to the rotated axis aligned bounding box // Apply the inverse rotation to the rotated axis aligned bounding box
for(std::size_t i=0; i<8; ++i) for(std::size_t i=0; i<8; ++i)
{
obb_points[i] = inverse_transformation.transform(obb_points[i]); obb_points[i] = inverse_transformation.transform(obb_points[i]);
#ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG
std::cout << " OBB[" << i << "] = " << obb_points[i] << std::endl;
#endif
}
} }
template <typename PointRange, typename Traits> template <typename PointRange, typename Traits>