From 02154f338d448fdc67fc1732cfe4a4ca94ed8a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Brigidano=20P=C3=A9rez?= <47502355+Ivan-Brigidano@users.noreply.github.com> Date: Fri, 31 Dec 2021 13:20:48 +0100 Subject: [PATCH] Merge `draft` into `official` (#1038) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Migrate Travis to GitHub Actions (#1021) * Add GitHub actions integration * Remove Travis config file * Use Python3 distribution for Regulations Compiler * Typo fixes (#1022) * Typo fixes * Update wca-regulations.md * Update wca-regulations.md * Update wca-regulations.md Co-authored-by: Lucas Garron Co-authored-by: Lucas Garron * Small typo fix (#1023) * Typo fix * Regulation 9o typo fix * Strongly recommend competitors to turn off notifications and calls (#1024) * Adds regulation about recomending competitors turn off cell phone notifications while competing In alignment with what was discussed in the WRC meeting and as a partial consequence of [this discussion](https://forum.worldcubeassociation.org/t/proposal-a-competitor-must-not-interact-with-a-mobile-phone/3215), this commit adds a Regulation stating that competitors should turn off all cell phone notifications while competing. * Update wca-regulations.md Co-authored-by: Antonio Kam <19kamh3@gmail.com> Co-authored-by: Iván Brigidano Pérez <47502355+Ivan-Brigidano@users.noreply.github.com> Co-authored-by: Antonio Kam <19kamh3@gmail.com> * Approving Speed Stacks Stackmat timer Generation 5 (#1025) * Add gen5 timers * Update wca-guidelines.md Co-authored-by: Jacob Ambrose * Changes based on Staff feedback * Update wca-regulations.md Co-authored-by: Antonio Kam <19kamh3@gmail.com> * Update wca-regulations.md Co-authored-by: Lucas Garron Co-authored-by: Jacob Ambrose Co-authored-by: Antonio Kam <19kamh3@gmail.com> Co-authored-by: Lucas Garron * 2j2 clarification (#1026) * Clarification on late competitors to rounds with cumulative time limits (#1027) * Clasification on late competitors * Changes based on Staff feedback * Fixes * Update wca-regulations.md Co-authored-by: Lucas Garron Co-authored-by: Lucas Garron * Clarification on Clock hardware, which is approved at WCA Delegate discretion (#1028) * Clarification on Clock hardware * Update wca-guidelines.md Co-authored-by: Jacob Ambrose * Update wca-guidelines.md Co-authored-by: Lucas Garron Co-authored-by: Jacob Ambrose Co-authored-by: Lucas Garron * Puzzles are allowed to have transparent parts as long as they do not provide additional information (#1029) * Add examples to 3h2a * Update wca-guidelines.md Co-authored-by: Lucas Garron Co-authored-by: Lucas Garron * Improve Regulation 2i wording (#1030) * Improve Regulation 2i wording * Update wca-regulations.md Co-authored-by: Lucas Garron Co-authored-by: Lucas Garron * Results done with an unattached timer may not be replaced (#1031) * Changes based on Staff feedback * Improving wording * Update wca-guidelines.md * Update wca-guidelines.md Co-authored-by: Lucas Garron * Update wca-guidelines.md Co-authored-by: Lucas Garron * 3j1+) Remove an extra space character (#1033) From https://github.com/thewca/wca-regulations/pull/1028#discussion_r757718171 * Improve Regulation 2j2 wording (#1034) * Improve Regulation 2j2 wording * Update wca-regulations.md Co-authored-by: Lucas Garron Co-authored-by: Lucas Garron * Update wca-guidelines.md (#1035) * Clarification on late competitors to MBLD attempts (#1037) * Clarification on late competitors to MBLD attempts * Update wca-guidelines.md * Update wca-guidelines.md * Update the version date (#1032) * Fix Regulation 2i wording (#1039) Co-authored-by: Gregor Billing Co-authored-by: Lucas Garron Co-authored-by: Pedro Miranda Co-authored-by: Antonio Kam <19kamh3@gmail.com> Co-authored-by: Jacob Ambrose --- .github/workflows/python-app.yml | 31 +++++++++++++++++++++++++++++++ .travis.yml | 8 -------- wca-guidelines.md | 10 +++++++--- wca-regulations.md | 25 ++++++++++++++----------- 4 files changed, 52 insertions(+), 22 deletions(-) create mode 100644 .github/workflows/python-app.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml new file mode 100644 index 00000000..6e120546 --- /dev/null +++ b/.github/workflows/python-app.yml @@ -0,0 +1,31 @@ +# This workflow will install Python dependencies, run tests and lint with a single version of Python +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions + +name: Python application + +on: + push: + branches: [ draft, official ] + pull_request: + branches: [ draft, official ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3 + uses: actions/setup-python@v2 + with: + python-version: 3.9 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install wrc + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Check with Python WRC script + run: | + wrc . --target=check + wrc-states wca-states.md --target=check diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bd4984d0..00000000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ -language: python -python: - - "2.7" -install: - - pip install wrc -script: - - wrc . --target=check - - wrc-states wca-states.md --target=check diff --git a/wca-guidelines.md b/wca-guidelines.md index 18c6bce7..f7049cde 100644 --- a/wca-guidelines.md +++ b/wca-guidelines.md @@ -1,6 +1,6 @@ # WCA Guidelines -Version: May 1, 2021 +Version: January 1, 2022 ## Notes @@ -36,7 +36,7 @@ To be more informative, each Guideline is classified using one of the following - 1c++) [CLARIFICATION] WCA Delegates may attend the competition without being designated to serve in the WCA Delegate role for the competition. "The WCA Delegate" does not refer to them unless they have been appointed with a relevant responsibility by a designated WCA Delegate for the competition (see [Guideline 1c+](guidelines:guideline:1c+)). - 1h+) [RECOMMENDATION] Competitors in the same group should use the same scramble sequences. Different groups should use different scramble sequences. - 1h++) [RECOMMENDATION] All attempts in the final round of an event, as well as all 3x3x3 Fewest Moves attempts, should have the same scramble sequences for all competitors (i.e. only 1 group). -- 1h1+) [CLARIFICATION] Scramblers/judges should only scramble for/judge other competitors in the same group only if it is important for competition logistics. +- 1h1+) [CLARIFICATION] Scramblers/judges should only scramble for/judge other competitors in the same group if it is important for competition logistics. - 1h1++) [CLARIFICATION] For 3x3x3 Fewest Moves, judges may judge competitors in their own group before they have finished their attempt (i.e. while they are competing). @@ -58,6 +58,7 @@ To be more informative, each Guideline is classified using one of the following - 2j2+) [EXAMPLE] For example, if a competitor is disqualified from an event for failing to show up for the final round, their results from earlier rounds remain valid. - 2k6+) [CLARIFICATION] WCA Delegates should only use their discretion to prevent competitors from being a severe detriment to the competition (e.g. wasting time and/or competition resources). Competitors should not be disqualified for a "poor" result when they are competing to the best of their abilities. - 2s+) [REMINDER] Special accommodations must be noted in the Delegate Report. +- 2u1+) [ADDITION] The competitor may compete at the discretion of the WCA Delegate. The WCA Delegate must carefully consider the fairness of allowing it. ## Article 3: Puzzles @@ -70,8 +71,10 @@ To be more informative, each Guideline is classified using one of the following - 3h+) [CLARIFICATION] Puzzles may be refined internally by sanding, lubrication, or modifications which improve stability (e.g. magnets). - 3h++) [EXAMPLE] Examples of enhancements include: new moves are possible, normal moves are impossible, more pieces or faces are visible, colors on the backside of the puzzle are visible, moves are done automatically, or the puzzles have more/different solved states. - 3h2++) [CLARIFICATION] "Stickerless" puzzles that significantly differ from most mass-produced "stickerless" puzzles are only permitted at the discretion of the WCA Delegate. +- 3h2a+) [ADDITION] Examples of transparent parts that do not reveal more information about the state of the puzzle: internal parts of the puzzle mechanism, transparent Clock cases. - 3j+) [REMINDER] In the past, engraved/embossed parts have been permitted. This is no longer permitted. - 3j++) [CLARIFICATION] On Clock, pins may be distinguishable from any other pin of the same side. +- 3j1+) [REMINDER] On Clock, loose pins (i.e. pins that can toggle or recede using gravity instead of being directly pressed) are not considered reasonable wear. - 3j2+) [CLARIFICATION] On Clock, the nine inner clock faces on one side are considered similar pieces. - 3k2+) [ADDITION] The WCA Delegate should not apply a listed exception if they believe the competitor tried to use a non-permitted puzzle on purpose. - 3k2b+) [CLARIFICATION] If a non-permitted puzzle is found during the course of a 3x3x3 Multi-Blind attempt, the puzzle must not be exchanged or removed from the attempt and must be counted as unsolved if the entire attempt is not disqualified. @@ -116,7 +119,7 @@ To be more informative, each Guideline is classified using one of the following - 9b3b+) [CLARIFICATION] The "Mean of 3" statistic does not affect the competitor's ranking in a "Best of 3" round (which is based on the best result). The WCA recognizes it outside of the competition format. - 9f1+) [EXAMPLE] If the timer displays 12.678 for an attempt, the original recorded time is 12.67 (drop any digit after a hundredth of a second). A judge may write the full-precision time on the score sheet (and keep the precision in the calculation of penalties), as long as the score taker truncates it for the official results. - 9f4+) [EXPLANATION] The result of an attempt is DNF only if the competitor began the attempt by indicating that they are ready (see [Regulation A3b2](regulations:regulation:A3b2)) but the attempt was disqualified. -- 9f5+) [CLARIFICATION] The result of an attempt is DNS if the competitor was eligible for the attempt and did not start it (see [Regulation A3b2](regulations:regulation:A3b2)). If the competitor did not qualify for an attempt (e.g. in a cutoff round), they have no result for the attempt. +- 9f5+) [CLARIFICATION] The result of an attempt is DNS if the competitor was eligible for the attempt and did not start it (see [Regulation A3b2](regulations:regulation:A3b2)). If the competitor did not qualify for an attempt (e.g. in a Cutoff Round), they have no result for the attempt. - 9p2+) [CLARIFICATION] Result refers to the single or average that determines the ranking of the corresponding round. - 9q+) [RECOMMENDATION] Events and rounds should have at least 2 competitors. - 9t+) [EXPLANATION] Because of [9t1](regulations:regulation:9t1) and [9t2](regulations:regulation:9t2), rounds may look like they do not comply with [9p1](regulations:regulation:9p1), [9m1](regulations:regulation:9m1), [9m2](regulations:regulation:9m2) or [9m3](regulations:regulation:9m3). However, making changes to comply to these rules would affect innocent competitors, which is why the results must stay the same. @@ -208,6 +211,7 @@ To be more informative, each Guideline is classified using one of the following ## Article H: Multi-Blind Solving - H1+) [ADDITION] If a puzzle with a duplicate scramble is found during an attempt, the puzzle may be re-scrambled using a different scramble sequence, at the discretion of the WCA Delegate. +- H1b+) [ADDITION] A competitor may join a Multi-Blind attempt that is already in progress, at the discretion of the WCA Delegate. In this case, their time limit is the time remaining (i.e. they must finish when other competitors reach their time limit). Exception: a competitor must not be permitted to join a Multi-Blind attempt if any competitor has finished their attempt already, or if there is any other risk that information about the scramble may have become known to the competitor who wishes to join. - H1b1+) [REMINDER] The attempt is not disqualified for reaching the time limit, due to exceptions for 3x3x3 Multi-Blind (see [Regulation A1a4](regulations:regulation:A1a4) and [Regulation A1a5](regulations:regulation:A1a5)). - H1b1++) [ADDITION] The judge may permit the competitor to continue the attempt unofficially, but the attempt must be stopped and judged first, in full accordance with the Regulations. - H1d+) [EXAMPLE] Example: Suppose a competitor attempts 10 cubes, stops the solve with a time of 59:57, and has two time penalties. The time of the final result is 59:57 + 2*2 = 60:01 (also see [Regulation A1a5](regulations:regulation:A1a5)). diff --git a/wca-regulations.md b/wca-regulations.md index a8d55e10..53fc1c14 100644 --- a/wca-regulations.md +++ b/wca-regulations.md @@ -1,6 +1,6 @@ # WCA Regulations -Version: May 1, 2021 +Version: January 1, 2022 ## Notes @@ -63,7 +63,7 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - 2a) Any person may compete in a WCA competition if they (complemented by [Regulation Y3](regulations:regulation:Y3)): - 2a1) Comply with WCA Regulations. - 2a2) Meet the competition requirements, which must be clearly announced before the competition. - - 2a3) Are not suspended by WCA Board. + - 2a3) Are not suspended by the WCA Board. - 2b) Competitors below the age of 18 must obtain consent from their parent(s)/guardian(s) to register and compete. - 2c) Competitors register by providing all information required by the organization team (including: name, country, date of birth, gender, contact information, selected events). - 2c1) A competitor is not eligible to compete without a completed registration, as determined by the organization team. @@ -77,7 +77,7 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - 2g) Competitors must remain quiet when inside the designated competition area. Talking is permitted, but must be kept at a reasonable level, and away from competitors who are actively competing. - 2g3) Competitors in a Competitor Waiting Area must not communicate with each other about the scrambled states of the puzzles of the round in progress. Penalty: disqualification of the competitor(s) from the event, at the discretion of the WCA Delegate. - 2h) Competitors must be fully dressed while in the competition venue. At the discretion of the WCA Delegate, competitors may be disqualified from the competition for inappropriate clothing. -- 2i) While competing, competitors must not use electronics or audio equipment (e.g. cell phones, MP3 players, dictaphones, additional lighting) apart from the Stackmat timer or stopwatch. +- 2i) While inspecting or solving, competitors must not use electronics or audio equipment (e.g. cell phones, MP3 players, dictaphones, additional lighting) apart from the Stackmat timer or stopwatch. - 2i1) Competitors may use non-electronic aids that do not give an unfair advantage, at the discretion of the WCA Delegate. This includes: - 2i1a) Medical/physical aids worn by the competitor (e.g. glasses, wrist brace). As an exception to [Regulation 2i](regulations:regulation:2i), medical aids may be electronic if the competitor does not have comfortable non-electronic alternatives (e.g. if the competitor has a personal hearing aid or pacemaker). - 2i1b) Earplugs and earmuffs (but not electronic headphones and earbuds). @@ -87,10 +87,11 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - 2i2a) Each camera monitor must be blank or out of sight of the competitor (see [Regulation A5b](regulations:regulation:A5b)). - 2i2b) The competitor must not interact with (e.g. operate, hold, wear) any active camera. Exception: the competitor may wear a camera mounted on their head, as long as it is out of their sight and it is clear that they are not interacting with it (apart from wearing it). - 2i3) The competitor may have a cell phone in their pocket, as long as it is clear that they are not otherwise interacting with it. + - 2i4) Competitors should turn off all cell phone notifications while competing to avoid disturbing the competition. - 2j) The WCA Delegate may disqualify a competitor from a specific event. - 2j1) If a competitor is disqualified from an event for any reason, they are not eligible for any more attempts in the event. - 2j1a) If the competitor has already started at least one attempt in a round before being disqualified from it, the results of all remaining attempts in the event are recorded as DNF. If the competitor has started no attempts (i.e. has no results or only has DNS results), no results are recorded. - - 2j2) If a competitor is disqualified during the course of an event, their earlier results remain valid. Exception: cheating or defrauding (see [Regulation 2k2a](regulations:regulation:2k2a)). + - 2j2) If a competitor is disqualified during the course of an event, results from attempts that are already finished when the competitor is disqualified remain valid. Exception: cheating or defrauding (see [Regulation 2k2a](regulations:regulation:2k2a)). - 2k) At the discretion of the WCA Delegate, a competitor may be disqualified from some events (a single event, multiple events, or all events) if the competitor: - 2k1) Fails to check in or register in time for the competition. - 2k2) Is suspected of cheating or defrauding the officials during the competition. @@ -109,6 +110,7 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - 2t) Each competitor must be familiar with and understand the WCA Regulations before the competition. - 2u) Competitors must be present and ready to compete when they are called to compete for an attempt. Penalty: disqualification from the event. - 2u1) Exception: A competitor who is not present in time for an individually scheduled attempt (e.g. a 3x3x3 Fewest Moves attempt, a 3x3x3 Multi-Blind attempt) may be considered to have declined that attempt (DNS), at the discretion of the WCA Delegate. + - 2u2) Exception: For rounds with a cumulative time limit, a competitor who arrives late may compete with a reduced cumulative time limit, at the discretion of the WCA Delegate. ## Article 3: Puzzles @@ -198,12 +200,13 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - 7e) The competition area must be smoke-free. - 7f) Solving station: - 7f1) Definitions: - - 7f1a) Stackmat: The Speed Stacks Stackmat timer and a full-size compatible mat. Generation 2, Generation 3 Pro Timer, and/or Generation 4 Pro Timer must be used for time measurement. + - 7f1a) Stackmat: The Speed Stacks Stackmat timer and a full-size compatible mat. Generation 2, Generation 3 Pro Timer, Generation 4 Pro Timer, and/or Generation 5 Pro Timer must be used for time measurement. - 7f1b) Mat: The mat of the Stackmat. - 7f1c) Timer: The timer of the Stackmat, or a stopwatch (for longer attempts). - 7f1d) Surface: The flat surface on which the Stackmat has been placed. The mat is considered a part of the surface. The timer is not considered a part of the surface. - 7f2) The Stackmat timer must be attached to the mat and placed on the surface, with the timer on the side of the mat nearest to the competitor. - 7f3) The organization team should modify Stackmat timers to be more robust against common incidents, by making the buttons more difficult to press by accident (e.g. by attaching O-rings around the buttons) and securing the battery more firmly (e.g. by padding the battery compartment). + - 7f4) Generation 5 Pro Timer must be used in 2-pad mode. - 7h) The competition area must have one or more Competitor Waiting Areas (superseded by [Regulation Y6a](regulations:regulation:Y6a)). - 7h1) The organization team may require that a competitor who has been called to compete must remain within their assigned Competitor Waiting Area until the competitor has finished all attempts for the round. - 7h2) Definition: A Competitor Waiting Area is an area in which competitors in a group wait at to be called to a solving station. @@ -223,7 +226,7 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - 9b3a) Full round format for these events: "Best of 3". - 9b3b) For these events, the WCA also recognizes "Mean of 3" rankings and records based on the times from "Best of 3" rounds. - 9b4) 3x3x3 Fewest Moves. - - 9b4a) Full round formats for this event: Best of X" (where X is 1 or 2) or "Mean of 3". + - 9b4a) Full round formats for this event: "Best of X" (where X is 1 or 2) or "Mean of 3". - 9b4b) Cutoff formats for this event: "Best of 1" cutoff phase for "Best of 2" or "Best of X" (where X is 1 or 2) cutoff phase for "Mean of 3". - 9b5) 3x3x3 Multi-Blind. - 9b5a) Full round formats for this event: "Best of X" (where X is 1, 2, or 3). @@ -258,7 +261,7 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - 9m1) Rounds with 99 or fewer competitors must have at most two subsequent rounds. - 9m2) Rounds with 15 or fewer competitors must have at most one subsequent round. - 9m3) Rounds with 7 or fewer competitors must not have subsequent rounds. -- 9o) Cutoff rounds count as one round when counting the number of rounds per event. +- 9o) Cutoff Rounds count as one round when counting the number of rounds per event. - 9p) If an event has multiple rounds, then: - 9p1) At least 25% of competitors must be eliminated between consecutive rounds of the same event. - 9p2) The competitors who advance to the next round must be determined by ranking (best x competitors) or by result (all competitors with a better result than x) in the preceding round. @@ -279,7 +282,7 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - 10e) A puzzle is solved when all colored parts are reassembled and all parts are aligned within the limits specified below: - 10e1) For every two adjacent parts (e.g. two parallel, adjacent slices of a cube) of the puzzle that are misaligned by more than the limit described in [Regulation 10f](regulations:regulation:10f), the puzzle is considered to require one additional move to solve (see "Outer Block Turn Metric" in [Article 12](regulations:article:12)). - 10e2) If no further moves are required to bring the puzzle to its solved state, the puzzle is considered solved without penalty. - - 10e3) If one move is required, the puzzle is be considered solved with a time penalty (+2 seconds). + - 10e3) If one move is required, the puzzle is considered solved with a time penalty (+2 seconds). - 10e4) If more than one move is required, the puzzle is considered unsolved (DNF). - 10f) Limits of acceptable misalignment for puzzles: - 10f1) NxNxN Cubes: at most 45 degrees. @@ -336,8 +339,8 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - 12d1a) Clockwise, 72 degrees: U (upper face). - 12d1b) Counter-clockwise, 72 degrees: U' (upper face). - 12d2) Other moves are applied while keeping 3 pieces fixed at the top left of the puzzle: - - 12d2c) Clockwise 144 degrees move of whole puzzle except for the slice of top left three pieces: R++ (vertical slices), D++ (horizontal slices). - - 12d2d) Counter-clockwise 144 degrees move of whole puzzle except for the slice of top left three pieces: R-- (vertical slices), D-- (horizontal slices). + - 12d2c) Clockwise 144 degrees move of the whole puzzle except for the slice of top left three pieces: R++ (vertical slices), D++ (horizontal slices). + - 12d2d) Counter-clockwise 144 degrees move of the whole puzzle except for the slice of top left three pieces: R-- (vertical slices), D-- (horizontal slices). - 12e) Notation for Pyraminx: - 12e1) The puzzle is oriented with the bottom face completely horizontal and the front face facing the person who is holding the Pyraminx. - 12e2) Clockwise, 120 degrees: U (upper 2 layers), L (left 2 layers), R (right 2 layers), B (back 2 layers), u (upper vertex), l (left vertex), r (right vertex), b (back vertex). @@ -379,7 +382,7 @@ Note: Because Article and Regulation numbers are not reassigned when Regulations - A3) Inspection: - A3a) The competitor may inspect the puzzle at the start of each attempt. - A3a1) The competitor is allotted a maximum of 15 seconds to inspect the puzzle and start the solve. - - A3b) The judge prepares the timer by turning it on and resetting if necessary. Separately, the judge also prepares a stopwatch for timing inspection (partially superseded by [Regulation Y7d1](regulations:regulation:Y7d1)). + - A3b) The judge prepares the timer by turning it on and resetting if necessary. If a Generation 5 Pro Timer is in use, the judge must ensure it is set to 2-Pad mode. Separately, the judge also prepares a stopwatch for timing inspection (partially superseded by [Regulation Y7d1](regulations:regulation:Y7d1)). - A3b1) When the judge believes the competitor is ready, the judge asks "READY?". The competitor must be ready to start the attempt within one minute from the moment they are asked, or else the competitor forfeits the attempt (DNS), at the discretion of the judge. - A3b2) The competitor starts the attempt by confirming that they are ready, and the judge uncovers the puzzle and starts timing the inspection. - A3c) The competitor may pick up the puzzle during inspection.