diff --git a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/evolution.h b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/evolution.h index 187415d02ed..477c1294fa1 100644 --- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/evolution.h +++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/evolution.h @@ -139,7 +139,7 @@ public: std::size_t gen_iter = 0; for(;;) { -#ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG +#ifdef CGAL_OPTIMAL_BOUNDING_BOX_DEBUG_PP std::cout << "- - - - generation #" << gen_iter << "\n"; #endif @@ -165,7 +165,7 @@ public: m_best_v = &(m_population.get_best_vertex()); 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 << "fitness: " << m_best_v->fitness() << std::endl; #endif @@ -177,7 +177,7 @@ public: const FT new_fit_value = m_best_v->fitness(); 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 << "new fit value: " << new_fit_value << std::endl; std::cout << "difference: " << difference << std::endl; diff --git a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h index 3424bae2017..b4f2ba4a7da 100644 --- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h +++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h @@ -163,7 +163,7 @@ void optimize_along_OBB_axes(typename Traits::Matrix& rot, auto it = std::min_element(volumes.begin(), volumes.end()); typename std::iterator_traits::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 << "angles: " << angles[0] << " " << angles[1] << " " << angles[2] << std::endl; std::cout << "min at " << d << std::endl; diff --git a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h index 6157e282c9b..0ebf2b207cb 100644 --- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h +++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h @@ -86,7 +86,12 @@ void construct_oriented_bounding_box(const PointRange& points, // Apply the inverse rotation to the rotated axis aligned bounding box for(std::size_t i=0; i<8; ++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