Merge pull request #1354 from tatesoto/fix/minimum_enclosing_circle

テストケース修正 Minimum Enclosing Circle

Author: maspypy

geo/minimum_enclosing_circle/gen/max_circle.cpp

@@ -22,8 +22,6 @@ void out(set<P> S) {
     for (auto& [x, y]: V) { printf("%d %d\n", x, y); }
 }
 
-const long double PI = acosl(-1.0L);
-
 int main(int, char* argv[]) {
     long long seed = atoll(argv[1]);
     auto gen = Random(seed);
@@ -32,23 +30,24 @@ int main(int, char* argv[]) {
 
     int n = N_MAX;
     int r = X_AND_Y_ABS_MAX;
-    for (int i = 0; i < n; i++) {
-        long double theta = (long double)(i) * 2 * PI / (long double)(n);
-        long double ldx = r * cos(theta);
-        long double ldy = r * sin(theta);
-        int x = (int)(ldx);
-        int y = (int)(ldy);
-        while (y > 0 && x*x + (y+1)*(y+1) <= r*r) y++;
-        while (y < 0 && x*x + (y-1)*(y-1) <= r*r) y--;
-        if (abs(x) > X_AND_Y_ABS_MAX) x = (x < 0 ? -X_AND_Y_ABS_MAX : X_AND_Y_ABS_MAX);
-        if (abs(y) > X_AND_Y_ABS_MAX) y = (y < 0 ? -X_AND_Y_ABS_MAX : X_AND_Y_ABS_MAX);
+    int x = 0, y = r;
+    S.insert({x, y});
+    S.insert({x, -y});
+    while (x < r) {
+        x++;
+        while (y > 0 && x*x + y*y > r*r) y--;
         S.insert({x, y});
+        S.insert({-x, y});
+        S.insert({x, -y});
+        S.insert({-x, -y});
     }
 
-    int LIM = X_AND_Y_ABS_MAX*7/10;
+    int LIM = X_AND_Y_ABS_MAX;
     while (int(S.size()) < n) {
         P p = random_point(gen, LIM);
-        S.insert(p);
+        if (p.first * p.first + p.second * p.second <= r * r) {
+            S.insert(p);
+        }
     }
 
     out(S);

geo/minimum_enclosing_circle/gen/near_circle.cpp

@@ -37,8 +37,6 @@ void out(set<P> S, bool shuffle) {
     for (auto& [x, y]: V) { printf("%d %d\n", x, y); }
 }
 
-const long double PI = acosl(-1.0L);
-
 int main(int, char* argv[]) {
     long long seed = atoll(argv[1]);
     auto gen = Random(seed);
@@ -48,24 +46,38 @@ int main(int, char* argv[]) {
     int LIM = lims[seed % 2];
 
     set<P> S;
-    
-    int n = gen.uniform<int>(100, N_MAX);
-    int r = gen.uniform<int>(LIM/2, LIM*3/4);
-    long double phi = gen.uniform<double>(0, 2 * PI);
-    for (int i = 0; i < n; i++) {
-        long double theta = (long double)(i) * 2 * PI / (long double)(n) + phi;
-        long double ldx = r * cos(theta);
-        long double ldy = r * sin(theta);
-        int x = (int)(ldx);
-        int y = (int)(ldy);
-        while (y > 0 && x*x + (y+1)*(y+1) <= r*r) y++;
-        while (y < 0 && x*x + (y-1)*(y-1) <= r*r) y--;
-        y += gen.uniform<int>(-1, 1);
-        if (abs(x) > X_AND_Y_ABS_MAX) x = (x < 0 ? -X_AND_Y_ABS_MAX : X_AND_Y_ABS_MAX);
-        if (abs(y) > X_AND_Y_ABS_MAX) y = (y < 0 ? -X_AND_Y_ABS_MAX : X_AND_Y_ABS_MAX);
-        S.insert({(int)x, (int)y});
+
+    int rx = gen.uniform<int>(LIM*5/9, LIM*2/3);
+    int ry = gen.uniform<int>(LIM*5/9, LIM*2/3);
+    int r_sq = rx*rx + ry*ry;
+    int r = (int)sqrt(r_sq);
+    int cx = gen.uniform<int>(-X_AND_Y_ABS_MAX + r*11/10, X_AND_Y_ABS_MAX - r*11/10);
+    int cy = gen.uniform<int>(-X_AND_Y_ABS_MAX + r*11/10, X_AND_Y_ABS_MAX - r*11/10);
+    int x = 0, y = r;
+    S.insert({x + cx, y + cy});
+    S.insert({x + cx, -y + cy});
+    const int dy[] = {-1, 0, 1};
+    while (x < r) {
+        x++;
+        while (y > 0 && x*x + y*y > r_sq) y--;
+        int px = x;
+        int py = y;
+        for (int d = 0; d < 3; d++) {
+            int nx = px;
+            int ny = py + dy[d];
+            if (abs(nx) > X_AND_Y_ABS_MAX) nx = (nx < 0 ? -X_AND_Y_ABS_MAX : X_AND_Y_ABS_MAX);
+            if (abs(ny) > X_AND_Y_ABS_MAX) ny = (ny < 0 ? -X_AND_Y_ABS_MAX : X_AND_Y_ABS_MAX);
+            int insert_flag = gen.uniform(0, 15);
+            if (insert_flag & 1) S.insert({nx + cx, ny + cy});
+            if (insert_flag & 2) S.insert({-nx + cx, ny + cy});
+            if (insert_flag & 4) S.insert({nx + cx, -ny + cy});
+            if (insert_flag & 8) S.insert({-nx + cx, -ny + cy});
+        }
+    }
+    while (int(S.size()) > N_MAX) {
+        auto it = S.begin();
+        S.erase(it);
     }
-    
     bool shuffle = gen.uniform_bool();
     out(S, shuffle);
     return 0;

geo/minimum_enclosing_circle/hash.json

@@ -17,16 +17,16 @@
   "large_random_03.out": "81c742ee4102e12ffdd9b63b9d8d0c2326613ad3785a1978d2cc177083e52f22",
   "large_random_04.in": "e9ab7128a80ee11fc52894d978d58b81b8a7c35b9b34920f4f9eec0c71b8782a",
   "large_random_04.out": "35b164cffcde21334f12e2d8075cf276877116f7939297f4099e6d13702ebdd9",
-  "max_circle_00.in": "5b5cc6eafb16c2872a687696762706d16e5f6c42e01002b5caadec44735d9d31",
-  "max_circle_00.out": "8a1db48be12fbad3543009d5944c324030ca5552ed6217f6ca4d7822bf02a123",
+  "max_circle_00.in": "76475f24cd17198a480f2d94824af03f13e04b42fe5b942f4d409e512250cce6",
+  "max_circle_00.out": "dff58cc6fcfd857a37b616d30a58c9e8255c2041e32f5518ed59934c31b7b3b7",
   "megiddo_worst_00.in": "97990c580383ae472f9be021aa76604b04aaa1820bfb8a2785176b0fda2728d3",
   "megiddo_worst_00.out": "15dcb2e972546a1cd52c39c6e6154ff72d95268e62f6bb9c11f4d67b45d70574",
-  "near_circle_00.in": "50144ba6fc29fdfa9d59ff3f0aa1d629695ca61699d06f3621363ad166cdb150",
-  "near_circle_00.out": "dd4cc2484705cb4afa7c79894e54920d1cd4e6969c20c2cee377ddd21321a452",
-  "near_circle_01.in": "6899d3ebdc2346373b2e617867b346d718faefcc39551e56b768ca03a3d22d2d",
-  "near_circle_01.out": "09d8d59d94d25ffbba2a832d55fdfd9bc3ccaec6495a4d444a03f0b312278d8f",
-  "near_circle_02.in": "1b10184b8fd12fda219b7df4681b2976c7ffa70638aafe1c7cdb13c03cb13f4c",
-  "near_circle_02.out": "e8c959983a3512a7ee98505259bce75c8a22a5a62452b400ec5fd7e2b2ebf160",
+  "near_circle_00.in": "6c8158e778e7dede2aae7fe85bc73d1bd1706070f2568cf93787c10f3362463e",
+  "near_circle_00.out": "b2c2a76878411eb7832d9184e954e26611019443774ede66aa7568204f4c6ff7",
+  "near_circle_01.in": "a8feb04c19df441cc5853e0a999f5a60d51bdf20ec70695df0240c33c1eba2e6",
+  "near_circle_01.out": "f6d30ea1c0bdf74cd52013e7a62ef33f9cdae74fe69726684ba3d990a77310ed",
+  "near_circle_02.in": "fa0f6aba9c9bc77291ddecccf864ce2a1216225ffb9a005e027a4809ba7c3a83",
+  "near_circle_02.out": "62a4229f7e5b5fcd03dfdc2076a8a62961c1643b563cee37224feb6fa686900e",
   "near_colinear_00.in": "138a3198c0bb285c18e0a6e09dd0e7b113a2caeef57b3b47dbfc2f0f202c3601",
   "near_colinear_00.out": "9c598a60c3f45d74335e160532b09a87f5eb188ae2ad0660d92264bef65dea7e",
   "near_colinear_01.in": "fbacc00556bdc910b8b57aa428449c13c32f873b7a67a895f043c461dcb96b24",