Commit graph

195 commits

Author SHA1 Message Date
artemp
392ff1a70a Merge branch 'master' into spirit-x3 2016-06-23 16:47:45 +01:00
Dane Springmeyer
abe943c983 revert geometry changes for now - will develop them in branch to reduce downstream breakage 2016-04-11 14:00:27 -07:00
artemp
caa03d78bd move geometry_adapters.hpp to geometry/boost_geometry_adapters.hpp 2016-04-11 15:14:52 +02:00
Dane Springmeyer
1582f681ae fix -Wheader-hygiene warnings 2016-03-10 13:40:48 -08:00
Dane Springmeyer
2eb24c970a avoid -Wdeprecated and -Wreserved-id-macro warnings 2016-03-09 16:11:17 -08:00
Dane Springmeyer
daa1012e02 disable benchmarks from running on travis - refs #3351 2016-03-08 15:02:53 +01:00
Dane Springmeyer
37b26c28b6 disable benchmarks from running on travis - refs #3351 2016-03-04 12:36:57 -08:00
artemp
65e81848ba Merge branch 'master' into spirit-x3 2016-03-03 12:04:55 +01:00
Dane Springmeyer
72459b3140 Merge branch 'master' of github.com:mapnik/mapnik into faster-csv-compile 2016-03-02 11:10:23 -08:00
artemp
5ef5444fff Merge branch 'master' into spirit-x3 2016-03-01 14:12:19 +01:00
Mickey Rose
930056f5db benchmarks: fix over-width number formatting issue 2016-02-28 01:04:35 +01:00
Mickey Rose
db58b8b578 benchmarks: synchronize threads before starting the benchmark 2016-02-28 00:28:00 +01:00
Mickey Rose
02286bb7d1 benchmarks: report iterations per second instead of the inverse 2016-02-27 22:23:28 +01:00
Mickey Rose
3fdc799e84 benchmarks: rename option --log-severity to --log for consistency
- haven't noticed before that test/visual/run already had --log,
  and test/unit/run received that option recently

- pass --log=none by default in benchmark/run script
2016-02-27 22:19:08 +01:00
Dane Springmeyer
8ffee05048 Merge branch 'master' of github.com:mapnik/mapnik into faster-csv-compile 2016-02-24 16:42:23 -08:00
artemp
a4c4c5e542 Merge branch 'master' into spirit-x3 2016-02-17 12:11:53 +01:00
Mickey Rose
8762e1d034 benchmarks: add option --min-duration=SECONDS
- with this option test_runner() will be called repeatedly (doing the
  given number of --iterations each time) until SECONDS have elapsed

- added output column showing average time per iteration, should help
  when comparing different runs

- shrinked the # of iterations column using k/M suffixes
2016-02-17 01:30:32 +01:00
Mickey Rose
2f303e4da4 benchmarks: helper class for running a sequence of tests 2016-02-16 19:53:03 +01:00
Mickey Rose
29c4f730eb benchmarks: fix errors in non-compiling sources 2016-02-16 19:38:09 +01:00
Mickey Rose
ece5b93f08 benchmarks: add option --log-severity
this option is applied immediately after parsing args to override
MAPNIK_DEFAUL_LOG_SEVERITY
2016-02-16 18:37:24 +01:00
Mickey Rose
90fcdc90d3 benchmarks: fix output formatting
snprintf is a better tool for this task, anyway, but here's what was
wrong with the stream formatting:

s << name << ":" << std::setw(45 - (int)s.tellp())

cannot be used to align columns, tellp() may return any of:
    0
    name.length()
    name.length() + strlen(":")

because the compiler is allowed to reorder the evaluation of
sub-expressions as it likes -- it may evaluate s.tellp() before
evaluating (s << name) or in-between (s << name) and (s << ":")

try with gcc-4.8
2016-02-16 16:27:32 +01:00
Dane Springmeyer
85d4596769 move getline impl to separate header to avoid as much spirit inclusion 2016-02-15 19:06:11 -08:00
artemp
2a330740cf better targetted include directive 2015-12-02 14:32:55 +00:00
artemp
8fbcf58e98 increase number of expressions parsed to get more meaningful numbers 2015-12-02 13:09:02 +00:00
artemp
17b6597cd4 benchmark - update test_getline.cpp 2015-10-05 15:59:28 +01:00
Dane Springmeyer
336170c13c avoid excessive calling of std::ios::widen - refs #3101 2015-10-01 15:34:00 -07:00
Dane Springmeyer
da054c84e6 default values for getline bench + hook up in script - refs #3101 2015-10-01 15:08:49 -07:00
Dane Springmeyer
3932cc51b3 add getline benchmark - refs #3101 2015-10-01 14:47:55 -07:00
Dane Springmeyer
530416f0aa fix suggesed cmd line option syntax [skip ci] 2015-10-01 14:47:25 -07:00
bergwerkgis
9f62d8693a benchmark: no camelCase 2015-09-14 13:21:51 +00:00
bergwerkgis
3929d9298d Benchmark: use return values of test runner. 2015-09-14 13:01:32 +00:00
bergwerkgis
291089dec7 [skip ci] update paths to data in benchmark map.xmls 2015-09-14 12:51:38 +00:00
artemp
e076640493 update font version 2015-09-09 13:28:38 +02:00
artemp
68d73aa630 temp workaround boost 1.59 geometry 2015-08-19 12:30:07 +02:00
artemp
930893a877 benchmark - correct params 2015-07-30 11:04:17 +02:00
Dane Springmeyer
af0369d812 add no-op rendering benchmark - refs #2976 2015-07-15 12:59:54 -07:00
Jiri Drbalek
9cb43bf8e7 benchmark: remove duplicate code 2015-07-02 15:10:27 +00:00
artemp
7f3b88b11e benchmark (quad_tree) - add bbox query 2015-06-19 17:08:19 +02:00
artemp
6107ef8be0 benchmark - add quad_tree creation test 2015-06-19 14:19:04 +02:00
Dane Springmeyer
4483da6fd9 fix -Wshadow warning 2015-06-15 20:41:49 -07:00
Dane Springmeyer
563bd1adc7 use safe_cast to avoid -Wsign-conversion warnings 2015-06-15 20:41:48 -07:00
Dane Springmeyer
062ca091c0 benchmark for marker_cache - refs #2831 2015-06-15 20:41:47 -07:00
Dane Springmeyer
9cc76de27d benchmark: correctly position memory cleanup 2015-06-15 20:41:47 -07:00
Dane Springmeyer
2b02677cb5 Centralize memory/valgrind cleanup code 2015-06-15 20:41:46 -07:00
Dane Springmeyer
0d86afff36 start using -Wsign-compare and -Wshadow + fix heaps of warnings - refs #2907 2015-06-12 14:51:18 -07:00
Blake Thompson
eb5ca2af87 Merge branch 'offset' of github.com:mapnik/mapnik into offset 2015-06-08 17:13:58 -05:00
Blake Thompson
7aa7860b65 Added tests to offset 2015-06-08 17:13:02 -05:00
Blake Thompson
a138b8717d Removed angus clipper library from code and updated all visual tests to master 2015-06-02 14:14:21 -05:00
Blake Thompson
25c6576fdd Updated the way that multiply_alpha works, such that it is not clamped at the multiplier, but rather at the result of the multiplier and alpha. 2015-05-20 12:39:00 -05:00
Dane Springmeyer
126c777c8d shuffle around boost/geometry usage in headers to reduce compile time 2015-05-05 22:04:49 -07:00