Skip to content

Commit 80b6adc

Browse files
restradingrestrading
authored
Merge pull request #414 from councilofelders/bugfix/metrics
Fix model metrics, tables and charts, closes #413
2 parents c056c7d + d4b5fe9 commit 80b6adc

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎backend/app/app/crud/crud_product.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ def parse_sort_option(sort: Optional[str], category: Optional[Category] = None)
9393
"""Parse sort option"""
9494
if category is not None and category.tournament:
9595
default_option = desc(
96-
0.5 * Model.latest_reps.cast(JSON)["v2_corr20"].as_string().cast(Float)
97-
+ 2.0 * Model.latest_reps.cast(JSON)["mmc"].as_string().cast(Float)
98-
) if category.tournament == 8 else desc(
96+
0.5 * Model.latest_reps.cast(JSON)["canon_corr"].as_string().cast(Float)
97+
+ 2.0 * Model.latest_reps.cast(JSON)["canon_mmc"].as_string().cast(Float)
98+
) if category.tournament in [8, 12] else desc(
9999
Model.latest_reps.cast(JSON)["fnc_v4"].as_string().cast(Float)
100100
+ 2.0 * Model.latest_reps.cast(JSON)["mmc"].as_string().cast(Float)
101101
)

‎frontend/packages/composables/src/getters/numeraiGetters.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export const getRoundModelPerformancesTableData = (numerai: any) => {
6060
}
6161

