diff options
Diffstat (limited to 'benchmark/function/source_function.benchmark.cpp')
-rw-r--r-- | benchmark/function/source_function.benchmark.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/benchmark/function/source_function.benchmark.cpp b/benchmark/function/source_function.benchmark.cpp index a5d2f95487..2164b2a418 100644 --- a/benchmark/function/source_function.benchmark.cpp +++ b/benchmark/function/source_function.benchmark.cpp @@ -4,7 +4,7 @@ #include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/json.hpp> -#include <mbgl/style/conversion/data_driven_property_value.hpp> +#include <mbgl/style/conversion/property_value.hpp> using namespace mbgl; using namespace mbgl::style; @@ -22,13 +22,13 @@ static std::string createFunctionJSON(size_t stopCount) { static void Parse_SourceFunction(benchmark::State& state) { size_t stopCount = state.range(0); - + while (state.KeepRunning()) { conversion::Error error; state.PauseTiming(); auto doc = createFunctionJSON(stopCount); state.ResumeTiming(); - optional<DataDrivenPropertyValue<float>> result = conversion::convertJSON<DataDrivenPropertyValue<float>>(doc, error, false); + optional<PropertyValue<float>> result = conversion::convertJSON<PropertyValue<float>>(doc, error, true, false); if (!result) { state.SkipWithError(error.message.c_str()); } @@ -40,15 +40,15 @@ static void Evaluate_SourceFunction(benchmark::State& state) { size_t stopCount = state.range(0); auto doc = createFunctionJSON(stopCount); conversion::Error error; - optional<DataDrivenPropertyValue<float>> function = conversion::convertJSON<DataDrivenPropertyValue<float>>(doc, error, false); + optional<PropertyValue<float>> function = conversion::convertJSON<PropertyValue<float>>(doc, error, true, false); if (!function) { state.SkipWithError(error.message.c_str()); } - + while(state.KeepRunning()) { function->asExpression().evaluate(StubGeometryTileFeature(PropertyMap { { "x", static_cast<int64_t>(rand() % 100) } }), -1.0f); } - + state.SetLabel(std::to_string(stopCount).c_str()); } |