Skip to content

Commit 2d120af

Browse files
author
replabrobin
committed
added CT code for disable hammer throw
1 parent a69dd1a commit 2d120af

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

‎athlib/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def __wma_delay__():
66
from .hungarian_score import score as hungarian_score
77
from .athlon_score import performance as athlon_performance_needed
88

9-
__version__ = u'0.6.10'
9+
__version__ = u'0.6.11'
1010

1111
from .exceptions import RuleViolation
1212

‎athlib/codes.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
"SBT", #seated BT
3232

3333
#Target Throw, Overhead Throw, Chest Throw from UK SportsHall (kids) format
34-
"TART", "OHT", "CHT"
34+
"TART", "OHT", "CHT",
35+
36+
#disabled hammer throw
37+
"CT",
3538
)
3639
MULTI_EVENTS = (
3740
# Greek prefixes for 2..12 events, and for 20.
@@ -61,7 +64,7 @@
6164
"PV",
6265
"LJ", "SLJ",
6366
"TJ", "STJ",
64-
"SP", "DT", "HT", "JT",
67+
"SP", "DT", "HT", "JT", "CT",
6568
"ST", "GDT", "BT", "WT", "SWT", "OT", "TART", "OHT", "CHT", "SDT", "SJT", "SBT",
6669
"H1", "H2", "H3", "H4", "H5", "H6", "H7", "H8", "H9", #Custom Events
6770
"L1", "L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9", #Custom Events
@@ -86,7 +89,7 @@ def _orjoin(*res):
8689
r"^(?:"
8790
r"[sS]?[dD][tT](?P<dtnum>%s|)|"
8891
r"[sS]?[jJ][tT](?P<jtnum>[45678]00\s*g?|)|"
89-
r"[hH][tT](?P<htnum>%s|)|"
92+
r"[hHcC][tT](?P<htnum>%s|)|"
9093
r"[sS][pP](?P<spnum>%s|)|"
9194
r"[wW][tT](?P<wtnum>\d?%s|)|"
9295
r"[sS][sW][tT](?P<swtnum>%s|)|"

‎docs/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
# built documents.
6565
#
6666
# The short X.Y version.
67-
version = u'0.6.10'
67+
version = u'0.6.11'
6868
# The full version, including alpha/beta/rc tags.
6969
release = version
7070

‎js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "athlib",
3-
"version": "0.6.10",
3+
"version": "0.6.11",
44
"description": "Athletics Library",
55
"main": "./index.js",
66
"scripts": {

‎js/src/patterns.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// automatically generated by ../../scripts/make-patterns-js.py Mon Jun 14 15:41:31 2021
1+
// automatically generated by ../../scripts/make-patterns-js.py Mon Aug 8 13:10:33 2022
22

33
var FIELD_EVENTS = [
44
'HJ',
@@ -23,7 +23,8 @@ var FIELD_EVENTS = [
2323
'SBT',
2424
'TART',
2525
'OHT',
26-
'CHT'
26+
'CHT',
27+
'CT'
2728
];
2829
var FIELD_SORT_ORDER = [
2930
'HJ',
@@ -37,6 +38,7 @@ var FIELD_SORT_ORDER = [
3738
'DT',
3839
'HT',
3940
'JT',
41+
'CT',
4042
'ST',
4143
'GDT',
4244
'BT',
@@ -137,7 +139,8 @@ var THROWS = [
137139
'SBT',
138140
'TART',
139141
'OHT',
140-
'CHT'
142+
'CHT',
143+
'CT'
141144
];
142145
var CUSTOM_EVENTS = [
143146
'H1',
@@ -218,15 +221,15 @@ var FIELD_EVENT_RECORDS_BY_GENDER = {
218221
'JT': 104.8
219222
}
220223
};
221-
var PAT_EVENT_CODE = /^(?:[bB][iI]|[tT][rR][iI]|[qQ][uU][aA][dD]|[pP][eE][nN]|[hH][eE][xX]|[hH][eE][pP]|[oO][cC][tT]|[eE][nN][nN]|[dD][eE][cC]|[hH][eE][nN]|[dD][oO][dD]|[iI][cC][oO]|[pP][eE][nN][iI]|[pP][eE][nN][wW][tT]|(?:(\d+)\s*([lLsS]?[hH]\s*((3[36])|(\d{2,3}\.?\d*cm)\s*(?:(\d{1,3}\.?\d*m)(?:\s*(\d{1,3}\.?\d*m))?)?)?|[sS][cC]|[yY]|[wW])?)|[sS][cC]|[2345][mM][tT]|[lL][hH]|[sS][hH]|(?:[mM][iI][lL][eE]|[mM][aA][rR]|[hH][mM])[wW]?|[xX][cC]|(?:\d{1,3}(\.\d\d?)?(?:[MKk]|[MKk][wW]|[wW]))|(\d{1,2})[xX](\d{2,5}[hH]?|[rR][eE][lL][aA][yY])|[sS]?[dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[jJ][tT]([45678]00\s*g?|)|[hH][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][pP](\s*\d\.?\d*\s*[Kk][Gg]?|)|[wW][tT](\d?\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][sW][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[bB][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[gG][dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[oO][tT](\d+\s*g?|)|[tT][aA][rR][tT]|[cC][hH][tT]|[oO][hH][tT]|[Hh][1-9]|[Ll][1-9]|[sS]?[hH][jJ]|[pP][vV]|[sS]?[lL][jJ]|[sS]?[tT][jJ]|(\d{1,2})[xX](\d{2,5}[hH]?|[rR][eE][lL][aA][yY])|(\d{2,4})(?:[lLsS]?[hH]\s*((3[36])|(\d{2,3}\.?\d*cm)\s*(?:(\d{1,3}\.?\d*m)(?:\s*(\d{1,3}\.?\d*m))?)?)?|[sS][cC])|(\d\d?)([hH](?:[rR]|[wW]))|[tT](\d+)|[Hh][1-9]|SPB|BAL|[Ll][1-9])$/;
222-
var PAT_FIELD = /^(?:[sS]?[dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[jJ][tT]([45678]00\s*g?|)|[hH][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][pP](\s*\d\.?\d*\s*[Kk][Gg]?|)|[wW][tT](\d?\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][sW][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[bB][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[gG][dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[oO][tT](\d+\s*g?|)|[tT][aA][rR][tT]|[cC][hH][tT]|[oO][hH][tT]|[Hh][1-9]|[Ll][1-9]|[sS]?[hH][jJ]|[pP][vV]|[sS]?[lL][jJ]|[sS]?[tT][jJ])$/;
224+
var PAT_EVENT_CODE = /^(?:[bB][iI]|[tT][rR][iI]|[qQ][uU][aA][dD]|[pP][eE][nN]|[hH][eE][xX]|[hH][eE][pP]|[oO][cC][tT]|[eE][nN][nN]|[dD][eE][cC]|[hH][eE][nN]|[dD][oO][dD]|[iI][cC][oO]|[pP][eE][nN][iI]|[pP][eE][nN][wW][tT]|(?:(\d+)\s*([lLsS]?[hH]\s*((3[36])|(\d{2,3}\.?\d*cm)\s*(?:(\d{1,3}\.?\d*m)(?:\s*(\d{1,3}\.?\d*m))?)?)?|[sS][cC]|[yY]|[wW])?)|[sS][cC]|[2345][mM][tT]|[lL][hH]|[sS][hH]|(?:[mM][iI][lL][eE]|[mM][aA][rR]|[hH][mM])[wW]?|[xX][cC]|(?:\d{1,3}(\.\d\d?)?(?:[MKk]|[MKk][wW]|[wW]))|(\d{1,2})[xX](\d{2,5}[hH]?|[rR][eE][lL][aA][yY])|[sS]?[dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[jJ][tT]([45678]00\s*g?|)|[hHcC][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][pP](\s*\d\.?\d*\s*[Kk][Gg]?|)|[wW][tT](\d?\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][sW][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[bB][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[gG][dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[oO][tT](\d+\s*g?|)|[tT][aA][rR][tT]|[cC][hH][tT]|[oO][hH][tT]|[Hh][1-9]|[Ll][1-9]|[sS]?[hH][jJ]|[pP][vV]|[sS]?[lL][jJ]|[sS]?[tT][jJ]|(\d{1,2})[xX](\d{2,5}[hH]?|[rR][eE][lL][aA][yY])|(\d{2,4})(?:[lLsS]?[hH]\s*((3[36])|(\d{2,3}\.?\d*cm)\s*(?:(\d{1,3}\.?\d*m)(?:\s*(\d{1,3}\.?\d*m))?)?)?|[sS][cC])|(\d\d?)([hH](?:[rR]|[wW]))|[tT](\d+)|[Hh][1-9]|SPB|BAL|[Ll][1-9])$/;
225+
var PAT_FIELD = /^(?:[sS]?[dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[jJ][tT]([45678]00\s*g?|)|[hHcC][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][pP](\s*\d\.?\d*\s*[Kk][Gg]?|)|[wW][tT](\d?\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][sW][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[bB][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[gG][dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[oO][tT](\d+\s*g?|)|[tT][aA][rR][tT]|[cC][hH][tT]|[oO][hH][tT]|[Hh][1-9]|[Ll][1-9]|[sS]?[hH][jJ]|[pP][vV]|[sS]?[lL][jJ]|[sS]?[tT][jJ])$/;
223226
var PAT_FINISH_RECORD = /^(\d{1,2}:)?(\d{1,2}:)?(\d{1,2})(\.?\d+)?$|^(DNF|DQ|DNS)$/;
224227
var PAT_HORIZONTAL_JUMPS = /^(?:[sS]?[lL][jJ]|[sS]?[tT][jJ])$/;
225228
var PAT_HURDLES = /^(?:(\d{2,4})(?:[lLsS]?[hH]\s*((3[36])|(\d{2,3}\.?\d*cm)\s*(?:(\d{1,3}\.?\d*m)(?:\s*(\d{1,3}\.?\d*m))?)?)?|[sS][cC]))$/;
226229
var PAT_JUMPS = /^(?:[sS]?[hH][jJ]|[pP][vV]|[sS]?[lL][jJ]|[sS]?[tT][jJ])$/;
227230
var PAT_LEADING_DIGITS = /^\d+/;
228231
var PAT_LEADING_FLOAT = /^\d+\.\d*/;
229-
var PAT_LENGTH_EVENT = /^(?:[sS]?[lL][jJ]|[sS]?[tT][jJ]|[sS]?[dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[jJ][tT]([45678]00\s*g?|)|[hH][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][pP](\s*\d\.?\d*\s*[Kk][Gg]?|)|[wW][tT](\d?\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][sW][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[bB][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[gG][dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[oO][tT](\d+\s*g?|)|[tT][aA][rR][tT]|[cC][hH][tT]|[oO][hH][tT]|[Hh][1-9]|[Ll][1-9])$/;
232+
var PAT_LENGTH_EVENT = /^(?:[sS]?[lL][jJ]|[sS]?[tT][jJ]|[sS]?[dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[jJ][tT]([45678]00\s*g?|)|[hHcC][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][pP](\s*\d\.?\d*\s*[Kk][Gg]?|)|[wW][tT](\d?\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][sW][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[bB][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[gG][dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[oO][tT](\d+\s*g?|)|[tT][aA][rR][tT]|[cC][hH][tT]|[oO][hH][tT]|[Hh][1-9]|[Ll][1-9])$/;
230233
var PAT_LONG_SECONDS = /^\d{3,6}(\.?\d+)?$/;
231234
var PAT_MULTI = /^(?:[bB][iI]|[tT][rR][iI]|[qQ][uU][aA][dD]|[pP][eE][nN]|[hH][eE][xX]|[hH][eE][pP]|[oO][cC][tT]|[eE][nN][nN]|[dD][eE][cC]|[hH][eE][nN]|[dD][oO][dD]|[iI][cC][oO]|[pP][eE][nN][iI]|[pP][eE][nN][wW][tT])$/;
232235
var PAT_NOT_FINISHED = /^(DNF|DQ|DNS)$/;
@@ -235,7 +238,7 @@ var PAT_RACES_FOR_DISTANCE = /^(?:(\d\d?)([hH](?:[rR]|[wW]))|[tT](\d+))$/;
235238
var PAT_RELAYS = /^(?:(\d{1,2})[xX](\d{2,5}[hH]?|[rR][eE][lL][aA][yY]))$/;
236239
var PAT_ROAD = /^(?:(?:[mM][iI][lL][eE]|[mM][aA][rR]|[hH][mM])[wW]?|[xX][cC]|(?:\d{1,3}(\.\d\d?)?(?:[MKk]|[MKk][wW]|[wW])))$/;
237240
var PAT_RUN = /^(?:(?:(\d+)\s*([lLsS]?[hH]\s*((3[36])|(\d{2,3}\.?\d*cm)\s*(?:(\d{1,3}\.?\d*m)(?:\s*(\d{1,3}\.?\d*m))?)?)?|[sS][cC]|[yY]|[wW])?)|[sS][cC]|[2345][mM][tT]|[lL][hH]|[sS][hH]|(?:[mM][iI][lL][eE]|[mM][aA][rR]|[hH][mM])[wW]?|[xX][cC]|(?:\d{1,3}(\.\d\d?)?(?:[MKk]|[MKk][wW]|[wW]))|(\d{1,2})[xX](\d{2,5}[hH]?|[rR][eE][lL][aA][yY]))$/;
238-
var PAT_THROWS = /^(?:[sS]?[dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[jJ][tT]([45678]00\s*g?|)|[hH][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][pP](\s*\d\.?\d*\s*[Kk][Gg]?|)|[wW][tT](\d?\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][sW][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[bB][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[gG][dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[oO][tT](\d+\s*g?|)|[tT][aA][rR][tT]|[cC][hH][tT]|[oO][hH][tT]|[Hh][1-9]|[Ll][1-9])$/;
241+
var PAT_THROWS = /^(?:[sS]?[dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[jJ][tT]([45678]00\s*g?|)|[hHcC][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][pP](\s*\d\.?\d*\s*[Kk][Gg]?|)|[wW][tT](\d?\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][sW][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS]?[bB][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[sS][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[gG][dD][tT](\s*\d\.?\d*\s*[Kk][Gg]?|)|[oO][tT](\d+\s*g?|)|[tT][aA][rR][tT]|[cC][hH][tT]|[oO][hH][tT]|[Hh][1-9]|[Ll][1-9])$/;
239242
var PAT_TIMED_EVENT = /^(?:(?:(\d+)\s*([lLsS]?[hH]\s*((3[36])|(\d{2,3}\.?\d*cm)\s*(?:(\d{1,3}\.?\d*m)(?:\s*(\d{1,3}\.?\d*m))?)?)?|[sS][cC]|[yY]|[wW])?)|[sS][cC]|[2345][mM][tT]|[lL][hH]|[sS][hH]|(\d{2,4})(?:[lLsS]?[hH]\s*((3[36])|(\d{2,3}\.?\d*cm)\s*(?:(\d{1,3}\.?\d*m)(?:\s*(\d{1,3}\.?\d*m))?)?)?|[sS][cC])|(?:[mM][iI][lL][eE]|[mM][aA][rR]|[hH][mM])[wW]?|[xX][cC]|(?:\d{1,3}(\.\d\d?)?(?:[MKk]|[MKk][wW]|[wW]))|(\d{1,2})[xX](\d{2,5}[hH]?|[rR][eE][lL][aA][yY]))$/;
240243
var PAT_TRACK = /^(?:(?:(\d+)\s*([lLsS]?[hH]\s*((3[36])|(\d{2,3}\.?\d*cm)\s*(?:(\d{1,3}\.?\d*m)(?:\s*(\d{1,3}\.?\d*m))?)?)?|[sS][cC]|[yY]|[wW])?)|[sS][cC]|[2345][mM][tT]|[lL][hH]|[sS][hH])$/;
241244
var PAT_VERTICAL_JUMPS = /^(?:[sS]?[hH][jJ]|[pP][vV])$/;

‎tests/test_utils.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ def test_discipline_sort_key(self):
243243
self.assertEqual(discipline_sort_key('200H'),(2, 200, "200H"))
244244
self.assertEqual(discipline_sort_key('SLJ'),(3, 4, "SLJ"))
245245
self.assertEqual(discipline_sort_key('SHJ'),(3, 1, "SHJ"))
246-
self.assertEqual(discipline_sort_key('GDT'),(4, 12, "GDT"))
246+
self.assertEqual(discipline_sort_key('GDT'),(4, 13, "GDT"))
247+
self.assertEqual(discipline_sort_key('CT'),(4, 11, "CT"))
247248

248249
def test_text_discipline_sort_key(self):
249250
'''should see if event ordering will work'''

0 commit comments

Comments
 (0)