Merge branch 'master' of https://github.com/alandefreitas/matplotplusplus

alandefreitas · alandefreitas · commit 5e69066306a0 · 2021-05-20T18:18:38.000-03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 #######################################################
 # Project information
 cmake_minimum_required(VERSION 3.14)
-project(matplotplusplus VERSION 1.0.2)
+project(matplotplusplus VERSION 1.1.0)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_C_STANDARD 11)
 set(MATPLOT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -64,6 +64,7 @@ option(WITH_SYSTEM_NODESOUP "Use system-provided nodesoup instead of bundled" OF
 #######################################################
 # In development, we can set some options for all targets
 if (MASTER_PROJECT)
+    message("Setting global options")
     # Maybe add sanitizers to all targets
     if (BUILD_WITH_SANITIZERS AND NOT EMSCRIPTEN)
         add_sanitizers()
@@ -81,13 +82,16 @@ if (MASTER_PROJECT)
 
     # MSVC hack to disable windows min/max
     # http://www.suodenjoki.dk/us/archive/2010/min-max.htm
-    if (BUILD_WITH_MSVC_HACKS)
+    if (MSVC AND BUILD_WITH_MSVC_HACKS)
         # Check for min in Windows.h
-        include(CheckSymbolExists)
-        check_symbol_exists(min "Windows.h" HAVE_WINDOWS_MINMAX)
-        if (HAVE_WINDOWS_MINMAX)
-            add_compile_definitions(NOMINMAX)
-        endif ()
+        # include(CheckSymbolExists)
+        # check_symbol_exists(min "WinDef.h" HAVE_WINDOWS_MINMAX)
+        # if (NOT HAVE_WINDOWS_MINMAX)
+        #     check_symbol_exists(min "Windows.h" HAVE_WINDOWS_MINMAX)
+        # endif ()
+        # if (HAVE_WINDOWS_MINMAX)
+        add_compile_definitions(NOMINMAX)
+        # endif ()
     endif ()
 endif()
 
diff --git a/cmake/functions/project_flags.cmake b/cmake/functions/project_flags.cmake
@@ -50,27 +50,35 @@ endmacro()
 # @brief Set the default optimization flags in case the user didn't
 #        explicitly choose it with -DCMAKE_CXX_FLAGS
 macro(set_optimization_flags)
-    if (NOT CMAKE_CXX_FLAGS)
+    set(OPT_FLAGS /O1 /O2 /Ob /Od /Og /Oi /Os /Ot /Ox /Oy /favor -O0 -O1 -O -O2 -O3 -Os -Ofast -Og)
+    set(OPTIMIZATION_FLAG_IS_SET OFF)
+    string(REPLACE " " ";" CMAKE_CXX_FLAGS_LIST ${CMAKE_CXX_FLAGS})
+    foreach(FLAG ${CMAKE_CXX_FLAGS_LIST})
+        if (${FLAG} IN_LIST OPT_FLAGS)
+            message("CXX optimization flag is already set to ${FLAG}")
+            set(OPTIMIZATION_FLAG_IS_SET ON)
+        endif()
+    endforeach()
+
+    if (NOT OPTIMIZATION_FLAG_IS_SET)
         if (CMAKE_BUILD_TYPE STREQUAL "Debug")
             if (EMSCRIPTEN)
-                list(APPEND CMAKE_CXX_FLAGS "-O0 -g4")
+                list(APPEND CMAKE_CXX_FLAGS " -O0 -g4")
             elseif (MSVC)
-                list(APPEND CMAKE_CXX_FLAGS "/O0")
+                list(APPEND CMAKE_CXX_FLAGS " /O0")
             elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-                list(APPEND CMAKE_CXX_FLAGS "-O0")
+                list(APPEND CMAKE_CXX_FLAGS " -O0")
             else()
                 # https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html
-                list(APPEND CMAKE_CXX_FLAGS "-Og")
+                list(APPEND CMAKE_CXX_FLAGS " -Og")
             endif()
         else()
             if (MSVC)
-                list(APPEND CMAKE_CXX_FLAGS "/O2")
+                list(APPEND CMAKE_CXX_FLAGS " /O2")
             else()
-                list(APPEND CMAKE_CXX_FLAGS "-O2")
+                list(APPEND CMAKE_CXX_FLAGS " -O2")
             endif()
         endif()
         message("Setting CXX flags to default for ${CMAKE_BUILD_TYPE} mode (${CMAKE_CXX_FLAGS})")
-    else()
-        message("CXX flags are already set to ${CMAKE_CXX_FLAGS}")
     endif()
 endmacro()
diff --git a/cmake/functions/target_options.cmake b/cmake/functions/target_options.cmake
@@ -64,14 +64,33 @@ function(target_utf8_options TARGET_NAME)
     target_msvc_compile_options(${TARGET_NAME} PRIVATE /utf-8)
 endfunction()
 
-# @brief Enable utf-8 for the target
+# @brief Disable minmax for target
 function(target_disable_minmax TARGET_NAME)
+    message("Checking if min exists for ${TARGET_NAME}")
     if (MSVC)
         # Another hack to check for min in Windows.h
         # http://www.suodenjoki.dk/us/archive/2010/min-max.htm
-        check_symbol_exists(min "Windows.h" HAVE_WINDOWS_MINMAX)
+        include(CheckSymbolExists)
+        message("Looking in WinDef.h")
+        check_symbol_exists(min "WinDef.h" HAVE_WINDOWS_MINMAX)
+        if (NOT HAVE_WINDOWS_MINMAX)
+            message("Looking in Windows.h")
+            check_symbol_exists(min "Windows.h" HAVE_WINDOWS_MINMAX)
+        endif()
         if (HAVE_WINDOWS_MINMAX)
             target_compile_definitions(${TARGET_NAME} PUBLIC NOMINMAX)
+        else()
+            message("MINMAX not found")
         endif()
+    else()
+        message("Compiler is not MSVC")
     endif()
+endfunction()
+
+# @brief Disable minmax for target
+# This forces the NOMINMAX definition without even looking for
+# min in WinDef.h. This is necessary because the solution
+# based on check_symbol_exists hasn't been enough.
+function(target_nominmax_definition TARGET_NAME)
+    target_compile_definitions(${TARGET_NAME} PUBLIC NOMINMAX)
 endfunction()
diff --git a/examples/annotations/rectangle/rectangle_1.cpp b/examples/annotations/rectangle/rectangle_1.cpp
@@ -12,7 +12,7 @@ int main() {
 
     auto r2 = rectangle(6.5, 4.5, 1, 1);
     r2->fill(true);
-    r2->color({0.8, 0, 0, 1});
+    r2->color({0.8f, 0.f, 0.f, 1.f});
 
     show();
     return 0;
diff --git a/examples/appearance/axes/axes_2.cpp b/examples/appearance/axes/axes_2.cpp
@@ -6,8 +6,8 @@
 
 int main() {
     using namespace matplot;
-    auto ax1 = axes({0.1, 0.1, 0.7, 0.7});
-    auto ax2 = axes({0.65, 0.65, 0.28, 0.28});
+    auto ax1 = axes({0.1f, 0.1f, 0.7f, 0.7f});
+    auto ax2 = axes({0.65f, 0.65f, 0.28f, 0.28f});
 
     auto [X, Y, Z] = peaks(20);
     contour(ax1, X, Y, Z);
diff --git a/examples/appearance/axes/axes_3.cpp b/examples/appearance/axes/axes_3.cpp
@@ -6,8 +6,8 @@
 
 int main() {
     using namespace matplot;
-    auto ax1 = axes({0.1, 0.1, 0.6, 0.6});
-    auto ax2 = axes({0.35, 0.35, 0.6, 0.6});
+    auto ax1 = axes({0.1f, 0.1f, 0.6f, 0.6f});
+    auto ax2 = axes({0.35f, 0.35f, 0.6f, 0.6f});
 
     ax1->box(true);
     ax2->box(true);
diff --git a/examples/appearance/camera/lighting/lighting_2.cpp b/examples/appearance/camera/lighting/lighting_2.cpp
@@ -4,7 +4,7 @@ int main() {
     using namespace matplot;
 
     auto [x, y, z] = peaks();
-    surf(x, y, z)->lighting(true).primary(0.2);
+    surf(x, y, z)->lighting(true).primary(0.2f);
 
     show();
     return 0;
diff --git a/examples/appearance/camera/lighting/lighting_3.cpp b/examples/appearance/camera/lighting/lighting_3.cpp
@@ -4,7 +4,7 @@ int main() {
     using namespace matplot;
 
     auto [x, y, z] = peaks();
-    surf(x, y, z)->lighting(true).primary(0.8);
+    surf(x, y, z)->lighting(true).primary(0.8f);
 
     show();
     return 0;
diff --git a/examples/appearance/camera/lighting/lighting_4.cpp b/examples/appearance/camera/lighting/lighting_4.cpp
@@ -4,7 +4,7 @@ int main() {
     using namespace matplot;
 
     auto [x, y, z] = peaks();
-    surf(x, y, z)->lighting(true).specular(0.2);
+    surf(x, y, z)->lighting(true).specular(0.2f);
 
     show();
     return 0;
diff --git a/examples/appearance/camera/lighting/lighting_5.cpp b/examples/appearance/camera/lighting/lighting_5.cpp
@@ -4,7 +4,7 @@ int main() {
     using namespace matplot;
 
     auto [x, y, z] = peaks();
-    surf(x, y, z)->lighting(true).specular(0.8);
+    surf(x, y, z)->lighting(true).specular(0.8f);
 
     show();
     return 0;
diff --git a/examples/appearance/camera/view/view_6.cpp b/examples/appearance/camera/view/view_6.cpp
@@ -10,7 +10,7 @@ int main() {
 
     gcf()->width(gcf()->width() * 2);
     subplot(1, 2, 0);
-    fsurf(ackley)->lighting(true).primary(0.7).specular(0.9);
+    fsurf(ackley)->lighting(true).primary(0.7f).specular(0.9f);
     subplot(1, 2, 1);
     fsurf(ackley);
     rotate(20, 30);
diff --git a/examples/appearance/colormaps/colorbar/colorbar_2.cpp b/examples/appearance/colormaps/colorbar/colorbar_2.cpp
@@ -5,7 +5,7 @@ int main() {
 
     auto [x, y, z] = peaks();
     contourf(x, y, z, 20);
-    gca()->cb_position({0, 0, 1, 0.06});
+    gca()->cb_position({0.f, 0.f, 1.f, 0.06f});
 
     show();
     return 0;
diff --git a/examples/appearance/figure/figure_2.cpp b/examples/appearance/figure/figure_2.cpp
@@ -14,8 +14,8 @@ int main() {
     h->font_size(40);
     h->title("My experiment");
 
-    constexpr double pi = 3.14;
-    axis({-pi, pi, -1.5, +1.5});
+    constexpr float pi_f = 3.14f;
+    axis({-pi_f, pi_f, -1.5f, +1.5f});
     fplot("cos(x)");
     h->draw();
     show();
diff --git a/examples/appearance/multiplot/subplot/subplot_11.cpp b/examples/appearance/multiplot/subplot/subplot_11.cpp
@@ -3,13 +3,13 @@
 int main() {
     using namespace matplot;
 
-    subplot({0.1, 0.3, 0.3, 0.3});
+    subplot({0.1f, 0.3f, 0.3f, 0.3f});
     std::vector<std::vector<double>> y = {
         {16, 5, 9, 4}, {2, 11, 7, 14}, {3, 10, 6, 15}, {13, 8, 12, 1}};
     plot(y);
     title("First Subplot");
 
-    subplot({0.5, 0.15, 0.4, 0.7});
+    subplot({0.5f, 0.15f, 0.4f, 0.7f});
     bar(y);
     title("Second Subplot");
 
diff --git a/examples/appearance/multiplot/subplot/subplot_5.cpp b/examples/appearance/multiplot/subplot/subplot_5.cpp
@@ -6,11 +6,11 @@
 
 int main() {
     using namespace matplot;
-    subplot({0.1, 0.3, 0.3, 0.3});
+    subplot({0.1f, 0.3f, 0.3f, 0.3f});
     fplot("sin(x)");
     title("First Subplot");
 
-    subplot({0.5, 0.15, 0.4, 0.7});
+    subplot({0.5f, 0.15f, 0.4f, 0.7f});
     fplot("cos(x)");
     title("Second Subplot");
 
diff --git a/examples/appearance/multiplot/subplot/subplot_7.cpp b/examples/appearance/multiplot/subplot/subplot_7.cpp
@@ -13,7 +13,7 @@ int main() {
 
     subplot(ax[1]);
     auto p = fplot("sin(x)");
-    p->line_spec().color({0.1, 0.5, 0.1});
+    p->line_spec().color({0.1f, 0.5f, 0.1f});
     p->line_spec().line_width(2);
     title("Second subplot");
     axis({0, 50, -1, 1});
diff --git a/examples/data_distribution/histogram/histogram_14.cpp b/examples/data_distribution/histogram/histogram_14.cpp
@@ -50,7 +50,7 @@ int main() {
     enum histogram::binning_algorithm alg =
         histogram::binning_algorithm::automatic;
     const size_t n_bins = 200;
-    const double hist_alpha = 0.7;
+    const float hist_alpha = 0.7f;
     std::default_random_engine r;
     std::mt19937 generator(r());
 
diff --git a/examples/data_distribution/histogram/histogram_15.cpp b/examples/data_distribution/histogram/histogram_15.cpp
@@ -8,7 +8,7 @@ int main() {
     using namespace matplot;
 
     auto ax_1 = axes();
-    auto ax_2 = axes({0.4, 0.4, 0.45, 0.45});
+    auto ax_2 = axes({0.4f, 0.4f, 0.45f, 0.45f});
 
     std::vector<int> stars = n_stars();
 
@@ -21,7 +21,7 @@ int main() {
     axes(ax_2);
     title(num2str(size_t(stars.size() * 0.1)) + " to " + num2str(stars.size()) +
           " Most Popular C++ Repositories");
-    stars.erase(stars.begin(), stars.begin() + stars.size() * 0.1);
+    stars.erase(stars.begin(), stars.begin() + static_cast<size_t>(stars.size() * 0.1));
     hist(stars);
 
     show();
diff --git a/examples/data_distribution/scatter/scatter_6.cpp b/examples/data_distribution/scatter/scatter_6.cpp
@@ -12,8 +12,8 @@ int main() {
     double sz = 6;
 
     auto l = scatter(x, y, sz);
-    l->marker_color({0, .5, .5});
-    l->marker_face_color({0, .7, .7});
+    l->marker_color({0.f, .5f, .5f});
+    l->marker_face_color({0.f, .7f, .7f});
 
     show();
     return 0;
diff --git a/examples/data_distribution/wordcloud/CMakeLists.txt b/examples/data_distribution/wordcloud/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_matplot_example(example_wordcloud_1 wordcloud_1.cpp)
-add_matplot_example(example_wordcloud_2 wordcloud_3.cpp)
-add_matplot_example(example_wordcloud_3 wordcloud_4.cpp)
+add_matplot_example(example_wordcloud_2 wordcloud_2.cpp)
+add_matplot_example(example_wordcloud_3 wordcloud_3.cpp)
 add_matplot_example(example_wordcloud_4 wordcloud_4.cpp)
diff --git a/examples/data_distribution/wordcloud/wordcloud_1.cpp b/examples/data_distribution/wordcloud/wordcloud_1.cpp
@@ -4,7 +4,9 @@ int main() {
     using namespace matplot;
 
     std::string text = fileread("shakespeare_sonnets.txt");
-    std::transform(text.begin(), text.end(), text.begin(), ::tolower);
+    std::transform(text.begin(), text.end(), text.begin(), [](char c) {
+        return static_cast<char>(std::tolower(static_cast<int>(c)));
+    });
 
     std::vector<std::string> black_list =
         tokenize(fileread("en_blacklist.txt"));
diff --git a/examples/data_distribution/wordcloud/wordcloud_2.cpp b/examples/data_distribution/wordcloud/wordcloud_2.cpp
@@ -4,7 +4,9 @@ int main() {
     using namespace matplot;
 
     std::string text = fileread("shakespeare_sonnets.txt");
-    std::transform(text.begin(), text.end(), text.begin(), ::tolower);
+    std::transform(text.begin(), text.end(), text.begin(), [](char c) {
+        return static_cast<char>(std::tolower(static_cast<int>(c)));
+    });
 
     std::vector<std::string> black_list =
         tokenize(fileread("en_blacklist.txt"));
diff --git a/examples/data_distribution/wordcloud/wordcloud_3.cpp b/examples/data_distribution/wordcloud/wordcloud_3.cpp
@@ -4,7 +4,8 @@ int main() {
     using namespace matplot;
 
     std::string text = fileread("shakespeare_sonnets.txt");
-    std::transform(text.begin(), text.end(), text.begin(), ::tolower);
+    std::transform(text.begin(), text.end(), text.begin(),
+                   [](char c) { return static_cast<char>(std::tolower(static_cast<int>(c))); });
 
     std::vector<std::string> black_list =
         tokenize(fileread("en_blacklist.txt"));
@@ -19,6 +20,6 @@ int main() {
     wordcloud(tokens, count);
     title("Shakespeare's sonnets - Big words");
 
-    show();
+    matplot::show();
     return 0;
 }
diff --git a/examples/data_distribution/wordcloud/wordcloud_4.cpp b/examples/data_distribution/wordcloud/wordcloud_4.cpp
@@ -4,7 +4,9 @@ int main() {
     using namespace matplot;
 
     std::string text = fileread("shakespeare_sonnets.txt");
-    std::transform(text.begin(), text.end(), text.begin(), ::tolower);
+    std::transform(text.begin(), text.end(), text.begin(), [](char c) {
+        return static_cast<char>(std::tolower(static_cast<int>(c)));
+    });
 
     std::vector<std::string> black_list =
         tokenize(fileread("en_blacklist.txt"));
diff --git a/examples/discrete_data/bar/bar_11.cpp b/examples/discrete_data/bar/bar_11.cpp
@@ -8,7 +8,7 @@ int main() {
     std::vector<double> y = {75,  91,  105, 123.5, 131,  150,
                              179, 203, 226, 249,   281.5};
 
-    bar(y)->face_color({0, .5, .5}).edge_color({0, .9, .9}).line_width(1.5);
+    bar(y)->face_color({0.f, .5f, .5f}).edge_color({0.f, .9f, .9f}).line_width(1.5f);
 
     show();
     return 0;
diff --git a/examples/discrete_data/bar/bar_13.cpp b/examples/discrete_data/bar/bar_13.cpp
@@ -8,7 +8,7 @@ int main() {
     std::vector<std::vector<double>> y = {
         {10, 30, 50}, {15, 35, 55}, {20, 40, 62}};
     auto b = bar(y);
-    b->face_colors()[2] = {0., .2, .6, .5};
+    b->face_colors()[2] = {0.f, .2f, .6f, .5f};
     gcf()->draw();
 
     show();
diff --git a/examples/geography/geoplot/geoplot_5.cpp b/examples/geography/geoplot/geoplot_5.cpp
@@ -19,10 +19,10 @@ int main() {
     text(lon_anchorage, lat_anchorage, "Anchorage");
     text(lon_seattle, lat_seattle, "Seattle");
 
-    color_array terrain = {0., 0.71, 0.65, 0.59};
+    color_array terrain = {0.f, 0.71f, 0.65f, 0.59f};
     geoplot()->color(terrain);
 
-    color_array blue_water = {0., 0.4, 0.61, 0.76};
+    color_array blue_water = {0.f, 0.4f, 0.61f, 0.76f};
     gca()->color(blue_water);
 
     show();
diff --git a/examples/geography/geoscatter/geoscatter_2.cpp b/examples/geography/geoscatter/geoscatter_2.cpp
@@ -15,10 +15,10 @@ int main() {
     geoscatter(lat, lon, A, C)
         ->marker_style(line_spec::marker_style::upward_pointing_triangle);
 
-    color_array terrain = {0., 0.71, 0.65, 0.59};
+    color_array terrain = {0.f, 0.71f, 0.65f, 0.59f};
     geoplot()->color(terrain);
 
-    color_array blue_water = {0., 0.4, 0.61, 0.76};
+    color_array blue_water = {0.f, 0.4f, 0.61f, 0.76f};
     gca()->color(blue_water);
 
     show();
diff --git a/examples/line_plot/area/area_3.cpp b/examples/line_plot/area/area_3.cpp
diff --git a/examples/line_plot/loglog/loglog_4.cpp b/examples/line_plot/loglog/loglog_4.cpp
diff --git a/examples/line_plot/loglog/loglog_9.cpp b/examples/line_plot/loglog/loglog_9.cpp
diff --git a/examples/line_plot/plot/plot_7.cpp b/examples/line_plot/plot/plot_7.cpp
diff --git a/examples/polar_plots/polarhistogram/polarhistogram_3.cpp b/examples/polar_plots/polarhistogram/polarhistogram_3.cpp
diff --git a/examples/surfaces/ribbon/ribbon_4.cpp b/examples/surfaces/ribbon/ribbon_4.cpp
diff --git a/source/matplot/CMakeLists.txt b/source/matplot/CMakeLists.txt
diff --git a/source/matplot/backend/gnuplot.cpp b/source/matplot/backend/gnuplot.cpp
diff --git a/source/matplot/core/axes_type.cpp b/source/matplot/core/axes_type.cpp
diff --git a/source/matplot/core/axes_type.h b/source/matplot/core/axes_type.h
diff --git a/source/matplot/freestanding/axes_functions.cpp b/source/matplot/freestanding/axes_functions.cpp
diff --git a/source/matplot/util/colors.h b/source/matplot/util/colors.h
