From 50a2ae0a42ccb4ad5e128979a48fb129b77f0a8e Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Tue, 12 Mar 2024 14:32:25 +0200 Subject: [PATCH] Changed float to double --- .../Arrangement_on_surface_2_earth/Aos.cpp | 2 +- .../demo/Arrangement_on_surface_2_earth/Aos.h | 4 ++-- .../Arrangement_on_surface_2_earth/Timer.h | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.cpp index dc37cf6821e..b38650de8a1 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.cpp @@ -1836,7 +1836,7 @@ std::string Aos::locate_country(Arr_handle arrh, const QVector3D& point) { } Aos::Approx_arcs -Aos::get_approx_arcs_from_faces_edges(Arr_handle arrh, float error) { +Aos::get_approx_arcs_from_faces_edges(Arr_handle arrh, double error) { auto& arr = *reinterpret_cast(arrh.get()); auto ctr_cv = s_traits.construct_curve_2_object(); Curves xcvs; diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.h index ef8cf7ffd1d..af4b9c2d2ff 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Aos.h @@ -76,9 +76,9 @@ public: static std::string locate_country(Arr_handle arrh, const QVector3D& point); // this will get the approximate arcs of face-edges from the arrangement - // NOTE: this is similar to "get_approx_arcs(KML::Placemarks&, float)" above! + // NOTE: this is similar to "get_approx_arcs(KML::Placemarks&, double)" above! static Approx_arcs get_approx_arcs_from_faces_edges(Arr_handle arrh, - float error); + double error); }; #endif diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Timer.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Timer.h index d1a5f2a8e87..1c0606be591 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Timer.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/Timer.h @@ -20,13 +20,13 @@ public: void reset() { m_Start = std::chrono::high_resolution_clock::now(); } - float elapsed() { + double elapsed() { return std::chrono::duration_cast( - std::chrono::high_resolution_clock::now() - m_Start).count() - * 0.001f * 0.001f * 0.001f; + std::chrono::high_resolution_clock::now() - m_Start).count() * + 0.001 * 0.001 * 0.001; } - float elapsed_millis() { return elapsed() * 1000.0f; } + double elapsed_millis() { return elapsed() * 1000.0f; } private: std::chrono::time_point m_Start; @@ -34,16 +34,16 @@ private: class ScopedTimer { public: - ScopedTimer(const std::string& name) : m_Name(name) {} + ScopedTimer(const std::string& name) : m_name(name) {} ~ScopedTimer() { - float time = m_Timer.elapsed_millis(); - std::cout << "[TIMER] " << m_Name << " - " << time << "ms\n"; + double time = m_timer.elapsed_millis(); + std::cout << "[TIMER] " << m_name << " - " << time << "ms\n"; } private: - std::string m_Name; - Timer m_Timer; + std::string m_name; + Timer m_timer; };