Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New AGB Field Classifications #46

Merged
merged 26 commits into from
Nov 16, 2024
Merged

New AGB Field Classifications #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d66ce3d
Move field file/routines/tests to old_field.
jatkinson1000 Sep 8, 2023
bcf150f
Add new field classification process.
jatkinson1000 Sep 10, 2023
4a75f69
Format and lint.
jatkinson1000 Sep 10, 2023
afa9e53
Bug fix identifying compound barebow.
jatkinson1000 Sep 10, 2023
1cce640
Update field to handle all ages except U21 as per new rules, and add …
jatkinson1000 Sep 23, 2023
550e8ed
Update new field classification files after rebasing on main.
jatkinson1000 Mar 23, 2024
ce3a369
Updated Field classification config. [WIP]
jatkinson1000 Mar 25, 2024
afc9cd1
Update field bowstyles to handle compound limited and compound barebow.
jatkinson1000 May 27, 2024
53477ea
Add old field classification scores for compound unlimited and barebow.
jatkinson1000 May 27, 2024
23ab5b4
Update field classification score bounds.
jatkinson1000 May 28, 2024
71ee53c
Add compound limited to red-peg bowstyles.
jatkinson1000 May 29, 2024
2eefcda
formatting and linting.
jatkinson1000 May 29, 2024
ee82ae7
Update thresholds for compound barebow and limited.
jatkinson1000 May 29, 2024
87853ef
Implement new rules around distances and rounds elegible for classifi…
jatkinson1000 Jun 30, 2024
b8161f5
Update score thresholds for field [WIP]
jatkinson1000 Aug 29, 2024
c17ee93
Update field score thresholds [WIP] following feedback from Steve.
jatkinson1000 Sep 11, 2024
10e201c
[WIP] Update score thresholds following feedback from James.
jatkinson1000 Sep 17, 2024
ba53baf
Update field score thresholds [WIP] based on comparisons to National …
jatkinson1000 Sep 24, 2024
5ae6bc3
Update field score thresholds [WIP] revert trad scores based on Steve…
jatkinson1000 Sep 24, 2024
b05ef91
Update to comply with ruff linter.
jatkinson1000 Oct 30, 2024
6ef0d34
Update field boundaries based on national records analysis.
jatkinson1000 Nov 9, 2024
0211da9
Update noqa warnings to comply with Ruff 0.7.3.
jatkinson1000 Nov 9, 2024
965dfed
Update to guard against english longbow in classification groupname.
jatkinson1000 Nov 9, 2024
2f4d9ae
Add guard against compound limited and tests to check.
jatkinson1000 Nov 16, 2024
dbbfb3c
Add under 21 guard to field classifications and remove unused 'minimu…
jatkinson1000 Nov 16, 2024
8523eb6
Add tests for new AGB field classifications.
jatkinson1000 Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions archeryutils/classifications/AGB_ages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,57 @@
"age_group" : "50+",
"male" : [70, 80],
"female" : [60, 60],
"red" : [60, 60],
"blue" : [50, 50],
"step" : 1
},
{"age_group" : "Adult",
"male" : [90, 100],
"female" : [70, 80],
"red" : [60, 60],
"blue" : [50, 50],
"step" : 0
},
{"age_group" : "Under 21",
"male" : [90, 100],
"female" : [70, 80],
"red" : [60, 60],
"blue" : [50, 50],
"step" : 1
},
{"age_group" : "Under 18",
"male" : [70, 80],
"female" : [60, 60],
"red" : [60, 60],
"blue" : [50, 50],
"step" : 2
},
{"age_group" : "Under 16",
"male" : [60, 60],
"female" : [50, 50],
"red" : [50, 60],
"blue" : [40, 50],
"step" : 3
},
{"age_group" : "Under 15",
"male" : [50, 50],
"female" : [50, 50],
"red" : [40, 60],
"blue" : [30, 50],
"step" : 4
},
{"age_group" : "Under 14",
"male" : [40, 40],
"female" : [40, 40],
"red" : [30, 60],
"blue" : [30, 50],
"step" : 5
},
{"age_group" : "Under 12",
"male" : [30, 30],
"female" : [30, 30],
"red" : [30, 60],
"blue" : [30, 50],
"step" : 6
}
]
83 changes: 76 additions & 7 deletions archeryutils/classifications/AGB_bowstyles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
"datum_in" : 11,
"classStep_in" : 8,
"genderStep_in" : 4,
"ageStep_in" : 6
"ageStep_in" : 6,
"datum_field" : 18,
"classStep_field" : 7.5,
"genderStep_field" : 4,
"ageStep_field" : 6
},
{"bowstyle" : "Recurve",
"datum_out" : 30,
Expand All @@ -17,8 +21,11 @@
"datum_in" : 28,
"classStep_in" : 7.5,
"genderStep_in" : 5,
"ageStep_in" : 6.5

"ageStep_in" : 6.5,
"datum_field" : 34,
"classStep_field" : 8,
"genderStep_field" : 5,
"ageStep_field" : 5.5
},
{"bowstyle" : "Barebow",
"datum_out" : 47,
Expand All @@ -28,8 +35,11 @@
"datum_in" : 42,
"classStep_in" : 6.0,
"genderStep_in" : 5.5,
"ageStep_in" : 5.5

"ageStep_in" : 5.5,
"datum_field" : 49,
"classStep_field" : 6.5,
"genderStep_field" : 5.5,
"ageStep_field" : 4
},
{"bowstyle" : "Longbow",
"datum_out" : 65,
Expand All @@ -39,7 +49,66 @@
"datum_in" : 61,
"classStep_in" : 6.5,
"genderStep_in" : 7,
"ageStep_in" : 6

"ageStep_in" : 6,
"datum_field" : 68,
"classStep_field" : 5.5,
"genderStep_field" : 10,
"ageStep_field" : 5.5
},
{"bowstyle" : "Traditional",
"datum_out" : 47,
"classStep_out" : 5.5,
"genderStep_out" : 5.5,
"ageStep_out" : 5.5,
"datum_in" : 42,
"classStep_in" : 6.0,
"genderStep_in" : 5.5,
"ageStep_in" : 5.5,
"datum_field" : 55,
"classStep_field" : 6,
"genderStep_field" : 7,
"ageStep_field" : 6
},
{"bowstyle" : "Flatbow",
"datum_out" : 47,
"classStep_out" : 5.5,
"genderStep_out" : 5.5,
"ageStep_out" : 5.5,
"datum_in" : 42,
"classStep_in" : 6.0,
"genderStep_in" : 5.5,
"ageStep_in" : 5.5,
"datum_field" : 62,
"classStep_field" : 5.5,
"genderStep_field" : 8,
"ageStep_field" : 5.5
},
{"bowstyle" : "Compound Limited",
"datum_out" : 15,
"classStep_out" : 6,
"genderStep_out" : 4,
"ageStep_out" : 6,
"datum_in" : 11,
"classStep_in" : 8,
"genderStep_in" : 4,
"ageStep_in" : 6,
"datum_field" : 32,
"classStep_field" : 7,
"genderStep_field" : 5,
"ageStep_field" : 5.5
},
{"bowstyle" : "Compound Barebow",
"datum_out" : 15,
"classStep_out" : 6,
"genderStep_out" : 4,
"ageStep_out" : 6,
"datum_in" : 11,
"classStep_in" : 8,
"genderStep_in" : 4,
"ageStep_in" : 6,
"datum_field" : 46,
"classStep_field" : 6,
"genderStep_field" : 5.5,
"ageStep_field" : 4
}
]
8 changes: 7 additions & 1 deletion archeryutils/classifications/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
agb_indoor_classification_scores,
calculate_agb_indoor_classification,
)
from .agb_old_field_classifications import (
calculate_old_agb_field_classification,
old_agb_field_classification_scores,
)
from .agb_old_indoor_classifications import (
agb_old_indoor_classification_scores,
calculate_agb_old_indoor_classification,
Expand All @@ -24,6 +28,8 @@
"agb_indoor_classification_scores",
"calculate_agb_old_indoor_classification",
"agb_old_indoor_classification_scores",
"calculate_agb_field_classification",
"agb_field_classification_scores",
"calculate_agb_field_classification",
"calculate_old_agb_field_classification",
"old_agb_field_classification_scores",
]
Loading