Improved display_coordinate type

Author: stevenewald

CMakeLists.txt

@@ -14,7 +14,7 @@ include(cmake/project-is-top-level.cmake)
 include(cmake/variables.cmake)
 
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -mavx512f -mavx512dq -mavx512vl -mavx512bf16")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mavx512f -mavx512dq -mavx512vl -mavx512bf16")
 # add_compile_options(-fno-inline -fno-omit-frame-pointer)
 
 
@@ -29,6 +29,7 @@ add_library(
     source/graphics/aspect_ratio/aspect_ratio.cpp
     source/mandelbrot/equations_simd.cpp
     source/mandelbrot/equations.cpp
+    source/units/coordinates.cpp
 )
 
 target_include_directories(

CMakePresets.json

@@ -59,7 +59,7 @@
       "description": "These flags are supported by both GCC and Clang",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "-D_GLIBCXX_ASSERTIONS=1 -fstack-protector-strong -fcf-protection=full -fstack-clash-protection -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wshadow -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wimplicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast",
+        "CMAKE_CXX_FLAGS": "-D_GLIBCXX_ASSERTIONS=1 -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wshadow -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wimplicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast",
         "CMAKE_EXE_LINKER_FLAGS": "-Wl,--allow-shlib-undefined,--as-needed,-z,noexecstack,-z,relro,-z,now,-z,nodlopen",
         "CMAKE_SHARED_LINKER_FLAGS": "-Wl,--allow-shlib-undefined,--as-needed,-z,noexecstack,-z,relro,-z,now,-z,nodlopen"
       }
@@ -68,7 +68,7 @@
       "name": "flags-appleclang",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "-fstack-protector-strong -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wshadow -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wimplicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast"
