Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(Boost REQUIRED CONFIG)
find_package(cgal REQUIRED CONFIG)
find_package(nlohmann_json REQUIRED CONFIG)
find_package(simdjson REQUIRED CONFIG)
find_package(argparse REQUIRED CONFIG)
find_package(vincentlaucsb-csv-parser REQUIRED CONFIG)
find_package(indicators REQUIRED CONFIG)
Expand All @@ -32,6 +33,7 @@ target_link_libraries(cartogram_lib
CGAL::CGAL
boost::boost
nlohmann_json::nlohmann_json
simdjson::simdjson
argparse::argparse
vincentlaucsb-csv-parser::vincentlaucsb-csv-parser
indicators::indicators
Expand Down
1 change: 1 addition & 0 deletions conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ cgal/6.0.1
vincentlaucsb-csv-parser/2.3.0
indicators/2.3
nlohmann_json/3.11.3
simdjson/3.12.3
boost/1.83.0
fftw/3.3.10
pkgconf/2.2.0
Expand Down
2 changes: 1 addition & 1 deletion include/cartogram_info.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class CartogramInfo
public:
explicit CartogramInfo(Arguments);
[[nodiscard]] double cart_initial_total_target_area() const;
void construct_inset_state_from_geodivs(const nlohmann::json &);
void construct_inset_state_from_geodivs(const simdjson::dom::element &);
bool converged() const;
[[nodiscard]] double area() const;
[[nodiscard]] bool is_world_map() const;
Expand Down
1 change: 1 addition & 0 deletions include/inset_state.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "nlohmann/json.hpp"
#include "parse_arguments.hpp"
#include "progress_tracker.hpp"
#include "simdjson.h"
#include "time_tracker.hpp"
#include <boost/multi_array.hpp>

Expand Down
Loading