null+****@clear*****
null+****@clear*****
2012年 6月 12日 (火) 16:05:33 JST
HAYASHI Kentaro 2012-06-12 16:05:33 +0900 (Tue, 12 Jun 2012)
New Revision: 13fff5fe749afcfbbce6f9abd9b285ee2263f8ca
Log:
test: add more benchmark patterns
refs #1388,#1389
Modified files:
test/benchmark/bench-geo-distance.c
Modified: test/benchmark/bench-geo-distance.c (+30 -0)
===================================================================
--- test/benchmark/bench-geo-distance.c 2012-06-12 14:48:30 +0900 (6d8a538)
+++ test/benchmark/bench-geo-distance.c 2012-06-12 16:05:33 +0900 (6af7768)
@@ -181,6 +181,32 @@ bench_setup_rectangular_wgs84_2nd_to_1st_quadrant_short(gpointer user_data)
}
static void
+bench_setup_rectangular_wgs84_1st_to_2nd_quadrant_long(gpointer user_data)
+{
+ BenchmarkData *data = user_data;
+
+ bench_setup_common(user_data);
+ bench_setup_points(user_data,
+ "128452975x503157902",
+ "135960000x-440760000",
+ GRN_DB_WGS84_GEO_POINT);
+ data->geo_distance_proc = GET(data->context, "geo_distance");
+}
+
+static void
+bench_setup_rectangular_wgs84_2nd_to_1st_quadrant_long(gpointer user_data)
+{
+ BenchmarkData *data = user_data;
+
+ bench_setup_common(user_data);
+ bench_setup_points(user_data,
+ "135960000x-440760000",
+ "128452975x503157902",
+ GRN_DB_WGS84_GEO_POINT);
+ data->geo_distance_proc = GET(data->context, "geo_distance");
+}
+
+static void
bench_setup_spherical_wgs84(gpointer user_data)
{
BenchmarkData *data = user_data;
@@ -272,6 +298,10 @@ main(int argc, gchar **argv)
rectangular_wgs84_1st_to_2nd_quadrant_short);
REGISTER("rectangular (WGS84 Lisbon to Tokyo)",
rectangular_wgs84_2nd_to_1st_quadrant_short);
+ REGISTER("rectangular (WGS84 Tokyo to San Francisco)",
+ rectangular_wgs84_1st_to_2nd_quadrant_long);
+ REGISTER("rectangular (WGS84 San Francisco to Tokyo)",
+ rectangular_wgs84_2nd_to_1st_quadrant_long);
REGISTER("spherical (WGS84)", spherical_wgs84);
REGISTER("spherical (TOKYO)", spherical_tgs);
REGISTER("hubeny (WGS84)", hubeny_wgs84);