+        "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wshadow -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wimplicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast"
       }
     },
     {

Taskfile.yml

@@ -2,7 +2,7 @@ version: '3'
 
 vars:
   NAME: fractal-generator
-  RELEASE_BUILD: "true"
+  RELEASE_BUILD: "false"
   RELEASE_PRESET: "ci-ubuntu"
 
 tasks:
@@ -60,7 +60,7 @@ tasks:
     dir: .
     cmds:
       - task: build
-      - ./build/benchmark/fractal_benchmarks
+      - taskset -c 0 ./build/benchmark/fractal_benchmarks --benchmark_repetitions=5 --benchmark_min_warmup_time=0.5 --benchmark_report_aggregates_only=true
 
   fmt:
     dir: .

benchmark/source/bench.cpp

@@ -1,5 +1,5 @@
 #include "config.hpp"
-#include "coordinates.hpp"
+#include "units/coordinates.hpp"
 #include "graphics/display_to_complex.hpp"
 #include "mandelbrot/equations.hpp"
 #include "mandelbrot/equations_simd.hpp"
@@ -11,7 +11,7 @@ using namespace fractal;
 
 static void BM_GenerateMandelbrot(benchmark::State& state)
 {
-    display_domain display = {
+    DisplayDomain display = {
         {0,   0  },
         {800, 800}
     };
@@ -32,7 +32,7 @@ static void BM_GenerateMandelbrot(benchmark::State& state)
 
 static void BM_GenerateMandelbrotSimd(benchmark::State& state)
 {
-    display_domain display = {
+    DisplayDomain display = {
         {0,   0  },
         {800, 800}
     };

source/config.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "coordinates.hpp"
+#include "units/coordinates.hpp"
 #include "units/units.hpp"
 
 #include <cstddef>

source/graphics/aspect_ratio/aspect_ratio.cpp

@@ -6,8 +6,8 @@ display_coordinate calculate_rectangle_end_point(
     display_coordinate start, display_coordinate current, float target_aspect_ratio
 )
 {
-    auto width = static_cast<float>(std::abs(current.first - start.first));
-    auto height = static_cast<float>(std::abs(current.second - start.second));
+    auto width = static_cast<float>(std::abs(current.x - start.x));
+    auto height = static_cast<float>(std::abs(current.y - start.y));
 
     // Adjust the dimensions to maintain the target aspect ratio
     if (width / height > target_aspect_ratio) {
@@ -19,15 +19,15 @@ display_coordinate calculate_rectangle_end_point(
         height = width / target_aspect_ratio;
     }
 
-    auto new_x = static_cast<float>(std::min(current.first, start.first));
-    auto new_y = static_cast<float>(std::min(current.second, start.second));
+    auto new_x = static_cast<float>(std::min(current.x, start.x));
+    auto new_y = static_cast<float>(std::min(current.y, start.y));
 
     // Adjust the top-left corner based on new dimensions
-    if (current.first < start.first) {
-        new_x = static_cast<float>(start.first) - width;
+    if (current.x < start.x) {
+        new_x = static_cast<float>(start.x) - width;
     }
-    if (current.second < start.second) {
-        new_y = static_cast<float>(start.second) - height;
+    if (current.y < start.y) {
+        new_y = static_cast<float>(start.y) - height;
     }
 
     // Return the top-left and bottom-right corners as a pair of sf::Vector2f

source/graphics/aspect_ratio/aspect_ratio.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "config.hpp"
-#include "coordinates.hpp"
+#include "units/coordinates.hpp"
 
 namespace fractal {
 display_coordinate calculate_rectangle_end_point(

source/graphics/display/display.cpp

@@ -41,7 +41,7 @@ void PixelDisplay::handle_event_(const sf::Event& event)
     }
 }
 
-void PixelDisplay::add_observer(std::unique_ptr<DisplayEventObserver> observer)
+void PixelDisplay::add_drawable(std::unique_ptr<DisplayEventObserver> observer)
 {
     observers_.push_back(std::move(observer));
 }

source/graphics/display/display.hpp

@@ -21,7 +21,7 @@ class PixelDisplay {
 public:
     explicit PixelDisplay();
 
-    void add_observer(std::unique_ptr<DisplayEventObserver> observer);
+    void add_drawable(std::unique_ptr<DisplayEventObserver> observer);
 
     void poll_window_events();
     void display_window();

source/graphics/display_to_complex.hpp

@@ -1,14 +1,14 @@
 #pragma once
 
-#include "coordinates.hpp"
+#include "units/display_domain.hpp"
 #include "units/units.hpp"
 #include "units/units_avx.hpp"
 
 #include <complex>
 
 namespace fractal {
 class DisplayToComplexCoordinates {
-    const display_domain DISPLAY_DOMAIN;
+    const DisplayDomain DISPLAY_DOMAIN;
     complex_underlying real_scaling_factor_;
     complex_underlying imaginary_scaling_factor_;
     complex_coordinate complex_domain_start_;
@@ -19,7 +19,7 @@ class DisplayToComplexCoordinates {
     )
     {
         complex_underlying real_d_size = real_domain_size(complex_domain);
-        return real_d_size / static_cast<complex_underlying>(display_top_right.first);
+        return real_d_size / static_cast<complex_underlying>(display_top_right.x);
     }
 
     static complex_underlying imaginary_scaling_factor(
@@ -28,43 +28,45 @@ class DisplayToComplexCoordinates {
     )
     {
         complex_underlying imaginary_d_size = imaginary_domain_size(complex_domain);
-        return imaginary_d_size
-               / static_cast<complex_underlying>(display_top_right.second);
+        return imaginary_d_size / static_cast<complex_underlying>(display_top_right.y);
     }
 
     static complex_coordinate to_complex(display_coordinate coordinate)
     {
         return {
-            static_cast<complex_underlying>(coordinate.first),
-            static_cast<complex_underlying>(coordinate.second)
+            static_cast<complex_underlying>(coordinate.x),
+            static_cast<complex_underlying>(coordinate.y)
         };
     }
 
 public:
     DisplayToComplexCoordinates(
-        display_domain display_domain, const complex_domain& complex_domain
+        const DisplayDomain& display_domain, const complex_domain& complex_domain
     ) :
-        DISPLAY_DOMAIN{std::move(display_domain)},
+        DISPLAY_DOMAIN{display_domain},
         real_scaling_factor_(
-            real_scaling_factor(display_domain.end_coordinate, complex_domain)
-        ),
-        imaginary_scaling_factor_(
-            imaginary_scaling_factor(display_domain.end_coordinate, complex_domain)
+            real_scaling_factor(display_domain.get_end_coordinate(), complex_domain)
         ),
+        imaginary_scaling_factor_(imaginary_scaling_factor(
+            display_domain.get_end_coordinate(), complex_domain
+        )),
         complex_domain_start_(complex_domain.start_coordinate)
     {}
 
-    void update_display_domain(display_domain new_domain)
+    void update_display_domain(const DisplayDomain& new_domain)
     {
         complex_coordinate new_start =
-            to_complex_projection(new_domain.start_coordinate);
-        complex_coordinate new_end = to_complex_projection(new_domain.end_coordinate);
+            to_complex_projection(new_domain.get_start_coordinate());
+        complex_coordinate new_end =
+            to_complex_projection(new_domain.get_end_coordinate());
         complex_domain new_complex_domain = {new_start, new_end};
 
-        real_scaling_factor_ =
-            real_scaling_factor(DISPLAY_DOMAIN.end_coordinate, new_complex_domain);
-        imaginary_scaling_factor_ =
-            imaginary_scaling_factor(DISPLAY_DOMAIN.end_coordinate, new_complex_domain);
+        real_scaling_factor_ = real_scaling_factor(
+            DISPLAY_DOMAIN.get_end_coordinate(), new_complex_domain
+        );
+        imaginary_scaling_factor_ = imaginary_scaling_factor(
+            DISPLAY_DOMAIN.get_end_coordinate(), new_complex_domain
+        );
         complex_domain_start_ = new_complex_domain.start_coordinate;
     }