jofaichow commited on
Commit
ac8d9e3
1 Parent(s): 554eeb1

Replaced corrV1 with corrV2

Browse files
Files changed (2) hide show
  1. Dockerfile +4 -1
  2. app/app.R +14 -10
Dockerfile CHANGED
@@ -9,7 +9,10 @@ RUN R -q -e "install.packages(c('shinyWidgets', 'shinycssloaders'))"
9
 
10
  # other R packages
11
  RUN R -q -e "install.packages(c('DT', 'plotly', 'scico', 'ggthemes', 'scales', 'wesanderson'))"
12
- RUN R -q -e "install.packages(c('data.table', 'dtplyr', 'Rnumerai'))"
 
 
 
13
 
14
  # copy the app to the image
15
  WORKDIR /shinyapp
 
9
 
10
  # other R packages
11
  RUN R -q -e "install.packages(c('DT', 'plotly', 'scico', 'ggthemes', 'scales', 'wesanderson'))"
12
+ RUN R -q -e "install.packages(c('data.table', 'dtplyr', 'devtools'))"
13
+
14
+ # modified version of Rnumerai
15
+ RUN R -q -e "devtools::install_github('woobe/Rnumerai')"
16
 
17
  # copy the app to the image
18
  WORKDIR /shinyapp
app/app.R CHANGED
@@ -16,6 +16,8 @@ library(data.table)
16
  library(dtplyr)
17
 
18
  library(parallel)
 
 
19
  library(Rnumerai)
20
 
21
 
