-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add svgf-par@2.0.0 and restructure ijru models
- Loading branch information
Showing
32 changed files
with
256 additions
and
59 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
...mpetition-events/ijru.speed@3.0.0.test.ts → ...mpetition-events/ijru.speed@1.0.0.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,156 @@ | ||
import { roundTo, roundToCurry } from '../../helpers.js' | ||
import { type CompetitionEventDefinition } from '../../preconfigured/types.js' | ||
import { type TableHeaderGroup, type OverallModel, type TableDefinitionGetter, type TableHeader, type EntryResult } from '../types.js' | ||
|
||
type Option = never | ||
type CompetitionEventOptions = 'name' | 'rankMultiplier' | 'resultMultiplier' | 'normalisationMultiplier' | ||
|
||
export const overallTableFactory: TableDefinitionGetter<Option, CompetitionEventOptions> = (options, cEvtOptions) => { | ||
if (cEvtOptions == null) throw new TypeError('Missing competitionEventOptions argument') | ||
const groups: TableHeaderGroup[][] = [] | ||
const cEvtDefs = Object.keys(cEvtOptions) as CompetitionEventDefinition[] | ||
|
||
const srEvts = cEvtDefs.filter(cEvt => cEvt.split('.')[3] === 'sr') | ||
const whEvts = cEvtDefs.filter(cEvt => cEvt.split('.')[3] === 'wh') | ||
|
||
const disciplineGroup: TableHeaderGroup[] = [] | ||
|
||
if (srEvts.length) { | ||
disciplineGroup.push({ | ||
text: 'Single Rope', | ||
key: 'sr', | ||
colspan: srEvts.length * 2 | ||
}) | ||
} | ||
|
||
if (whEvts.length) { | ||
disciplineGroup.push({ | ||
text: 'Wheel', | ||
key: 'wh', | ||
colspan: whEvts.length * 2 | ||
}) | ||
} | ||
|
||
disciplineGroup.push({ | ||
text: 'Overall', | ||
key: 'oa', | ||
colspan: 3, | ||
rowspan: 2 | ||
}) | ||
|
||
groups.push(disciplineGroup) | ||
|
||
const evtGroup: TableHeaderGroup[] = [] | ||
|
||
for (const cEvt of [...srEvts, ...whEvts]) { | ||
evtGroup.push({ | ||
text: typeof cEvtOptions[cEvt].name === 'string' ? (cEvtOptions[cEvt].name as string).replace(/^(Wheel|Single Rope) /, '') : cEvt.split('.')[4] ?? '', | ||
key: cEvt, | ||
colspan: 2 | ||
}) | ||
} | ||
|
||
groups.push(evtGroup) | ||
|
||
const headers: TableHeader[] = [] | ||
|
||
for (const cEvt of [...srEvts, ...whEvts]) { | ||
headers.push({ | ||
text: 'Score', | ||
key: 'R', | ||
component: cEvt | ||
}, { | ||
text: 'Rank', | ||
key: 'S', | ||
component: cEvt, | ||
color: 'red' | ||
}) | ||
} | ||
|
||
headers.push({ | ||
text: 'Normalised', | ||
key: 'B', | ||
color: 'gray', | ||
formatter: roundToCurry(2) | ||
}, { | ||
text: 'Rank Sum', | ||
key: 'T', | ||
color: 'green' | ||
}, { | ||
text: 'Rank', | ||
key: 'S', | ||
color: 'red' | ||
}) | ||
|
||
return { | ||
groups, | ||
headers | ||
} | ||
} | ||
|
||
export default { | ||
id: 'svgf-par.overall@2.0.0', | ||
name: 'SvGF Pair Overall (IJRU-based) v2.0.0', | ||
options: [], | ||
competitionEventOptions: [ | ||
{ id: 'name', name: 'Name', type: 'string' }, | ||
{ id: 'rankMultiplier', name: 'Rank Multiplier', type: 'number' }, | ||
{ id: 'resultMultiplier', name: 'Result Multiplier', type: 'number' }, | ||
{ id: 'normalisationMultiplier', name: 'Normalisation Multiplier', type: 'number' } | ||
], | ||
resultTable: overallTableFactory, | ||
rankOverall (results, options, competitionEventOptions) { | ||
const components: Partial<Record<CompetitionEventDefinition, Readonly<EntryResult[]>>> = {} | ||
const competitionEventIds: CompetitionEventDefinition[] = Object.keys(competitionEventOptions) as CompetitionEventDefinition[] | ||
|
||
for (const cEvtDef of competitionEventIds) { | ||
const ranked = results.filter(result => result.meta.competitionEvent === cEvtDef) | ||
components[cEvtDef] = ranked | ||
} | ||
|
||
const participantIds = [...new Set(results.map(r => r.meta.participantId))] | ||
|
||
const ranked = participantIds.map(participantId => { | ||
const cRes = competitionEventIds | ||
.map((cEvt) => components[cEvt]?.find(r => r.meta.participantId === participantId)) | ||
.filter(r => !!r) as EntryResult[] | ||
|
||
const R = roundTo(cRes.reduce((acc, curr) => | ||
acc + ( | ||
(curr.result.R ?? 0) * | ||
(Number.isInteger(competitionEventOptions[curr.meta.competitionEvent]?.resultMultiplier) ? competitionEventOptions[curr.meta.competitionEvent]?.resultMultiplier as number : 1) | ||
) | ||
, 0), 4) | ||
const T = cRes.reduce((acc, curr) => | ||
acc + ( | ||
(curr.result.S ?? 0) * | ||
(Number.isInteger(competitionEventOptions[curr.meta.competitionEvent]?.rankMultiplier) ? competitionEventOptions[curr.meta.competitionEvent]?.rankMultiplier as number : 1) | ||
) | ||
, 0) | ||
const B = roundTo(cRes.reduce((acc, curr) => | ||
acc + ( | ||
(curr.result.N ?? 0) * | ||
(Number.isInteger(competitionEventOptions[curr.meta.competitionEvent]?.normalisationMultiplier) ? competitionEventOptions[curr.meta.competitionEvent]?.normalisationMultiplier as number : 1) | ||
) | ||
, 0), 2) | ||
|
||
return { | ||
meta: { participantId }, | ||
result: { R, T, B, S: 0 }, | ||
componentResults: Object.fromEntries(cRes.map(r => [r.meta.competitionEvent, r])), | ||
statuses: {} | ||
} | ||
}) | ||
|
||
ranked.sort((a, b) => { | ||
if (a.result.T !== b.result.T) return a.result.T - b.result.T | ||
return b.result.B - a.result.B | ||
}) | ||
|
||
for (let idx = 0; idx < ranked.length; idx++) { | ||
ranked[idx].result.S = ranked.findIndex(obj => obj.result.B === ranked[idx].result.B) + 1 | ||
} | ||
|
||
return ranked | ||
} | ||
} satisfies OverallModel<Option, CompetitionEventOptions> |
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/competition-events/ijru/2.0.0/e.ijru.sp.dd.ddsr.4.4x30@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/competition-events/ijru/2.0.0/e.ijru.sp.dd.ddss.3.60@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/competition-events/ijru/2.0.0/e.ijru.sp.sr.srdr.2.2x30@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/competition-events/ijru/2.0.0/e.ijru.sp.sr.srse.1.180@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/competition-events/ijru/2.0.0/e.ijru.sp.sr.srsr.4.4x30@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/competition-events/ijru/2.0.0/e.ijru.sp.sr.srss.1.30@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/competition-events/ijru/2.0.0/e.ijru.sp.sr.srtu.1.0@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/preconfigured/competition-events/ijru/3.0.0/e.ijru.sp.dd.ddsr.4.4x30@3.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/preconfigured/competition-events/ijru/3.0.0/e.ijru.sp.dd.ddss.3.60@3.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/preconfigured/competition-events/ijru/3.0.0/e.ijru.sp.sr.srdr.2.2x30@3.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/preconfigured/competition-events/ijru/3.0.0/e.ijru.sp.sr.srse.1.180@3.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/preconfigured/competition-events/ijru/3.0.0/e.ijru.sp.sr.srsr.4.4x30@3.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/preconfigured/competition-events/ijru/3.0.0/e.ijru.sp.sr.srss.1.30@3.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/preconfigured/competition-events/ijru/3.0.0/e.ijru.sp.sr.srtu.1.0@3.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
lib/preconfigured/competition-events/svgf/2.0.0/e.svgf.sp.sr.srpe.2.2x90@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import ijruSpeed100 from '../../../../models/competition-events/ijru.speed@1.0.0.js' | ||
import { partiallyConfigureCompetitionEventModel } from '../../../types.js' | ||
|
||
export default partiallyConfigureCompetitionEventModel(ijruSpeed100, { | ||
options: { | ||
falseSwitches: 1 | ||
}, | ||
id: 'e.svgf.sp.sr.srpe.2.2x90@2.0.0', | ||
name: 'Single Rope Pair Speed Endurance' | ||
}) |
10 changes: 10 additions & 0 deletions
10
lib/preconfigured/competition-events/svgf/2.0.0/e.svgf.sp.sr.srps.2.2x30@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import ijruSpeed100 from '../../../../models/competition-events/ijru.speed@1.0.0.js' | ||
import { partiallyConfigureCompetitionEventModel } from '../../../types.js' | ||
|
||
export default partiallyConfigureCompetitionEventModel(ijruSpeed100, { | ||
options: { | ||
falseSwitches: 1 | ||
}, | ||
id: 'e.svgf.sp.sr.srps.2.2x30@2.0.0', | ||
name: 'Single Rope Pair Speed' | ||
}) |
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/overalls/ijru/2.0.0/e.ijru.oa.dd.tddo.4.0@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/overalls/ijru/2.0.0/e.ijru.oa.sr.isro.1.0@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/overalls/ijru/2.0.0/e.ijru.oa.sr.tsro.4.0@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/overalls/ijru/2.0.0/e.ijru.oa.xd.tcaa.4.0@2.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
lib/preconfigured/overalls/ijru/3.0.0/e.ijru.oa.dd.tddo.4.0@3.0.0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.