From 20bdf01a008b23922eddf3046e0b3767410cb692 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Fri, 6 Jun 2025 19:44:14 +0200 Subject: [PATCH] Update #1 --- answer.txt | 2 +- bots/botBase.ml | 1 + lastActions.txt | 84 ++++++++++++++++++++++++++++++++++++++++++++++--- output.txt | 12 +++---- src/structure.c | 4 +-- 5 files changed, 90 insertions(+), 13 deletions(-) diff --git a/answer.txt b/answer.txt index a0f9808..9448daa 100644 --- a/answer.txt +++ b/answer.txt @@ -1 +1 @@ -348 100 +40 100 diff --git a/bots/botBase.ml b/bots/botBase.ml index 6ce06e7..4fb4f34 100644 --- a/bots/botBase.ml +++ b/bots/botBase.ml @@ -79,6 +79,7 @@ let trackDistance = read_float meta metai in (* in other words, the width of the track is (except for start and finish) roomSize*(1-2*trackDistance) *) let magneticField = read_float meta metai in (* workd just like in induction : v ^ B is added to the speed each tick *) +let slowZoneWidth = read_float meta metai in (* slow area width (see schematic) *) close_in file ; (*Printf.printf "%d %d %d %f %f %f\n" roomSize maximumSpeed playerRadius friction restitutionFactor trackDistance ;;*) diff --git a/lastActions.txt b/lastActions.txt index 33e74f5..0546d47 100644 --- a/lastActions.txt +++ b/lastActions.txt @@ -1,4 +1,80 @@ -145.823546 -38.881425 --193.127137 113.697483 --225.276144 -32.532029 -152.154832 -39.888911 +-126.965777 105.016079 +178.506987 157.483510 +79.937093 241.211724 +-160.774653 -38.383354 +-167.593415 -29.904529 +-7.294048 -246.314004 +1.925443 225.657331 +-83.767622 138.353905 +85.819605 202.420133 +82.714981 -146.254252 +-113.224829 -183.040838 +-44.292231 239.426093 +73.408148 -201.606239 +136.403228 78.074414 +-118.750657 -212.011229 +-199.504334 -148.063798 +-61.943425 -155.586957 +-94.406224 124.392990 +-118.474016 134.581478 +176.787805 -145.003525 +-0.963485 167.948868 +-147.156717 -49.324155 +124.324729 198.216477 +86.737908 -232.027331 +-108.706596 116.156123 +-111.198585 199.679652 +4.233347 -154.343522 +53.134941 219.045650 +52.531427 188.860283 +199.759825 142.236295 +-153.335297 33.127230 +109.768908 -156.403842 +191.522197 69.161770 +220.062526 70.577410 +41.550781 164.810963 +-48.473045 -144.188006 +-182.774442 -73.038390 +-49.452259 -244.218394 +-13.630715 162.124555 +39.864674 150.674710 +-188.697044 -71.996776 +209.144759 -94.677939 +68.331180 -148.688378 +-152.071067 -16.616042 +27.734569 244.386576 +23.194074 224.207761 +-121.424647 -99.335541 +-81.004541 -144.285027 +-54.705548 197.298754 +-158.456711 185.805850 +-195.595346 53.989574 +155.441325 -30.768053 +131.351333 -190.332676 +151.633615 -144.272948 +-215.382455 100.160594 +-16.877039 150.231786 +-244.040463 41.574689 +-30.789249 -164.256939 +243.535105 -70.333548 +-123.309534 -93.410730 +141.183147 198.054222 +111.648590 -121.110859 +159.960839 119.300008 +152.093937 -56.629404 +117.736144 -192.205400 +-67.552365 143.397390 +-144.829862 55.225338 +137.854776 73.989149 +107.712460 -220.424780 +-72.295537 -188.604800 +-157.285398 158.442411 +18.084724 166.016643 +-4.225048 204.566741 +202.324807 -62.010358 +-119.442761 208.986514 +-116.518561 -106.891697 +-52.721865 -192.322387 +-124.217802 -133.451340 +191.087537 -159.194411 +127.328099 107.726608 diff --git a/output.txt b/output.txt index 8534085..7496444 100644 --- a/output.txt +++ b/output.txt @@ -1,8 +1,8 @@ 4 -0 (0 1) (79.84 55.26) -1 (0 1) (63.60 77.08) -2 (0 1) (36.40 77.08) -3 (0 1) (20.16 55.26) +0 (2 0) (33.61 47.56) +1 (3 0) (11.28 52.68) +2 (0 1) (84.28 14.94) +3 (4 0) (50.30 85.67) 3 5 9 @@ -12,6 +12,6 @@ S...035.6 .6..37115 .2175.... -100 200 5 0.90 0.80 0.20 0.00 +100 200 5 0.90 0.80 0.20 0.00 0.20 -Room Size, Maximum speed, Player Radius, Friction, Restitution factor, Track Distance to Edge, Magnetic Field \ No newline at end of file +Room Size, Maximum speed, Player Radius, Friction, Restitution factor, Track Distance to Edge, Magnetic Field, Slow zone Width \ No newline at end of file diff --git a/src/structure.c b/src/structure.c index 36e12a0..00cde70 100644 --- a/src/structure.c +++ b/src/structure.c @@ -70,8 +70,8 @@ void write_output(char* stream, level* lvl, int nPl) { fprintf(ptr, "\n"); } fprintf(ptr, "\n"); - fprintf(ptr, "%d %d %d %.2lf %.2lf %.2lf %.2lf\n", ROOM_SIZE, MAX_SPEED, PLAYER_R, FRICTION, RESTITUTION_WALL, DIST_EDGE, B); - fprintf(ptr, "\nRoom Size, Maximum speed, Player Radius, Friction, Restitution factor, Track Distance to Edge, Magnetic Field"); + fprintf(ptr, "%d %d %d %.2lf %.2lf %.2lf %.2lf %.2lf\n", ROOM_SIZE, MAX_SPEED, PLAYER_R, FRICTION, RESTITUTION_WALL, DIST_EDGE, B, STR2_W); + fprintf(ptr, "\nRoom Size, Maximum speed, Player Radius, Friction, Restitution factor, Track Distance to Edge, Magnetic Field, Slow zone Width"); fclose(ptr); }