6262
export const extractNumeraiV2Scores = (numerai: any, scoreName: string, isPercentile: boolean) => {
63-
const scores = numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => ({x: moment.utc(o?.roundDataDatestamp, "YYYYMMDD").format('YYYY-MM-DD'), y: o?.submissionScores}))
63+
const scores = numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => ({x: moment.utc(o?.roundResolveTime, "YYYYMMDD").format('YYYY-MM-DD'), y: o?.submissionScores}))
6464
const extractedScores = (scores || []).map(roundScores => ({x: roundScores.x, y: roundScores.y.filter(score => score?.displayName === scoreName)[0]}))
6565
if (isPercentile) {
6666
return extractedScores?.map(o=> ({x: o.x, y: o.y?.percentile})).filter(o=>Boolean(o.y))
@@ -70,9 +70,9 @@ export const extractNumeraiV2Scores = (numerai: any, scoreName: string, isPercen
7070

7171
// eslint-disable-next-line @typescript-eslint/no-unused-vars
7272
export const getNumeraiChartData = (numerai_raw: any) => {
73-
const numerai = numerai_raw.filter(o => moment.utc(o?.roundDataDatestamp, "YYYYMMDD") >= moment().subtract(1, 'years'))
73+
const numerai = numerai_raw.filter(o => moment.utc(o?.roundResolveTime, "YYYYMMDD").endOf('day') >= moment().subtract(1, 'years')).filter(o => moment.utc(o?.roundResolveTime, "YYYYMMDD") < moment().utc().startOf('day'))
7474
return {
75-
labels: numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => moment.utc(o?.roundDataDatestamp, "YYYYMMDD").format('YYYY-MM-DD')),
75+
labels: numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => moment.utc(o?.roundResolveTime, "YYYYMMDD").format('YYYY-MM-DD')),
7676
datasets: [
7777
{
7878
label: 'CORR20V2',
@@ -103,9 +103,9 @@ export const getNumeraiChartData = (numerai_raw: any) => {
103103

104104
// eslint-disable-next-line @typescript-eslint/no-unused-vars
105105
export const getSignalsChartData = (numerai_raw: any) => {
106-
const numerai = numerai_raw.filter(o => moment.utc(o?.roundDataDatestamp, "YYYYMMDD") >= moment().subtract(1, 'years'))
106+
const numerai = numerai_raw.filter(o => moment.utc(o?.roundResolveTime, "YYYYMMDD").endOf('day') >= moment().subtract(1, 'years')).filter(o => moment.utc(o?.roundResolveTime, "YYYYMMDD") < moment().utc().startOf('day'))
107107
return {
108-
labels: numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => moment.utc(o?.roundDataDatestamp, "YYYYMMDD").format('YYYY-MM-DD')),
108+
labels: numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => moment.utc(o?.roundResolveTime, "YYYYMMDD").format('YYYY-MM-DD')),
109109
datasets: [
110110
{
111111
label: 'FNCV4',
@@ -135,9 +135,9 @@ export const getSignalsChartData = (numerai_raw: any) => {
135135

136136
// eslint-disable-next-line @typescript-eslint/no-unused-vars
137137
export const getCryptoChartData = (numerai_raw: any) => {
138-
const numerai = numerai_raw.filter(o => moment.utc(o?.roundDataDatestamp, "YYYYMMDD") >= moment().subtract(1, 'years'))
138+
const numerai = numerai_raw.filter(o => moment.utc(o?.roundResolveTime, "YYYYMMDD").endOf('day') >= moment().subtract(1, 'years')).filter(o => moment.utc(o?.roundResolveTime, "YYYYMMDD") < moment().utc().startOf('day'))
139139
return {
140-
labels: numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => moment.utc(o?.roundDataDatestamp, "YYYYMMDD").format('YYYY-MM-DD')),
140+
labels: numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => moment.utc(o?.roundResolveTime).format('YYYY-MM-DD')),
141141
datasets: [
142142
{
143143
label: 'CORR',
@@ -146,8 +146,8 @@ export const getCryptoChartData = (numerai_raw: any) => {
146146
lineTension: 0,
147147
borderWidth: 2,
148148
pointRadius: 0,
149-
data: extractNumeraiV2Scores(numerai, 'corr', false),
150-
data1: extractNumeraiV2Scores(numerai, 'corr', true).map(o=>o?.y),
149+
data: extractNumeraiV2Scores(numerai, 'canon_corr', false),
150+
data1: extractNumeraiV2Scores(numerai, 'canon_corr', true).map(o=>o?.y),
151151
data2: numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => o?.roundNumber)
152152
},
153153
{
@@ -157,8 +157,8 @@ export const getCryptoChartData = (numerai_raw: any) => {
157157
lineTension: 0,
158158
borderWidth: 2,
159159
pointRadius: 0,
160-
data: extractNumeraiV2Scores(numerai, 'mmc', false),
161-
data1: extractNumeraiV2Scores(numerai, 'mmc', true).map(o=>o?.y),
160+
data: extractNumeraiV2Scores(numerai, 'canon_mmc', false),
161+
data1: extractNumeraiV2Scores(numerai, 'canon_mmc', true).map(o=>o?.y),
162162
data2: numerai.filter(o => Boolean(o?.submissionScores)).slice().reverse().map(o => o?.roundNumber)
163163
}
164164
]

‎frontend/packages/theme/components/section/ModelMetricsCard.vue

+8-8
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<td>
5151
CORR20V2 Reputation
5252
</td>
53-
<td class="stats">{{ formatReputation(latestReps, 'v2_corr20') }}</td>
53+
<td class="stats">{{ formatReputation(latestReps, 'canon_corr') }}</td>
5454
</tr>
5555
<tr>
5656
<td>
@@ -68,7 +68,7 @@
6868
<td>
6969
MMC Reputation
7070
</td>
71-
<td class="stats">{{ formatReputation(latestReps, 'mmc') }}</td>
71+
<td class="stats">{{ formatReputation(latestReps, 'canon_mmc') }}</td>
7272
</tr>
7373
</tbody>
7474
</table>
@@ -120,13 +120,13 @@
120120
<td>
121121
CORR Reputation
122122
</td>
123-
<td class="stats">{{ formatReputation(latestReps, 'corr') }}</td>
123+
<td class="stats">{{ formatReputation(latestReps, 'canon_corr') }}</td>
124124
</tr>
125125
<tr>
126126
<td>
127127
MMC Reputation
128128
</td>
129-
<td class="stats">{{ formatReputation(latestReps, 'mmc') }}</td>
129+
<td class="stats">{{ formatReputation(latestReps, 'canon_mmc') }}</td>
130130
</tr>
131131
</tbody>
132132
</table>
@@ -140,7 +140,7 @@
140140
<td>
141141
CORR20V2 Rank
142142
</td>
143-
<td class="stats">{{ formatRank(latestRanks, 'v2_corr20') }}</td>
143+
<td class="stats">{{ formatRank(latestRanks, 'canon_corr') }}</td>
144144
</tr>
145145
<tr>
146146
<td>
@@ -158,7 +158,7 @@
158158
<td>
159159
MMC Rank
160160
</td>
161-
<td class="stats">{{ formatRank(latestRanks, 'mmc') }}</td>
161+
<td class="stats">{{ formatRank(latestRanks, 'canon_mmc') }}</td>
162162
</tr>
163163
</tbody>
164164
</table>
@@ -210,13 +210,13 @@
210210
<td>
211211
CORR Rank
212212
</td>
213-
<td class="stats">{{ formatRank(latestRanks, 'corr') }}</td>
213+
<td class="stats">{{ formatRank(latestRanks, 'canon_corr') }}</td>
214214
</tr>
215215
<tr>
216216
<td>
217217
MMC Rank
218218
</td>
219-
<td class="stats">{{ formatRank(latestRanks, 'mmc') }}</td>
219+
<td class="stats">{{ formatRank(latestRanks, 'canon_mmc') }}</td>
220220
</tr>
221221
</tbody>
222222
</table>

‎frontend/packages/theme/pages/ProductDetails.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ export default {
281281
variables() {
282282
return {
283283
model_id: this.product?.model?.id,
284-
lastNRounds: 260,
284+
lastNRounds: 290,
285285
tournament: this.product?.model?.tournament
286286
}
287287
},
@@ -437,7 +437,7 @@ export default {
437437
methods: {
438438
getRoundScore(roundPerformance, scoreName, isPercentile) {
439439
if (scoreName === 'payout') {
440-
return (roundPerformance?.submissionScores || []).filter(o=>(o.displayName==='tc'))[0]?.payoutPending
440+
return (roundPerformance?.submissionScores || []).filter(o=>(o.displayName==='canon_mmc'))[0]?.payoutPending
441441
}
442442
443443
if (isPercentile) {

0 commit comments

Comments
 (0)