Merge branch 'master' into clarify-groups

Author: niemela

spec/2023-07-draft.md

@@ -574,9 +574,9 @@ The format of `test_group.yaml` is as follows:
 Key                       | Type                                | Default                                        | Comments
 ------------------------- | ----------------------------------- | ---------------------------------------------- | --------
 `max_score`               | Integer or `unbounded`              | 100 in `secret`, otherwise `unbounded`         | The maximum possible score of the test data group or `secret`. Must be a non-negative integer or `unbounded`. This key is not permitted in `sample`.
-`score_aggregation`       | `pass-fail`, `sum`, or `min`        | `sum` in `secret`, otherwise `pass-fail`       | How the score is determined based on the scores of the contained groups or test cases. [See Result Aggregation](#result-aggregation). This key is not permitted in `sample`.
-`static_validation_score` | Integer or `pass-fail`            |                                                | The maximum score of the static validation test case, or `pass-fail`. See [Static Validator](#static-validator).
-`require_pass`            | String or sequence of strings       | empty sequence                                 | Other test data groups (or `sample`) whose test cases a submission must pass in order to receive a score for this test data group. [See Result Aggregation](#result-aggregation). This key is not permitted in `sample`.
+`score_aggregation`       | `pass-fail`, `sum`, or `min`        | `sum` in `secret`, otherwise `pass-fail`       | How the score is determined based on the scores of the contained groups or test cases. See [Result Aggregation](#result-aggregation). This key is not permitted in `sample`.
+`static_validation_score` | Integer or `pass-fail`              |                                                | The maximum score of the static validation test case, or `pass-fail`. See [Static Validator](#static-validator).
+`require_pass`            | String or sequence of strings       | empty sequence                                 | Other test data groups (or `sample`) whose test cases a submission must pass in order to receive a score for this test data group. See [Result Aggregation](#result-aggregation). This key is not permitted in `sample`.
 `args`                    | Sequence of strings                 | empty sequence                                 | See [Test Case Configuration](#test-case-configuration).
 `input_validator_args`    | Sequence of strings or map of strings to sequences of strings | empty sequence       | See [Test Case Configuration](#test-case-configuration).
 `static_validator_args`   | Sequence of strings                 | empty sequence                                 | See [Static Validator](#static-validator).
@@ -1297,10 +1297,14 @@ The goal of each submission is to maximize this score.
 Given a submission, scores are determined for test cases, [test data groups](#test-data-groups), and `secret` (which is the score of the submission itself).
 The scoring behavior is configured for `secret` and each test data group by `max_score`, `score_aggregation`, and `require_pass` in its [`test_group.yaml`](#test-data-configuration).
 
+The value of `score_aggregation` determines how the score of `secret` or a test data group is computed; see [Scoring Test Groups](#scoring-test-groups).  
 The default value of `score_aggregation` is `sum` for `secret` and `pass-fail` for test data groups. 
+If `secret` has `pass-fail` aggregation, then so must all of its test data groups.
+
+The `require_pass` key may be used to indicate that `secret` or a test data group should only be scored if all test cases in `sample` or an earlier test data group received an accepted verdict; see [Required Dependent Groups](#required-dependent-groups).
 The default value of `require_pass` is an empty sequence.
 
-For `secret`, all test data groups, and every test case in a group with `sum` or `min` aggregation, there is a maximum possible score.
+For `secret`, all test data groups with `sum` or `min` aggregation, and every test case in a group with `sum` or `min` aggregation, there is a maximum possible score.
 The default value of `max_score` for `secret` is 100.
 The default value of `max_score` for test data groups is `unbounded`.
 Test data groups may only have `unbounded` maximum score if `secret` is unbounded.
@@ -1333,6 +1337,7 @@ It is a judge error if:
 - an output or static validator produces a `score_multiplier.txt` for a test case with unbounded maximum score;
 - an output or static validator produces both a `score.txt` and a `score_multiplier.txt` for a test case;
 - an output or static validator produces a `score.txt` or `score_multiplier.txt` for a test case in a group with `pass-fail` aggregation;
+- an output or static validator produces a `score.txt` for a test case with bounded maximum score with a value that exceeds this maximum score;
 - an output or static validator produces a `score.txt` or `score_multiplier.txt` with invalid contents.
 
 #### Scoring Test Data Groups