diff --git a/exo5.lisp b/exo5.lisp index 8ab5ed0..80fb7b9 100644 --- a/exo5.lisp +++ b/exo5.lisp @@ -316,11 +316,4 @@ (format t "~&di ~a~&" n) (time (loop for gt in gts - collect (car (dinic gt))))) - do (loop - for gt in gts - for ek in eks - for d in ds - unless (equal ek d) - do (print gt) - and do (error "edmonds-karp et dinic ont des résultats différents ! Le graphe : ~a et ~a pour" ek d)))) + collect (car (dinic gt))))))) diff --git a/stat.sh b/stat.sh index 36a7580..dbc382b 100644 --- a/stat.sh +++ b/stat.sh @@ -1,6 +1,6 @@ #!/bin/sh -echo '(load "exo5") (test-between 300 40 3)' | sbcl > /tmp/$$-stat +echo '(load "exo5") (test-between 400 200 3)' | sbcl > /tmp/$$-stat cat /tmp/$$-stat | grep -v '^ek' | grep -v '^di' | tail -n +10 | grep -v '^ \[' | head -n -1 > /tmp/$$-stat2 cat /tmp/$$-stat2 | while read ab; do read ab; ab="${ab# }" echo -n "${ab%% *} "; read ab; read ab; read ab; read ab; ab="${ab# }" echo "${ab%% *}"; read ab; done > /tmp/$$-stat3 cat /tmp/$$-stat3 | while read ab; do read xy; echo "$ab $xy"; done diff --git a/stat.txt b/stat.txt new file mode 100644 index 0000000..e8bae8d --- /dev/null +++ b/stat.txt @@ -0,0 +1,399 @@ +0.000 134,640 0.001 192,080 +0.000 240,496 0.001 460,352 +0.000 358,656 0.007 755,888 +0.001 499,232 0.003 1,203,600 +0.002 645,056 0.004 1,735,408 +0.002 777,744 0.006 2,260,144 +0.002 939,952 0.009 2,638,320 +0.002 1,064,624 0.008 3,215,520 +0.003 1,265,168 0.022 4,046,320 +0.004 1,428,560 0.016 4,917,888 +0.005 1,562,416 0.014 5,064,528 +0.005 1,671,856 0.019 5,755,104 +0.005 1,881,488 0.019 6,564,240 +0.005 1,995,072 0.020 6,837,680 +0.006 2,226,864 0.023 8,022,864 +0.006 2,261,760 0.023 8,086,976 +0.008 2,581,888 0.035 9,395,424 +0.007 2,586,192 0.032 9,440,000 +0.008 2,766,416 0.034 10,481,120 +0.012 3,033,072 0.036 11,365,008 +0.008 3,041,184 0.043 11,146,320 +0.011 3,332,720 0.045 12,840,400 +0.009 3,345,120 0.040 12,479,968 +0.021 3,672,352 0.050 14,203,664 +0.011 3,732,928 0.048 13,909,488 +0.011 3,890,272 0.049 14,784,544 +0.011 4,112,688 0.064 16,021,648 +0.012 4,202,080 0.052 15,972,416 +0.012 4,379,536 0.076 17,264,944 +0.013 4,560,240 0.058 17,104,704 +0.013 4,609,712 0.061 17,919,136 +0.023 4,688,320 0.062 17,750,880 +0.018 4,880,704 0.059 18,629,296 +0.018 5,182,128 0.076 21,123,520 +0.019 5,308,272 0.068 20,518,592 +0.015 5,355,264 0.084 20,801,264 +0.016 5,764,864 0.097 23,820,928 +0.022 5,693,616 0.075 22,177,232 +0.022 5,978,704 0.083 23,643,392 +0.025 5,981,344 0.079 23,836,880 +0.030 6,422,144 0.090 25,817,008 +0.024 6,468,240 0.088 26,124,592 +0.024 6,597,536 0.096 26,745,984 +0.019 6,577,152 0.085 25,242,912 +0.023 6,953,632 0.094 27,415,904 +0.027 7,024,128 0.098 26,596,608 +0.026 7,086,832 0.091 27,286,560 +0.026 7,540,560 0.105 29,819,248 +0.028 7,588,528 0.113 29,323,952 +0.029 7,805,136 0.124 32,344,960 +0.029 7,901,840 0.112 30,613,312 +0.024 7,960,640 0.128 31,332,128 +0.026 8,450,000 0.135 34,940,976 +0.031 8,218,176 0.124 33,409,456 +0.033 8,612,624 0.129 34,766,896 +0.031 8,598,448 0.130 34,503,440 +0.032 8,732,736 0.130 34,267,104 +0.026 8,950,832 0.140 34,651,904 +0.032 9,428,080 0.145 39,188,096 +0.027 9,167,056 0.144 37,502,080 +0.034 9,309,440 0.134 35,877,136 +0.028 9,477,312 0.156 36,348,720 +0.036 9,999,488 0.153 40,569,696 +0.036 9,849,200 0.146 39,246,192 +0.036 10,386,208 0.153 41,525,248 +0.039 10,382,816 0.157 42,849,344 +0.039 10,789,776 0.163 43,131,952 +0.038 10,554,816 0.170 43,587,776 +0.032 10,807,536 0.167 43,546,704 +0.036 10,734,112 0.153 41,384,448 +0.042 11,162,544 0.167 45,531,504 +0.033 11,299,632 0.186 46,424,672 +0.040 11,484,016 0.177 47,332,304 +0.040 11,683,456 0.180 48,464,496 +0.039 11,852,064 0.175 47,811,728 +0.040 11,693,312 0.157 47,194,352 +0.043 11,885,968 0.180 49,229,232 +0.068 11,959,888 0.159 48,223,104 +0.048 12,678,144 0.194 53,385,696 +0.047 12,810,640 0.173 52,605,056 +0.045 12,911,344 0.193 52,621,232 +0.046 12,911,440 0.220 51,931,104 +0.049 13,098,128 0.193 53,389,520 +0.064 13,249,824 0.185 54,838,880 +0.044 13,509,584 0.205 56,274,976 +0.047 13,302,672 0.200 53,624,912 +0.053 13,783,808 0.207 57,149,936 +0.049 13,616,160 0.185 55,741,696 +0.054 14,246,736 0.212 57,963,088 +0.045 14,166,848 0.220 60,465,616 +0.080 14,314,288 0.187 55,945,936 +0.047 14,533,888 0.215 59,056,112 +0.074 14,988,960 0.212 62,340,672 +0.062 15,128,752 0.231 63,048,736 +0.052 14,705,616 0.196 58,652,000 +0.060 15,500,912 0.232 62,606,752 +0.089 15,464,880 0.213 61,744,304 +0.052 15,197,840 0.224 60,506,960 +0.058 16,113,680 0.228 67,647,968 +0.051 15,769,440 0.231 62,473,504 +0.096 16,199,216 0.223 66,386,624 +0.058 15,378,256 0.216 60,586,448 +0.082 16,922,256 0.240 70,377,968 +0.063 16,301,392 0.238 64,726,496 +0.086 17,175,216 0.239 70,225,872 +0.053 16,736,704 0.252 69,024,704 +0.063 17,479,584 0.248 73,675,840 +0.064 17,212,752 0.261 71,027,904 +0.067 17,053,904 0.249 68,377,008 +0.060 17,111,936 0.221 66,667,936 +0.060 18,017,152 0.277 74,957,344 +0.083 17,645,328 0.244 72,617,680 +0.062 18,527,024 0.277 75,090,896 +0.069 18,611,536 0.281 78,135,456 +0.066 18,459,968 0.258 75,966,864 +0.072 18,565,488 0.277 75,547,760 +0.074 19,089,760 0.287 78,142,672 +0.065 18,726,352 0.271 80,988,640 +0.077 19,317,136 0.294 80,608,832 +0.089 18,836,240 0.253 74,997,632 +0.085 19,199,392 0.274 79,601,504 +0.071 19,891,056 0.282 82,617,104 +0.079 19,784,608 0.301 82,055,680 +0.119 20,442,848 0.292 86,035,376 +0.060 19,452,368 0.280 78,242,496 +0.096 19,887,632 0.277 82,314,928 +0.076 20,120,208 0.299 83,481,856 +0.105 18,962,864 0.233 72,248,544 +0.081 21,340,992 0.316 87,021,424 +0.073 20,563,728 0.298 82,987,312 +0.073 20,500,960 0.279 79,085,904 +0.090 21,932,688 0.333 92,642,816 +0.112 21,499,680 0.299 88,455,424 +0.094 21,299,024 0.305 89,452,992 +0.077 21,260,704 0.307 86,333,120 +0.113 21,668,752 0.304 90,156,464 +0.102 22,583,008 0.317 92,841,808 +0.104 21,845,360 0.296 88,802,800 +0.096 21,908,864 0.302 88,679,600 +0.079 22,070,992 0.326 91,503,232 +0.081 22,498,096 0.309 92,176,000 +0.083 22,423,328 0.362 92,168,608 +0.097 22,448,688 0.299 88,763,856 +0.087 23,081,648 0.347 96,441,456 +0.090 23,169,392 0.333 93,410,000 +0.086 23,637,328 0.331 97,850,912 +0.079 23,125,776 0.305 90,156,512 +0.086 23,830,624 0.361 101,358,064 +0.084 23,304,080 0.326 91,872,656 +0.092 24,301,824 0.360 100,549,040 +0.088 23,917,840 0.327 94,834,608 +0.087 24,349,872 0.331 98,195,744 +0.080 24,386,592 0.367 99,455,040 +0.092 25,234,336 0.357 103,201,024 +0.110 25,049,088 0.361 104,173,120 +0.103 25,775,824 0.377 105,557,120 +0.092 25,138,736 0.378 106,302,048 +0.092 25,411,088 0.356 105,153,696 +0.101 26,003,952 0.427 109,764,096 +0.126 26,225,344 0.381 109,452,144 +0.092 25,646,224 0.363 102,592,320 +0.092 25,383,584 0.367 103,563,408 +0.091 26,044,128 0.358 105,536,240 +0.127 26,707,280 0.379 109,605,968 +0.094 26,440,048 0.359 105,649,520 +0.134 27,286,576 0.402 115,622,656 +0.094 26,165,488 0.365 104,198,176 +0.105 27,651,952 0.415 115,879,312 +0.102 27,567,824 0.403 112,804,896 +0.102 27,427,888 0.391 111,037,472 +0.097 27,453,584 0.383 112,857,248 +0.108 28,255,680 0.425 116,297,200 +0.105 27,981,376 0.425 115,508,208 +0.101 27,483,216 0.386 108,259,376 +0.107 27,725,632 0.392 111,009,488 +0.102 28,109,664 0.400 117,219,216 +0.158 28,569,584 0.393 115,105,648 +0.129 29,267,296 0.425 121,541,408 +0.114 29,026,720 0.444 124,426,144 +0.113 29,369,296 0.427 117,751,216 +0.131 29,516,224 0.428 123,347,216 +0.115 30,057,264 0.464 128,328,192 +0.136 30,155,792 0.420 120,492,512 +0.105 29,058,080 0.409 116,847,280 +0.201 29,397,008 0.390 114,235,616 +0.141 30,477,184 0.430 125,113,312 +0.130 30,154,784 0.434 124,527,456 +0.115 30,473,696 0.434 121,985,072 +0.111 30,353,264 0.456 127,775,088 +0.113 30,312,544 0.433 122,802,016 +0.137 31,706,544 0.448 128,153,264 +0.124 31,522,352 0.456 127,514,000 +0.131 31,093,984 0.436 126,911,920 +0.136 31,521,472 0.456 129,920,272 +0.118 32,041,744 0.471 131,389,472 +0.121 31,688,272 0.457 129,853,120 +0.114 31,051,200 0.452 129,320,224 +0.129 31,577,168 0.445 129,170,560 +0.139 31,745,264 0.452 130,101,184 +0.134 32,027,536 0.459 132,487,040 +0.136 32,850,528 0.486 139,918,960 +0.128 32,346,272 0.467 134,212,480 +0.130 32,245,936 0.464 133,631,040 +0.145 34,132,640 0.494 140,968,992 +0.118 33,276,320 0.491 139,073,744 +0.149 34,105,488 0.486 139,135,392 +0.142 33,321,952 0.463 134,599,488 +0.133 34,629,184 0.541 146,073,456 +0.157 34,689,344 0.523 147,859,472 +0.144 34,325,344 0.490 140,709,632 +0.150 34,473,312 0.498 143,541,440 +0.152 35,374,880 0.514 147,190,800 +0.125 34,624,656 0.485 136,850,992 +0.145 34,035,680 0.466 135,966,208 +0.151 35,582,320 0.514 149,052,032 +0.143 35,488,752 0.481 140,335,024 +0.126 35,013,136 0.509 142,210,144 +0.152 36,321,920 0.545 156,062,800 +0.122 34,534,976 0.507 140,902,992 +0.167 37,705,312 0.565 159,058,080 +0.154 35,876,176 0.513 148,491,664 +0.159 37,270,784 0.544 156,443,760 +0.138 36,618,560 0.575 157,747,808 +0.157 37,191,584 0.523 150,488,832 +0.160 37,311,632 0.525 150,023,168 +0.164 37,554,816 0.536 154,514,208 +0.156 37,452,800 0.540 155,729,424 +0.130 36,476,272 0.521 144,529,024 +0.155 36,938,448 0.517 149,267,728 +0.152 36,477,568 0.502 146,422,128 +0.156 37,707,152 0.539 155,562,400 +0.144 38,004,960 0.559 152,332,128 +0.149 37,020,320 0.501 144,338,592 +0.169 38,599,072 0.577 162,478,336 +0.161 38,476,640 0.564 161,350,064 +0.162 37,834,496 0.538 155,304,256 +0.172 39,755,152 0.571 161,622,288 +0.165 38,477,536 0.543 155,067,136 +0.167 38,951,840 0.537 154,080,272 +0.164 39,814,400 0.572 161,500,080 +0.147 39,782,352 0.603 164,898,000 +0.166 39,519,264 0.564 159,184,416 +0.182 41,349,568 0.622 175,128,368 +0.163 39,572,384 0.561 161,182,944 +0.175 40,429,568 0.588 165,977,392 +0.167 39,787,152 0.547 157,319,392 +0.145 40,031,728 0.593 163,909,856 +0.163 39,055,728 0.526 153,873,552 +0.182 40,879,840 0.592 168,991,904 +0.166 40,429,808 0.567 164,335,088 +0.176 41,782,960 0.562 161,975,504 +0.180 41,069,728 0.576 165,490,064 +0.171 40,297,536 0.553 160,570,560 +0.190 42,945,984 0.634 178,761,328 +0.169 41,796,400 0.597 170,966,560 +0.154 42,066,544 0.661 179,909,040 +0.186 42,188,400 0.593 169,962,432 +0.181 42,659,648 0.607 174,077,920 +0.184 42,175,632 0.609 174,064,672 +0.180 43,190,352 0.620 175,318,048 +0.183 42,214,208 0.573 165,620,496 +0.199 43,696,112 0.622 177,992,096 +0.202 44,925,184 0.695 194,692,208 +0.207 44,328,320 0.667 189,523,728 +0.166 42,435,760 0.605 174,426,032 +0.190 44,030,544 0.656 185,344,688 +0.194 44,653,792 0.665 188,522,592 +0.195 44,122,320 0.622 178,809,776 +0.195 44,460,064 0.667 188,202,784 +0.197 45,182,848 0.670 189,737,360 +0.193 43,553,968 0.606 176,360,000 +0.195 45,514,880 0.673 191,218,416 +0.205 44,557,344 0.613 178,569,264 +0.189 44,126,688 0.613 178,229,744 +0.191 44,132,912 0.617 176,127,200 +0.196 46,416,416 0.701 192,764,912 +0.207 45,723,808 0.702 189,609,344 +0.202 46,285,264 0.661 187,062,880 +0.192 45,482,288 0.660 188,040,624 +0.201 46,610,496 0.763 193,804,528 +0.190 44,710,432 0.616 177,363,728 +0.210 46,095,648 0.678 191,799,744 +0.199 46,616,768 0.654 185,003,152 +0.196 45,728,320 0.647 184,065,088 +0.208 46,709,648 0.672 189,737,024 +0.193 47,033,008 0.668 191,472,384 +0.205 46,488,416 0.666 188,988,592 +0.185 46,480,576 0.661 189,189,184 +0.218 48,900,320 0.758 205,247,152 +0.214 47,520,768 0.774 193,856,192 +0.218 48,274,544 0.712 200,271,600 +0.208 48,778,464 0.714 202,828,752 +0.209 48,921,984 0.705 197,979,088 +0.196 47,728,096 0.685 188,320,704 +0.229 50,155,376 0.912 215,173,968 +0.211 47,815,328 0.688 196,195,008 +0.203 49,124,736 0.749 203,507,984 +0.221 49,211,408 0.821 210,443,696 +0.225 49,697,312 0.712 201,891,872 +0.215 48,730,592 0.684 196,121,824 +0.210 48,828,208 0.702 201,754,592 +0.212 48,851,184 0.696 199,468,960 +0.211 48,237,504 0.662 190,426,208 +0.211 49,195,568 0.750 204,865,312 +0.229 50,005,712 0.846 207,217,488 +0.217 49,588,688 0.769 205,044,048 +0.231 50,325,040 0.779 205,144,032 +0.230 50,068,848 0.807 204,707,120 +0.219 50,648,768 0.779 208,427,264 +0.222 50,509,584 0.844 206,209,152 +0.250 52,739,792 0.835 221,337,120 +0.225 51,369,072 0.832 220,015,600 +0.244 53,736,128 0.866 220,497,648 +0.235 52,257,648 0.805 216,143,136 +0.223 51,045,712 0.805 203,700,288 +0.238 51,543,328 0.795 212,249,872 +0.231 51,509,728 0.782 206,521,008 +0.237 52,127,648 0.851 215,215,184 +0.237 52,533,440 0.795 210,948,176 +0.243 52,998,560 0.944 217,186,112 +0.247 53,799,008 0.831 222,917,360 +0.236 52,780,976 0.778 209,361,712 +0.247 53,925,968 0.871 224,323,664 +0.244 53,697,984 0.809 215,695,360 +0.241 53,327,952 0.847 217,686,304 +0.237 52,847,600 0.773 208,066,816 +0.240 52,776,592 0.811 216,597,472 +0.244 54,642,160 0.885 224,711,152 +0.257 55,318,448 0.873 232,957,776 +0.248 54,810,208 0.883 224,578,784 +0.204 55,291,648 0.873 229,552,016 +0.240 53,155,136 0.767 214,623,488 +0.291 54,769,840 0.767 216,086,848 +0.188 52,945,472 0.711 200,566,032 +0.227 55,304,416 0.816 227,629,232 +0.201 55,352,576 0.844 225,917,216 +0.255 55,745,344 0.803 223,381,360 +0.204 55,585,344 0.797 218,331,856 +0.252 54,773,264 0.858 217,862,976 +0.256 56,542,976 0.869 229,406,864 +0.253 55,423,248 0.831 221,880,512 +0.267 57,364,000 0.957 243,069,392 +0.262 57,591,744 0.847 226,024,896 +0.197 55,413,888 0.934 229,234,288 +0.257 56,136,096 0.831 223,037,424 +0.243 54,966,736 0.805 215,729,104 +0.245 55,911,424 0.871 222,882,400 +0.206 57,000,400 0.880 235,489,360 +0.302 57,935,680 0.852 237,770,544 +0.234 57,228,864 0.861 227,420,176 +0.267 58,267,600 0.882 243,608,448 +0.255 58,505,776 0.907 244,942,016 +0.268 58,427,712 0.905 251,919,280 +0.254 58,952,240 0.924 246,312,768 +0.378 58,643,040 0.874 244,610,400 +0.247 59,446,304 0.909 238,081,792 +0.268 58,751,536 0.914 244,107,104 +0.304 58,466,784 0.867 242,206,960 +0.257 60,880,240 0.911 247,213,168 +0.263 59,004,768 0.972 248,008,896 +0.273 59,508,736 0.859 238,814,016 +0.249 60,334,208 0.885 245,744,992 +0.255 58,804,592 0.836 233,916,256 +0.246 60,050,240 0.894 234,520,160 +0.221 60,236,144 0.914 240,483,200 +0.282 62,013,808 0.960 263,259,376 +0.271 62,314,816 0.971 259,841,104 +0.314 61,932,528 0.939 261,152,240 +0.253 60,889,968 0.900 242,341,392 +0.273 61,063,536 0.949 253,425,792 +0.323 62,155,392 0.977 269,315,536 +0.230 59,084,816 0.935 235,801,760 +0.219 61,113,280 0.921 247,299,280 +0.289 62,833,472 0.946 260,488,864 +0.277 62,259,984 0.948 254,356,480 +0.323 63,380,128 0.931 258,732,944 +0.254 61,112,544 0.905 244,467,664 +0.278 62,224,416 0.912 252,344,096 +0.258 61,205,568 0.894 240,134,288 +0.377 63,366,448 0.919 255,679,424 +0.263 62,503,744 0.938 255,532,848 +0.282 63,910,384 0.937 261,159,840 +0.266 63,232,400 0.974 259,997,360 +0.325 64,280,960 0.963 266,674,992 +0.280 63,846,016 0.966 257,457,200 +0.256 65,858,672 1.031 267,126,896 +0.246 64,598,560 1.019 265,091,664 +0.346 66,444,416 0.998 267,687,136 +0.246 65,266,416 1.037 272,893,168 +0.240 64,587,744 1.001 259,377,696 +0.288 65,003,488 1.044 273,754,160 +0.235 64,272,048 0.982 268,679,360 +0.229 63,797,632 0.944 250,101,216 +0.255 64,449,056 0.977 258,375,472 +0.296 64,678,880 0.975 258,030,016 +0.341 67,218,128 1.066 289,581,760 +0.275 64,109,616 0.947 250,646,240 +0.306 66,741,648 1.039 270,973,072 +