@@ -48,7 +50,8 @@ reformat_data <- function(d_raw) {
48
  col_keep <- c("model", "roundNumber",
49
  "roundOpenTime", "roundResolveTime",
50
  "roundResolved", "selectedStakeValue",
51
- "corr", "corrPercentile",
 
52
  "fncV3", "fncV3Percentile",
53
  "tc", "tcPercentile",
54
  "corrWMetamodel",
@@ -60,7 +63,7 @@ reformat_data <- function(d_raw) {
60
  d_munged[, roundResolveTime := as.Date(roundResolveTime)]
61
 
62
  # Reformat percentile
63
- d_munged[, corrPercentile := round(corrPercentile * 100, 6)]
64
  d_munged[, fncV3Percentile := round(fncV3Percentile * 100, 6)]
65
  d_munged[, tcPercentile := round(tcPercentile * 100, 6)]
66
 
@@ -68,8 +71,8 @@ reformat_data <- function(d_raw) {
68
  colnames(d_munged) <- c("model", "round",
69
  "date_open", "date_resolved",
70
  "resolved", "stake",
71
- "corr", "corr_pct",
72
- "fncv3", "fncv3_pct",
73
  "tc", "tc_pct",
74
  "corr_meta",
75
  "pay_ftr", "payout")
@@ -277,7 +280,7 @@ ui <- shinydashboardPlus::dashboardPage(
277
  step = 1,
278
  min = 168, # first tournament round
279
  max = Rnumerai::get_current_round(), # note: daily payouts from round 474
280
- value = c(496, Rnumerai::get_current_round())
281
  )
282
  ),
283
 
@@ -457,6 +460,7 @@ ui <- shinydashboardPlus::dashboardPage(
457
  - #### **0.1.2** — `Payout Summary` layout updates
458
  - #### **0.1.3** — Added `Raw Data`
459
  - #### **0.1.4** — Improved and sped up `Payout Summary`
 
460
  "),
461
 
462
  br(),
@@ -475,7 +479,7 @@ ui <- shinydashboardPlus::dashboardPage(
475
 
476
  footer = shinydashboardPlus::dashboardFooter(
477
  left = "Powered by ❤️, ☕, Shiny, and 🤗 Spaces",
478
- right = paste0("Version 0.1.4"))
479
 
480
  )
481
 
@@ -569,8 +573,8 @@ server <- function(input, output) {
569
  ) |>
570
 
571
  # Reformat individual columns
572
- formatRound(columns = c("corr", "tc", "fncv3", "corr_meta", "pay_ftr"), digits = 4) |>
573
- formatRound(columns = c("corr_pct", "tc_pct", "fncv3_pct"), digits = 1) |>
574
  formatRound(columns = c("stake", "payout"), digits = 2) |>
575
 
576
  formatStyle(columns = c("model"),
@@ -580,13 +584,13 @@ server <- function(input, output) {
580
  fontWeight = "bold",
581
  color = styleInterval(cuts = -1e-15, values = c("#D24141", "#2196F3"))) |>
582
 
583
- formatStyle(columns = c("corr", "fncv3"),
584
  color = styleInterval(cuts = -1e-15, values = c("#D24141", "black"))) |>
585
 
586
  formatStyle(columns = c("tc"),
587
  color = styleInterval(cuts = -1e-15, values = c("#D24141", "#A278DC"))) |>
588
 
589
- formatStyle(columns = c("corr_pct", "tc_pct", "fncv3_pct"),
590
  color = styleInterval(cuts = c(1, 5, 15, 85, 95, 99),
591
  values = c("#692020", "#9A2F2F", "#D24141",
592
  "#D1D1D1", # light grey
 
16
  library(dtplyr)
17
 
18
  library(parallel)
19
+
20
+ # devtools::install_github("woobe/Rnumerai")
21
  library(Rnumerai)
22
 
23
 
 
50
  col_keep <- c("model", "roundNumber",
51
  "roundOpenTime", "roundResolveTime",
52
  "roundResolved", "selectedStakeValue",
53
+ # "corr", "corrPercentile",
54
+ "corr20V2", "corr20V2Percentile",
55
  "fncV3", "fncV3Percentile",
56
  "tc", "tcPercentile",
57
  "corrWMetamodel",
 
63
  d_munged[, roundResolveTime := as.Date(roundResolveTime)]
64
 
65
  # Reformat percentile
66
+ d_munged[, corr20V2Percentile := round(corr20V2Percentile * 100, 6)]
67
  d_munged[, fncV3Percentile := round(fncV3Percentile * 100, 6)]
68
  d_munged[, tcPercentile := round(tcPercentile * 100, 6)]
69
 
 
71
  colnames(d_munged) <- c("model", "round",
72
  "date_open", "date_resolved",
73
  "resolved", "stake",
74
+ "corrV2", "corrV2_pct",
75
+ "fncV3", "fncV3_pct",
76
  "tc", "tc_pct",
77
  "corr_meta",
78
  "pay_ftr", "payout")
 
280
  step = 1,
281
  min = 168, # first tournament round
282
  max = Rnumerai::get_current_round(), # note: daily payouts from round 474
283
+ value = c(474, Rnumerai::get_current_round())
284
  )
285
  ),
286
 
 
460
  - #### **0.1.2** — `Payout Summary` layout updates
461
  - #### **0.1.3** — Added `Raw Data`
462
  - #### **0.1.4** — Improved and sped up `Payout Summary`
463
+ - #### **0.1.5** — Replaced `corrV1` with `corrV2`
464
  "),
465
 
466
  br(),
 
479
 
480
  footer = shinydashboardPlus::dashboardFooter(
481
  left = "Powered by ❤️, ☕, Shiny, and 🤗 Spaces",
482
+ right = paste0("Version 0.1.5"))
483
 
484
  )
485
 
 
573
  ) |>
574
 
575
  # Reformat individual columns
576
+ formatRound(columns = c("corrV2", "tc", "fncV3", "corr_meta", "pay_ftr"), digits = 4) |>
577
+ formatRound(columns = c("corrV2_pct", "tc_pct", "fncV3_pct"), digits = 1) |>
578
  formatRound(columns = c("stake", "payout"), digits = 2) |>
579
 
580
  formatStyle(columns = c("model"),
 
584
  fontWeight = "bold",
585
  color = styleInterval(cuts = -1e-15, values = c("#D24141", "#2196F3"))) |>
586
 
587
+ formatStyle(columns = c("corrV2", "fncV3"),
588
  color = styleInterval(cuts = -1e-15, values = c("#D24141", "black"))) |>
589
 
590
  formatStyle(columns = c("tc"),
591
  color = styleInterval(cuts = -1e-15, values = c("#D24141", "#A278DC"))) |>
592
 
593
+ formatStyle(columns = c("corrV2_pct", "tc_pct", "fncV3_pct"),
594
  color = styleInterval(cuts = c(1, 5, 15, 85, 95, 99),
595
  values = c("#692020", "#9A2F2F", "#D24141",
596
  "#D1D1D1", # light grey