Refactor test group scoring to account for secret not being a test group

Author: Etienne Vouga

spec/2023-07-draft.md

@@ -1342,20 +1342,23 @@ It is a judge error if:
 
 #### Scoring Test Data Groups
 
-The score of `secret` is determined by its groups or test cases (it can only have one or the other).
 The score of a test data group is determined by its test cases.
 The score depends on the aggregation mode, which is either `pass-fail`, `sum`, or `min`.
 
 - If a group uses `pass-fail` aggregation, the group must have bounded maximum score.
 If the submission receives an accepted verdict for all test cases in the group,
 the score of the group is equal to its maximum possible score.
 Otherwise the group score is 0.
-- If a group uses `sum` aggregation, the group score is the sum of the scores of its test cases or groups.
+- If a group uses `sum` aggregation, the group score is the sum of the scores of its test cases.
 - If a group uses `min` aggregation, then the group score is the minimum of these scores.
 
+The score of `secret` is determined by its groups or test cases (it can only have one or the other). 
+- If `secret` uses `pass-fail` aggregation, then `secret` must have bounded maximum score. If the submission receives an accepted verdict for all test cases in `secret`, or for all test cases in its test data groups (which must also have `pass-fail` aggregation), then the score of `secret` is equal to its maximum possible score. Otherwise the score of `secret` is 0. 
+- If `secret` uses `sum` or `min` aggregation, then the score of `secret` is computed from the scores of its test cases or test data groups, analogously to test data group scoring above.
+
 The submission score is the score of `secret`. 
 
-It is a judge error if the score of `secret`, or any test data group exceeds its `max_score`.
+It is a judge error if the score of `secret` or any test data group exceeds its `max_score`.
 
 #### Required Dependent Groups