Skip to content

Commit

Permalink
Merge pull request #30 from alec-o-mago/main
Browse files Browse the repository at this point in the history 
Tests adjusted to new flocking rule.
  • Loading branch information
@tolstenko
tolstenko authored Sep 4, 2023
2 parents c9640d7 + 2223b89 commit 3371c14
Show file tree
Hide file tree
Showing 28 changed files with 79 additions and 83 deletions.
9 changes: 4 additions & 5 deletions courses/artificialintelligence/assignments/flocking/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,16 @@ In this example we are going to test only the cohesion behavior. The input is co
1.000 0.000 0.000 0.000 1.000 0.000 0.000 2
0.000 0.500 0.000 0.000
0.000 -0.500 0.000 0.000
0.010
EOF
0.125
```

## Output

The expected output is the position and velocity for each agent after the simulation step using the time frame. After printing each simulation step, the program should wait for the next time frame and then simulate the next step. All values should have exactly 3 decimal places and should not be rounded.
The expected output is the position and velocity for each agent after the simulation step using the time frame. After printing each simulation step, the program should wait for the next time frame and then simulate the next step. All values should have exactly 3 decimal places and should be rounded to the nearest.

```text
0.000 0.490 0.000 -0.010
0.000 -0.490 0.000 0.010
0.000 0.484 0.000 -0.125
0.000 -0.484 0.000 0.125
```

## Grading
Expand Down
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-a.in
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.000 0.000 0.000 0.000 1.000 0.000 0.000 2
0.000 0.500 0.000 0.000
0.000 -0.500 0.000 0.000
0.010
0.125
4 changes: 2 additions & 2 deletions courses/artificialintelligence/assignments/flocking/tests/test-a.out
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.000 0.490 0.000 -1.000
0.000 -0.490 0.000 1.000
0.000 0.484 0.000 -0.125
0.000 -0.484 0.000 0.125
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-b.in
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.000 1.000 1.000 0.000 0.000 2.000 0.000 2
0.000 0.500 0.000 0.000
0.000 -0.500 0.000 0.000
0.010
0.125
4 changes: 2 additions & 2 deletions courses/artificialintelligence/assignments/flocking/tests/test-b.out
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.000 0.520 0.000 2.000
0.000 -0.520 0.000 -2.000
0.000 0.531 0.000 0.250
0.000 -0.531 0.000 -0.250
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-c.in
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.000 0.000 0.000 2.000 0.000 0.000 2.000 2
0.000 0.500 3.000 0.000
0.000 -0.500 -2.000 0.000
0.100
0.125
4 changes: 2 additions & 2 deletions courses/artificialintelligence/assignments/flocking/tests/test-c.out
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.400 0.500 4.000 0.000
-0.100 -0.500 -1.000 0.000
0.391 0.500 3.125 0.000
-0.234 -0.500 -1.875 0.000
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-d.in
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.000 1.000 1.000 0.000 3.000 2.000 0.000 2
0.000 0.500 0.000 0.000
0.000 -0.500 0.000 0.000
0.010
0.125
4 changes: 2 additions & 2 deletions courses/artificialintelligence/assignments/flocking/tests/test-d.out
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.000 0.490 0.000 -1.000
0.000 -0.490 0.000 1.000
0.000 0.484 0.000 -0.125
0.000 -0.484 0.000 0.125
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-e.in
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.000 2.000 1.000 1.000 0.000 2.000 3.000 2
0.000 0.500 -2.000 -1.000
0.000 -0.500 2.000 3.000
0.010
0.125
4 changes: 2 additions & 2 deletions courses/artificialintelligence/assignments/flocking/tests/test-e.out
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-0.020 0.540 -2.000 4.000
0.020 -0.460 2.000 4.000
-0.250 0.453 -2.000 -0.375
0.250 -0.109 2.000 3.125
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-f.in
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.000 0.000 0.000 1.000 1.000 0.000 2.000 2
0.000 0.500 -1.000 2.000
0.000 -0.500 3.000 1.000
0.010
0.125
4 changes: 2 additions & 2 deletions courses/artificialintelligence/assignments/flocking/tests/test-f.out
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.010 0.540 1.000 4.000
0.050 -0.450 5.000 5.000
-0.094 0.781 -0.750 2.250
0.406 -0.312 3.250 1.500
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-g.in
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.000 2.000 1.000 1.000 1.000 2.000 3.000 2
0.000 0.500 -2.000 -1.000
0.000 -0.500 2.000 3.000
0.020
0.125
4 changes: 2 additions & 2 deletions courses/artificialintelligence/assignments/flocking/tests/test-g.out
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-0.040 0.560 -2.000 3.000
0.040 -0.400 2.000 5.000
-0.250 0.438 -2.000 -0.500
0.250 -0.094 2.000 3.250
4 changes: 2 additions & 2 deletions courses/artificialintelligence/assignments/flocking/tests/test-h.in
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1.000 2.000 1.000 0.000 1.000 2.000 0.000 2
0.000 0.500 -2.000 -1.000
0.000 -0.500 2.000 3.000
0.020
0.100
0.125
0.125
8 changes: 4 additions & 4 deletions courses/artificialintelligence/assignments/flocking/tests/test-h.out
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-0.040 0.500 -2.000 0.000
0.040 -0.460 2.000 2.000
-0.373 0.545 -3.334 0.454
0.373 -0.305 3.334 1.546
-0.250 0.391 -2.000 -0.875
0.250 -0.141 2.000 2.875
-0.514 0.295 -2.114 -0.765
0.514 0.205 2.114 2.765
8 changes: 4 additions & 4 deletions courses/artificialintelligence/assignments/flocking/tests/test-i.out
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.278 0.180 -5.772 5.439
-1.528 1.070 -4.228 4.561
-2.559 2.812 -22.698 21.060
-3.691 3.438 -17.302 18.940
0.746 -0.251 -2.034 1.992
-1.175 0.681 -1.403 1.445
0.401 0.082 -2.760 2.661
-1.421 0.939 -1.967 2.065
9 changes: 4 additions & 5 deletions courses/artificialintelligence/assignments/flocking/tests/test-j.in
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
0.000 10.000 1.000 0.000 0.000 1.000 0.000 2
0.010 0.000 0.000 0.000
-0.010 0.000 0.000 0.000
0.010
0.010
0.010
0.010
0.010
0.125
0.125
0.125
0.25
18 changes: 8 additions & 10 deletions courses/artificialintelligence/assignments/flocking/tests/test-j.out
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
0.510 0.000 50.000 0.000
-0.510 0.000 -50.000 0.000
1.020 0.000 50.980 0.000
-1.020 0.000 -50.980 0.000
1.535 0.000 51.471 0.000
-1.535 0.000 -51.471 0.000
2.052 0.000 51.797 0.000
-2.052 0.000 -51.797 0.000
2.573 0.000 52.040 0.000
-2.573 0.000 -52.040 0.000
0.791 0.000 6.250 0.000
-0.791 0.000 -6.250 0.000
1.582 0.000 6.329 0.000
-1.582 0.000 -6.329 0.000
2.378 0.000 6.368 0.000
-2.378 0.000 -6.368 0.000
3.984 0.000 6.421 0.000
-3.984 0.000 -6.421 0.000
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-k.in
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1.000 1.000 1.000 1.000 1.000 2.000 0.500 1
0.000 0.500 1.000 0.000
0.010
0.125
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-k.out
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.015 0.500 1.500 0.000
0.133 0.500 1.062 0.000
4 changes: 2 additions & 2 deletions courses/artificialintelligence/assignments/flocking/tests/test-l.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
0.000 0.500 0.000 0.000
0.000 0.000 1.100 0.000
0.000 -0.500 0.000 0.000
0.010
0.010
0.125
0.125
12 changes: 6 additions & 6 deletions courses/artificialintelligence/assignments/flocking/tests/test-l.out
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
0.000 0.492 0.000 -0.750
0.011 0.000 1.100 0.000
0.000 -0.492 0.000 0.750
0.000 0.478 0.006 -1.489
0.022 0.000 1.089 0.000
0.000 -0.478 0.006 1.489
0.000 0.488 0.000 -0.094
0.138 0.000 1.100 0.000
0.000 -0.488 0.000 0.094
0.001 0.465 0.009 -0.185
0.273 0.000 1.083 0.000
0.001 -0.465 0.009 0.185
6 changes: 3 additions & 3 deletions courses/artificialintelligence/assignments/flocking/tests/test-m.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
-0.500 0.500 0.000 0.000
0.500 -0.500 0.000 0.000
0.000 0.000 0.000 0.000
0.010
0.010
0.020
0.125
0.125
0.125
24 changes: 12 additions & 12 deletions courses/artificialintelligence/assignments/flocking/tests/test-m.out
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
0.514 0.514 1.414 1.414
-0.514 -0.514 -1.414 -1.414
-0.514 0.514 -1.414 1.414
0.514 -0.514 1.414 -1.414
0.522 0.522 0.177 0.177
-0.522 -0.522 -0.177 -0.177
-0.522 0.522 -0.177 0.177
0.522 -0.522 0.177 -0.177
0.000 0.000 0.000 0.000
0.558 0.558 4.384 4.384
-0.558 -0.558 -4.384 -4.384
-0.558 0.558 -4.384 4.384
0.558 -0.558 4.384 -4.384
0.569 0.569 0.378 0.378
-0.569 -0.569 -0.378 -0.378
-0.569 0.569 -0.378 0.378
0.569 -0.569 0.378 -0.378
0.000 0.000 0.000 0.000
0.770 0.770 10.621 10.621
-0.770 -0.770 -10.621 -10.621
-0.770 0.770 -10.621 10.621
0.770 -0.770 10.621 -10.621
0.645 0.645 0.607 0.607
-0.645 -0.645 -0.607 -0.607
-0.645 0.645 -0.607 0.607
0.645 -0.645 0.607 -0.607
0.000 0.000 0.000 0.000
2 changes: 1 addition & 1 deletion courses/artificialintelligence/assignments/flocking/tests/test-o.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
0.000 0.000 0.000 0.000
1.000 0.000 0.000 0.000
-1.000 0.000 0.000 0.000
12345.000
256.000
12 changes: 6 additions & 6 deletions courses/artificialintelligence/assignments/flocking/tests/test-o.out
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-960.976 16687.769 -0.078 1.352
960.976 -16687.769 0.078 -1.352
960.976 16687.769 0.078 1.352
-960.976 -16687.769 -0.078 -1.352
-5103.697 88588.336 -19.938 346.046
5103.697 -88588.336 19.938 -346.046
5103.697 88588.336 19.938 346.046
-5103.697 -88588.336 -19.938 -346.046
0.000 0.000 0.000 0.000
80122.366 0.000 6.490 0.000
-80122.366 0.000 -6.490 0.000
425341.933 0.000 1661.488 0.000
-425341.933 0.000 -1661.488 0.000

0 comments on commit 3371c14

Please sign in to comment.