diff --git a/DESCRIPTION b/DESCRIPTION index 796580e..9a48ab4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: eggla Title: Early Growth Genetics Longitudinal Analysis -Version: 1.0.2 +Version: 1.0.3 Authors@R: c(person(given = "Mickaël", family = "Canouil", diff --git a/NEWS.md b/NEWS.md index 6173f7f..7f3ffae 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,16 @@ +# eggla 1.0.3 + +## Fixes + +- In `R/*_aucs.R`, `R/*_slopes.R`, + - fix: sort rows by IDs ([#127](https://github.com/mcanouil/eggla/issues/127), thanks @DrGengWang). + - fix: ensure denominator's length depends on the number of knots. ([#127](https://github.com/mcanouil/eggla/issues/127), thanks @DrGengWang) + +## Tests + +- In `tests/testthat`, + - test: update snapshots + # eggla 1.0.2 ## Fixes diff --git a/R/compute_aucs.R b/R/compute_aucs.R index d831c41..9eb539c 100644 --- a/R/compute_aucs.R +++ b/R/compute_aucs.R @@ -119,7 +119,7 @@ compute_aucs <- function( sapply( X = x, FUN = function(x) { - y_tmp <- coeff * c(x^0, x^1, x^2, x^3, (x - knots)^3) / c(1, 1, 2, rep(6, 4)) + y_tmp <- coeff * c(x^0, x^1, x^2, x^3, (x - knots)^3) / c(1, 1, 2, rep(6, length(knots) + 1)) sum(y_tmp[seq_len(4 + findInterval(x, knots, left.open = TRUE))]) } ) @@ -140,6 +140,7 @@ compute_aucs <- function( ) out <- cbind.data.frame(Row.names = rownames(pred_auc), pred_auc) + out <- out[order(out[["Row.names"]]), ] names(out)[grepl("Row.names", names(out), fixed = TRUE)] <- id_var out } diff --git a/R/compute_slopes.R b/R/compute_slopes.R index deeeaaa..dd570b4 100644 --- a/R/compute_slopes.R +++ b/R/compute_slopes.R @@ -119,11 +119,11 @@ compute_slopes <- function( coeff <- fxef + as.numeric(rnef[i, ]) # this implies fixed = random for (j in seq_len(length(period) / 2)) { x1 <- period[j * 2 - 1] - y1_tmp <- coeff * c(x1^0, x1^1, x1^2, x1^3, (x1 - knots)^3) / c(1, 1, 2, rep(6, 4)) + y1_tmp <- coeff * c(x1^0, x1^1, x1^2, x1^3, (x1 - knots)^3) / c(1, 1, 2, rep(6, length(knots) + 1)) y1 <- sum(y1_tmp[seq_len(4 + findInterval(x1, knots, left.open = TRUE))]) x2 <- period[j * 2] - y2_tmp <- coeff * c(x2^0, x2^1, x2^2, x2^3, (x2 - knots)^3) / c(1, 1, 2, rep(6, 4)) + y2_tmp <- coeff * c(x2^0, x2^1, x2^2, x2^3, (x2 - knots)^3) / c(1, 1, 2, rep(6, length(knots) + 1)) y2 <- sum(y2_tmp[seq_len(4 + findInterval(x2, knots, left.open = TRUE))]) pred[i, j * 2 - 1] <- y1 diff --git a/R/egg_aucs.R b/R/egg_aucs.R index 9de0ad4..146c210 100644 --- a/R/egg_aucs.R +++ b/R/egg_aucs.R @@ -74,7 +74,7 @@ egg_aucs <- function( sapply( X = x, FUN = function(x) { - y_tmp <- coeff * c(x^0, x^1, x^2, x^3, (x - knots)^3) / c(1, 1, 2, rep(6, 4)) + y_tmp <- coeff * c(x^0, x^1, x^2, x^3, (x - knots)^3) / c(1, 1, 2, rep(6, length(knots) + 1)) sum(y_tmp[seq_len(4 + findInterval(x, knots, left.open = TRUE))]) } ) @@ -93,6 +93,7 @@ egg_aucs <- function( } out <- cbind.data.frame(Row.names = rownames(pred_auc), pred_auc) + out <- out[order(out[["Row.names"]]), ] names(out)[grepl("Row.names", names(out), fixed = TRUE)] <- id_var out } diff --git a/R/egg_slopes.R b/R/egg_slopes.R index 3c7a2f3..40a621c 100644 --- a/R/egg_slopes.R +++ b/R/egg_slopes.R @@ -85,13 +85,13 @@ egg_slopes <- function( x1 <- period[j * 2 - 1] y1_tmp <- coeff * c(x1^0, x1^1, x1^2, x1^3, (x1 - knots)^3) / - c(1, 1, 2, rep(6, 4)) + c(1, 1, 2, rep(6, length(knots) + 1)) y1 <- sum(y1_tmp[seq_len(4 + findInterval(x1, knots, left.open = TRUE))]) x2 <- period[j * 2] y2_tmp <- coeff * c(x2^0, x2^1, x2^2, x2^3, (x2 - knots)^3) / - c(1, 1, 2, rep(6, 4)) + c(1, 1, 2, rep(6, length(knots) + 1)) y2 <- sum(y2_tmp[seq_len(4 + findInterval(x2, knots, left.open = TRUE))]) pred[i, j * 2 - 1] <- y1 diff --git a/tests/testthat/_snaps/egg_model.md b/tests/testthat/_snaps/egg_model.md index f599102..4cf2219 100644 --- a/tests/testthat/_snaps/egg_model.md +++ b/tests/testthat/_snaps/egg_model.md @@ -40,56 +40,56 @@ out Output ID auc_0--0.5 auc_1.5--3.5 auc_6.5--10 auc_12--17 - 082 082 1.38 5.76 11.30 18.04 - 083 083 1.37 5.61 10.62 16.39 - 080 080 1.38 5.77 11.47 18.51 - 031 031 1.38 5.71 11.04 17.37 - 007 007 1.38 5.84 11.79 19.28 - 033 033 1.41 5.87 11.60 18.63 - 076 076 1.39 5.80 11.48 18.45 - 063 063 1.38 5.74 11.25 17.93 + 001 001 1.41 5.85 11.46 18.26 004 004 1.37 5.72 11.22 17.89 - 054 054 1.39 5.73 10.97 17.12 - 089 089 1.37 5.69 11.11 17.64 - 095 095 1.37 5.74 11.33 18.19 - 093 093 1.39 5.87 11.89 19.47 - 088 088 1.39 5.76 11.19 17.68 - 022 022 1.39 5.79 11.38 18.17 + 005 005 1.38 5.77 11.39 18.28 006 006 1.36 5.62 10.83 17.01 - 019 019 1.38 5.76 11.37 18.23 - 044 044 1.42 5.92 11.69 18.75 + 007 007 1.38 5.84 11.79 19.28 + 009 009 1.38 5.71 11.11 17.59 + 010 010 1.38 5.79 11.54 18.67 + 011 011 1.38 5.75 11.24 17.88 + 012 012 1.41 5.81 11.21 17.63 013 013 1.39 5.82 11.60 18.74 + 016 016 1.38 5.70 11.07 17.51 + 019 019 1.38 5.76 11.37 18.23 + 022 022 1.39 5.79 11.38 18.17 025 025 1.38 5.71 11.01 17.30 - 061 061 1.38 5.68 10.95 17.21 - 048 048 1.38 5.73 11.10 17.51 + 031 031 1.38 5.71 11.04 17.37 + 032 032 1.38 5.68 10.94 17.15 + 033 033 1.41 5.87 11.60 18.63 + 034 034 1.39 5.78 11.42 18.33 + 035 035 1.38 5.77 11.40 18.29 039 039 1.40 5.71 10.75 16.52 + 041 041 1.38 5.74 11.17 17.69 + 044 044 1.42 5.92 11.69 18.75 045 045 1.38 5.70 10.96 17.16 - 086 086 1.38 5.70 11.02 17.35 - 092 092 1.39 5.75 11.14 17.56 - 085 085 1.36 5.63 10.83 16.99 - 059 059 1.38 5.74 11.21 17.83 046 046 1.39 5.74 11.13 17.59 - 069 069 1.37 5.68 10.99 17.33 - 081 081 1.37 5.58 10.45 15.99 + 048 048 1.38 5.73 11.10 17.51 049 049 1.39 5.80 11.49 18.47 - 072 072 1.39 5.76 11.14 17.55 - 099 099 1.39 5.80 11.52 18.56 - 064 064 1.36 5.66 11.16 17.88 - 009 009 1.38 5.71 11.11 17.59 - 032 032 1.38 5.68 10.94 17.15 - 011 011 1.38 5.75 11.24 17.88 - 075 075 1.37 5.67 11.03 17.46 + 054 054 1.39 5.73 10.97 17.12 057 057 1.38 5.70 11.01 17.32 - 012 012 1.41 5.81 11.21 17.63 + 059 059 1.38 5.74 11.21 17.83 + 061 061 1.38 5.68 10.95 17.21 + 063 063 1.38 5.74 11.25 17.93 + 064 064 1.36 5.66 11.16 17.88 065 065 1.36 5.70 11.29 18.16 - 041 041 1.38 5.74 11.17 17.69 - 035 035 1.38 5.77 11.40 18.29 - 016 016 1.38 5.70 11.07 17.51 - 010 010 1.38 5.79 11.54 18.67 - 034 034 1.39 5.78 11.42 18.33 - 001 001 1.41 5.85 11.46 18.26 - 005 005 1.38 5.77 11.39 18.28 068 068 1.39 5.77 11.33 18.09 + 069 069 1.37 5.68 10.99 17.33 + 072 072 1.39 5.76 11.14 17.55 + 075 075 1.37 5.67 11.03 17.46 + 076 076 1.39 5.80 11.48 18.45 + 080 080 1.38 5.77 11.47 18.51 + 081 081 1.37 5.58 10.45 15.99 + 082 082 1.38 5.76 11.30 18.04 + 083 083 1.37 5.61 10.62 16.39 + 085 085 1.36 5.63 10.83 16.99 + 086 086 1.38 5.70 11.02 17.35 + 088 088 1.39 5.76 11.19 17.68 + 089 089 1.37 5.69 11.11 17.64 + 092 092 1.39 5.75 11.14 17.56 + 093 093 1.39 5.87 11.89 19.47 + 095 095 1.37 5.74 11.33 18.19 + 099 099 1.39 5.80 11.52 18.56 --- diff --git a/tests/testthat/_snaps/time_model.md b/tests/testthat/_snaps/time_model.md index efa4b48..d2f66b9 100644 --- a/tests/testthat/_snaps/time_model.md +++ b/tests/testthat/_snaps/time_model.md @@ -28,56 +28,56 @@ out Output ID auc_0--0.5 auc_1.5--3.5 auc_6.5--10 auc_12--17 - 082 082 2.15 35.08 218.80 685.3 - 083 083 1.96 2.68 -1415.82 -11828.7 - 080 080 2.29 58.04 1377.26 9554.8 - 031 031 2.15 34.31 180.20 390.2 - 007 007 2.43 80.87 2529.75 18378.5 - 033 033 2.26 53.56 1151.41 7825.6 - 076 076 2.24 48.88 914.63 6012.4 - 063 063 2.08 23.35 -373.93 -3852.9 + 001 001 2.24 49.07 924.79 6090.6 004 004 2.18 38.93 412.93 2171.8 - 054 054 2.05 17.61 -662.58 -6062.2 - 089 089 2.15 34.68 198.85 532.9 - 095 095 2.22 45.86 762.50 4848.0 - 093 093 2.33 64.65 1710.75 12107.8 - 088 088 2.15 35.49 239.41 843.3 - 022 022 2.19 41.54 544.50 3178.9 + 005 005 2.19 41.73 553.61 3248.3 006 006 2.03 15.10 -789.36 -7032.7 - 019 019 2.20 43.12 624.31 3789.8 - 044 044 2.26 53.58 1151.75 7827.6 + 007 007 2.43 80.87 2529.75 18378.5 + 009 009 2.08 23.34 -374.06 -3853.7 + 010 010 2.26 53.06 1125.80 7629.2 + 011 011 2.14 32.19 72.65 -433.6 + 012 012 2.13 30.59 -7.90 -1050.3 013 013 2.24 49.28 934.22 6162.0 + 016 016 2.15 34.16 172.46 331.0 + 019 019 2.20 43.12 624.31 3789.8 + 022 022 2.19 41.54 544.50 3178.9 025 025 2.10 27.03 -187.15 -2422.4 - 061 061 2.09 24.20 -330.19 -3517.4 - 048 048 2.11 28.62 -107.45 -1812.2 + 031 031 2.15 34.31 180.20 390.2 + 032 032 2.02 12.49 -921.35 -8043.6 + 033 033 2.26 53.56 1151.41 7825.6 + 034 034 2.23 47.95 868.40 5659.0 + 035 035 2.21 44.45 691.35 4303.0 039 039 1.99 8.27 -1133.34 -9666.1 - 045 045 2.02 13.83 -853.79 -7526.3 - 086 086 2.10 26.23 -227.82 -2733.8 - 092 092 2.19 41.40 538.29 3131.8 - 085 085 2.01 11.27 -982.85 -8514.4 - 059 059 2.17 37.31 331.07 1545.1 + 041 041 2.20 42.17 577.05 3428.6 + 044 044 2.26 53.58 1151.75 7827.6 + 045 045 2.02 13.83 -853.78 -7526.3 046 046 2.18 39.16 425.07 2264.9 - 069 069 2.09 24.60 -310.38 -3365.9 - 081 081 1.93 -1.55 -1629.19 -13462.4 + 048 048 2.11 28.62 -107.45 -1812.2 049 049 2.24 49.17 929.70 6128.2 - 072 072 2.18 40.16 475.19 2648.7 - 099 099 2.25 51.79 1061.89 7140.3 - 064 064 2.15 34.25 176.57 362.2 - 009 009 2.08 23.34 -374.06 -3853.7 - 032 032 2.02 12.49 -921.35 -8043.6 - 011 011 2.14 32.19 72.65 -433.6 - 075 075 2.12 30.54 -10.42 -1069.3 + 054 054 2.05 17.61 -662.58 -6062.2 057 057 2.05 18.60 -613.05 -5683.3 - 012 012 2.13 30.59 -7.90 -1050.3 + 059 059 2.17 37.31 331.07 1545.1 + 061 061 2.09 24.20 -330.19 -3517.4 + 063 063 2.08 23.35 -373.93 -3852.9 + 064 064 2.15 34.25 176.57 362.2 065 065 2.16 36.39 284.27 1186.5 - 041 041 2.20 42.17 577.05 3428.6 - 035 035 2.21 44.45 691.35 4303.0 - 016 016 2.15 34.16 172.46 331.0 - 010 010 2.26 53.06 1125.80 7629.2 - 034 034 2.23 47.95 868.41 5659.0 - 001 001 2.24 49.07 924.79 6090.6 - 005 005 2.19 41.73 553.61 3248.3 068 068 2.20 42.16 576.03 3420.5 + 069 069 2.09 24.60 -310.38 -3365.9 + 072 072 2.18 40.16 475.19 2648.7 + 075 075 2.12 30.54 -10.42 -1069.3 + 076 076 2.24 48.88 914.63 6012.4 + 080 080 2.29 58.04 1377.26 9554.8 + 081 081 1.93 -1.55 -1629.19 -13462.4 + 082 082 2.15 35.08 218.80 685.3 + 083 083 1.96 2.68 -1415.82 -11828.7 + 085 085 2.01 11.27 -982.85 -8514.4 + 086 086 2.10 26.23 -227.82 -2733.8 + 088 088 2.15 35.49 239.41 843.3 + 089 089 2.15 34.68 198.85 532.9 + 092 092 2.19 41.40 538.29 3131.8 + 093 093 2.33 64.65 1710.75 12107.8 + 095 095 2.22 45.86 762.50 4848.0 + 099 099 2.25 51.79 1061.89 7140.3 --- @@ -142,17 +142,17 @@ 2 72.63 174.28 266.13 641.04 5.60 3 91.52 242.73 384.47 978.35 5.72 4 -88.69 -410.79 -745.59 -2243.28 4.59 - 5 356.66 1204.41 2047.48 5719.62 7.37 + 5 356.66 1204.41 2047.48 5719.61 7.37 6 -32.96 -208.70 -396.15 -1247.11 4.94 7 168.29 521.18 865.99 2351.15 6.20 8 26.98 8.69 -20.24 -175.41 5.31 - 9 16.17 -30.51 -88.01 -368.63 5.24 + 9 16.17 -30.51 -88.01 -368.64 5.24 10 142.59 427.94 704.74 1891.39 6.04 11 40.36 57.27 63.79 64.23 5.40 12 101.00 277.14 443.98 1148.07 5.78 - 13 90.29 238.30 376.84 956.64 5.71 + 13 90.29 238.30 376.83 956.64 5.71 14 -7.89 -117.73 -238.84 -798.58 5.09 - 15 41.40 61.04 70.30 82.77 5.40 + 15 41.40 61.03 70.30 82.77 5.40 16 -106.40 -475.03 -856.69 -2560.08 4.48 17 171.72 533.65 887.56 2412.71 6.22 18 133.75 395.93 649.42 1733.79 5.98 @@ -161,11 +161,11 @@ 21 94.65 254.16 404.26 1034.89 5.73 22 171.77 533.80 887.80 2413.32 6.22 23 -97.33 -442.15 -799.83 -2397.98 4.54 - 24 74.26 180.20 276.36 670.25 5.61 + 24 74.26 180.20 276.36 670.24 5.61 25 2.81 -78.95 -171.77 -607.39 5.16 26 141.97 425.76 701.00 1880.82 6.03 27 -71.68 -349.09 -638.91 -1939.16 4.69 - 28 -65.03 -325.00 -597.25 -1820.44 4.74 + 28 -65.03 -325.00 -597.25 -1820.43 4.74 29 61.65 134.45 197.24 444.65 5.53 30 -27.08 -187.34 -359.20 -1141.73 4.97 31 -32.94 -208.64 -396.06 -1246.88 4.94 @@ -209,7 +209,7 @@ 18 12.64 74.91 216.87 19 10.92 57.08 161.70 20 -6.86 -126.66 -406.69 - 21 9.80 45.57 126.13 + 21 9.80 45.57 126.12 22 15.40 103.44 305.10 23 -4.14 -98.52 -319.63 24 8.32 30.27 78.78 @@ -17873,56 +17873,56 @@ out Output ID auc_0--0.5 auc_1.5--3.5 auc_6.5--10 auc_12--17 - 082 082 1.37 5.78 11.33 65.71 - 083 083 1.37 5.71 10.88 64.57 - 080 080 1.37 5.80 11.42 65.94 - 031 031 1.37 5.76 11.18 65.34 - 007 007 1.38 5.82 11.53 66.21 - 033 033 1.37 5.80 11.42 65.94 - 076 076 1.37 5.81 11.50 66.13 - 063 063 1.37 5.78 11.33 65.72 + 001 001 1.37 5.79 11.39 65.85 004 004 1.37 5.78 11.31 65.64 - 054 054 1.37 5.74 11.09 65.11 - 089 089 1.37 5.77 11.24 65.47 - 095 095 1.37 5.79 11.37 65.80 - 093 093 1.38 5.83 11.61 66.41 - 088 088 1.37 5.77 11.26 65.52 - 022 022 1.37 5.79 11.39 65.85 + 005 005 1.37 5.80 11.42 65.93 006 006 1.37 5.74 11.08 65.08 - 019 019 1.37 5.79 11.39 65.85 - 044 044 1.38 5.82 11.54 66.24 + 007 007 1.38 5.82 11.53 66.21 + 009 009 1.37 5.77 11.26 65.52 + 010 010 1.38 5.82 11.56 66.27 + 011 011 1.37 5.78 11.29 65.60 + 012 012 1.37 5.77 11.26 65.52 013 013 1.38 5.83 11.58 66.32 + 016 016 1.37 5.76 11.19 65.36 + 019 019 1.37 5.79 11.39 65.85 + 022 022 1.37 5.79 11.39 65.85 025 025 1.37 5.75 11.16 65.28 - 061 061 1.37 5.75 11.13 65.20 - 048 048 1.37 5.76 11.20 65.39 + 031 031 1.37 5.76 11.18 65.34 + 032 032 1.37 5.74 11.09 65.11 + 033 033 1.37 5.80 11.42 65.94 + 034 034 1.37 5.79 11.35 65.77 + 035 035 1.37 5.80 11.40 65.89 039 039 1.37 5.72 10.94 64.73 + 041 041 1.37 5.77 11.25 65.52 + 044 044 1.38 5.82 11.54 66.24 045 045 1.37 5.75 11.11 65.16 - 086 086 1.37 5.76 11.18 65.34 - 092 092 1.37 5.77 11.23 65.44 - 085 085 1.37 5.73 11.01 64.90 - 059 059 1.37 5.77 11.28 65.59 046 046 1.37 5.76 11.22 65.43 - 069 069 1.37 5.76 11.18 65.33 - 081 081 1.37 5.70 10.85 64.51 + 048 048 1.37 5.76 11.20 65.39 049 049 1.37 5.79 11.38 65.84 - 072 072 1.37 5.77 11.23 65.45 - 099 099 1.37 5.80 11.41 65.91 - 064 064 1.37 5.77 11.28 65.57 - 009 009 1.37 5.77 11.26 65.52 - 032 032 1.37 5.74 11.09 65.11 - 011 011 1.37 5.78 11.29 65.60 - 075 075 1.37 5.76 11.20 65.38 + 054 054 1.37 5.74 11.09 65.11 057 057 1.37 5.75 11.15 65.26 - 012 012 1.37 5.77 11.26 65.52 + 059 059 1.37 5.77 11.28 65.59 + 061 061 1.37 5.75 11.13 65.20 + 063 063 1.37 5.78 11.33 65.72 + 064 064 1.37 5.77 11.28 65.57 065 065 1.37 5.79 11.36 65.77 - 041 041 1.37 5.77 11.25 65.52 - 035 035 1.37 5.80 11.40 65.89 - 016 016 1.37 5.76 11.19 65.36 - 010 010 1.38 5.82 11.56 66.27 - 034 034 1.37 5.79 11.35 65.77 - 001 001 1.37 5.79 11.39 65.85 - 005 005 1.37 5.80 11.42 65.93 068 068 1.37 5.78 11.32 65.69 + 069 069 1.37 5.76 11.18 65.33 + 072 072 1.37 5.77 11.23 65.45 + 075 075 1.37 5.76 11.20 65.38 + 076 076 1.37 5.81 11.50 66.13 + 080 080 1.37 5.80 11.42 65.94 + 081 081 1.37 5.70 10.85 64.51 + 082 082 1.37 5.78 11.33 65.71 + 083 083 1.37 5.71 10.88 64.57 + 085 085 1.37 5.73 11.01 64.90 + 086 086 1.37 5.76 11.18 65.34 + 088 088 1.37 5.77 11.26 65.52 + 089 089 1.37 5.77 11.24 65.47 + 092 092 1.37 5.77 11.23 65.44 + 093 093 1.38 5.83 11.61 66.41 + 095 095 1.37 5.79 11.37 65.80 + 099 099 1.37 5.80 11.41 65.91 --- @@ -18895,18 +18895,18 @@ $AUC term auc_0--0.5 auc_1.5--3.5 auc_6.5--10 auc_12--17 - 1: auc_0--0.5 1.00000 0.3756 -0.03708 -0.1929 - 2: auc_1.5--3.5 0.37564 1.0000 0.91207 0.8345 - 3: auc_6.5--10 -0.03708 0.9121 1.00000 0.9860 - 4: auc_12--17 -0.19290 0.8345 0.98601 1.0000 + 1: auc_0--0.5 1.00000 0.3744 -0.03709 -0.1901 + 2: auc_1.5--3.5 0.37436 1.0000 0.91263 0.8366 + 3: auc_6.5--10 -0.03709 0.9126 1.00000 0.9863 + 4: auc_12--17 -0.19013 0.8366 0.98631 1.0000 $SLOPE term slope_0--0.5 slope_1.5--3.5 slope_6.5--10 slope_12--17 - 1: slope_0--0.5 1.0000 0.9997 -0.9004 0.9910 - 2: slope_1.5--3.5 0.9997 1.0000 -0.8894 0.9895 - 3: slope_6.5--10 -0.9004 -0.8894 1.0000 -0.9131 - 4: slope_12--17 0.9910 0.9895 -0.9131 1.0000 + 1: slope_0--0.5 1.0000 0.9997 -0.9010 0.9906 + 2: slope_1.5--3.5 0.9997 1.0000 -0.8902 0.9890 + 3: slope_6.5--10 -0.9010 -0.8902 1.0000 -0.9148 + 4: slope_12--17 0.9906 0.9890 -0.9148 1.0000 --- @@ -18917,56 +18917,56 @@ out Output ID auc_0--0.5 auc_1.5--3.5 auc_6.5--10 auc_12--17 - 082 082 1.37 5.28 -17.77 -134.1 - 083 083 1.36 5.09 -18.29 -135.5 - 080 080 1.35 5.37 -17.37 -133.2 - 031 031 1.37 5.24 -17.90 -134.5 - 007 007 1.35 5.49 -16.98 -132.3 - 033 033 1.40 5.47 -17.39 -133.5 - 076 076 1.37 5.34 -17.59 -133.8 - 063 063 1.37 5.21 -17.98 -134.7 + 001 001 1.40 5.45 -17.45 -133.7 004 004 1.35 5.25 -17.73 -134.0 - 054 054 1.40 5.25 -18.03 -135.0 - 089 089 1.35 5.20 -17.89 -134.4 - 095 095 1.35 5.28 -17.61 -133.7 - 093 093 1.36 5.46 -17.14 -132.7 - 088 088 1.38 5.32 -17.74 -134.2 - 022 022 1.38 5.34 -17.63 -134.0 + 005 005 1.36 5.29 -17.63 -133.8 006 006 1.35 5.06 -18.22 -135.1 - 019 019 1.36 5.29 -17.62 -133.8 - 044 044 1.42 5.52 -17.40 -133.6 + 007 007 1.35 5.48 -16.98 -132.3 + 009 009 1.37 5.18 -18.02 -134.7 + 010 010 1.36 5.32 -17.52 -133.5 + 011 011 1.37 5.29 -17.76 -134.2 + 012 012 1.41 5.35 -17.83 -134.6 013 013 1.37 5.36 -17.52 -133.5 - 025 025 1.38 5.21 -18.05 -134.9 - 061 061 1.36 5.18 -18.01 -134.7 - 048 048 1.38 5.24 -17.94 -134.6 + 016 016 1.36 5.22 -17.84 -134.3 + 019 019 1.36 5.29 -17.61 -133.8 + 022 022 1.38 5.34 -17.62 -134.0 + 025 025 1.38 5.21 -18.06 -134.9 + 031 031 1.37 5.24 -17.90 -134.5 + 032 032 1.38 5.14 -18.19 -135.2 + 033 033 1.40 5.47 -17.38 -133.5 + 034 034 1.37 5.36 -17.49 -133.6 + 035 035 1.37 5.28 -17.74 -134.1 039 039 1.41 5.21 -18.26 -135.6 + 041 041 1.37 5.30 -17.70 -134.1 + 044 044 1.42 5.52 -17.39 -133.6 045 045 1.38 5.16 -18.19 -135.2 - 086 086 1.37 5.20 -18.00 -134.7 - 092 092 1.38 5.32 -17.73 -134.2 - 085 085 1.34 5.06 -18.22 -135.0 - 059 059 1.37 5.27 -17.76 -134.2 - 046 046 1.37 5.29 -17.78 -134.3 - 069 069 1.36 5.16 -18.03 -134.7 - 081 081 1.37 4.99 -18.63 -136.2 + 046 046 1.37 5.29 -17.77 -134.2 + 048 048 1.38 5.24 -17.94 -134.6 049 049 1.37 5.39 -17.42 -133.4 - 072 072 1.39 5.33 -17.75 -134.3 - 099 099 1.37 5.38 -17.43 -133.4 + 054 054 1.40 5.25 -18.02 -135.0 + 057 057 1.38 5.19 -18.07 -134.9 + 059 059 1.37 5.27 -17.75 -134.1 + 061 061 1.36 5.18 -18.01 -134.7 + 063 063 1.37 5.21 -17.98 -134.7 064 064 1.33 5.13 -17.88 -134.2 - 009 009 1.37 5.18 -18.03 -134.8 - 032 032 1.37 5.14 -18.19 -135.2 - 011 011 1.37 5.29 -17.77 -134.2 + 065 065 1.34 5.20 -17.73 -133.9 + 068 068 1.37 5.32 -17.63 -133.9 + 069 069 1.36 5.16 -18.03 -134.7 + 072 072 1.39 5.33 -17.75 -134.3 075 075 1.35 5.17 -17.92 -134.4 - 057 057 1.38 5.19 -18.07 -134.9 - 012 012 1.41 5.35 -17.84 -134.6 - 065 065 1.34 5.20 -17.74 -133.9 - 041 041 1.37 5.30 -17.71 -134.1 - 035 035 1.37 5.28 -17.74 -134.1 - 016 016 1.36 5.22 -17.84 -134.3 - 010 010 1.36 5.32 -17.52 -133.5 - 034 034 1.37 5.36 -17.50 -133.6 - 001 001 1.40 5.45 -17.46 -133.7 - 005 005 1.36 5.29 -17.63 -133.8 - 068 068 1.37 5.32 -17.64 -133.9 + 076 076 1.37 5.34 -17.58 -133.8 + 080 080 1.35 5.36 -17.36 -133.2 + 081 081 1.37 4.99 -18.63 -136.1 + 082 082 1.37 5.28 -17.76 -134.0 + 083 083 1.36 5.09 -18.29 -135.5 + 085 085 1.35 5.06 -18.22 -135.0 + 086 086 1.37 5.20 -18.00 -134.7 + 088 088 1.38 5.31 -17.74 -134.2 + 089 089 1.35 5.20 -17.88 -134.4 + 092 092 1.38 5.32 -17.72 -134.2 + 093 093 1.36 5.46 -17.13 -132.7 + 095 095 1.35 5.28 -17.61 -133.7 + 099 099 1.37 5.38 -17.43 -133.4 --- @@ -18978,7 +18978,7 @@ ID pred_period_0 pred_period_0.5 pred_period_1.5 pred_period_3.5 1 001 2.69 2.89 2.98 2.27 2 004 2.60 2.80 2.88 2.16 - 3 005 2.60 2.80 2.90 2.18 + 3 005 2.60 2.81 2.90 2.19 4 006 2.59 2.77 2.82 2.04 5 007 2.57 2.80 2.95 2.33 6 009 2.63 2.82 2.88 2.10 @@ -19008,7 +19008,7 @@ 30 061 2.63 2.81 2.87 2.11 31 063 2.65 2.83 2.89 2.12 32 064 2.55 2.74 2.83 2.10 - 33 065 2.56 2.76 2.85 2.14 + 33 065 2.56 2.76 2.86 2.14 34 068 2.63 2.83 2.92 2.20 35 069 2.61 2.80 2.86 2.10 36 072 2.67 2.86 2.94 2.19 @@ -19020,69 +19020,69 @@ 42 083 2.63 2.80 2.85 2.04 43 085 2.59 2.77 2.82 2.04 44 086 2.64 2.82 2.89 2.11 - 45 088 2.65 2.85 2.93 2.19 + 45 088 2.65 2.85 2.93 2.18 46 089 2.60 2.79 2.87 2.12 47 092 2.65 2.85 2.93 2.19 48 093 2.59 2.82 2.95 2.30 49 095 2.59 2.79 2.89 2.18 50 099 2.62 2.83 2.93 2.24 pred_period_6.5 pred_period_10 pred_period_12 pred_period_17 slope_0--0.5 - 1 -1.25 -9.49 -16.15 -38.96 0.40 - 2 -1.35 -9.54 -16.18 -39.03 0.40 - 3 -1.32 -9.51 -16.16 -38.96 0.40 + 1 -1.25 -9.48 -16.15 -38.95 0.40 + 2 -1.35 -9.53 -16.18 -39.03 0.40 + 3 -1.32 -9.51 -16.15 -38.95 0.40 4 -1.52 -9.64 -16.28 -39.34 0.36 - 5 -1.11 -9.38 -16.03 -38.56 0.46 - 6 -1.45 -9.60 -16.25 -39.24 0.37 - 7 -1.29 -9.49 -16.14 -38.88 0.41 - 8 -1.36 -9.55 -16.20 -39.09 0.39 + 5 -1.11 -9.37 -16.02 -38.54 0.46 + 6 -1.45 -9.60 -16.25 -39.23 0.37 + 7 -1.29 -9.49 -16.13 -38.87 0.41 + 8 -1.36 -9.54 -16.19 -39.08 0.39 9 -1.38 -9.57 -16.23 -39.19 0.37 - 10 -1.28 -9.49 -16.14 -38.89 0.41 - 11 -1.39 -9.56 -16.21 -39.12 0.39 - 12 -1.32 -9.51 -16.16 -38.96 0.40 - 13 -1.31 -9.52 -16.17 -39.04 0.40 + 10 -1.28 -9.49 -16.13 -38.88 0.41 + 11 -1.39 -9.56 -16.21 -39.11 0.39 + 12 -1.32 -9.51 -16.15 -38.95 0.40 + 13 -1.31 -9.52 -16.17 -39.03 0.40 14 -1.45 -9.61 -16.26 -39.26 0.36 - 15 -1.40 -9.58 -16.23 -39.18 0.38 + 15 -1.40 -9.58 -16.23 -39.17 0.38 16 -1.50 -9.64 -16.28 -39.35 0.35 - 17 -1.23 -9.47 -16.13 -38.89 0.41 - 18 -1.27 -9.49 -16.14 -38.91 0.41 - 19 -1.36 -9.54 -16.18 -39.04 0.39 + 17 -1.23 -9.47 -16.13 -38.88 0.41 + 18 -1.27 -9.49 -16.14 -38.90 0.41 + 19 -1.35 -9.54 -16.18 -39.04 0.39 20 -1.51 -9.66 -16.32 -39.48 0.33 - 21 -1.34 -9.54 -16.19 -39.06 0.39 - 22 -1.23 -9.47 -16.14 -38.92 0.40 - 23 -1.50 -9.64 -16.29 -39.36 0.35 + 21 -1.34 -9.53 -16.19 -39.05 0.39 + 22 -1.23 -9.47 -16.13 -38.91 0.40 + 23 -1.50 -9.64 -16.28 -39.36 0.35 24 -1.36 -9.55 -16.20 -39.10 0.39 - 25 -1.42 -9.58 -16.24 -39.20 0.37 - 26 -1.25 -9.47 -16.12 -38.86 0.42 - 27 -1.44 -9.61 -16.26 -39.31 0.36 + 25 -1.42 -9.58 -16.23 -39.20 0.37 + 26 -1.25 -9.47 -16.12 -38.85 0.42 + 27 -1.44 -9.61 -16.26 -39.30 0.36 28 -1.46 -9.61 -16.26 -39.28 0.36 - 29 -1.36 -9.54 -16.19 -39.07 0.39 + 29 -1.36 -9.54 -16.19 -39.06 0.39 30 -1.44 -9.60 -16.25 -39.23 0.37 - 31 -1.43 -9.59 -16.24 -39.22 0.37 + 31 -1.43 -9.59 -16.24 -39.21 0.37 32 -1.41 -9.56 -16.20 -39.07 0.39 - 33 -1.36 -9.53 -16.17 -39.00 0.40 - 34 -1.32 -9.52 -16.17 -39.00 0.40 - 35 -1.45 -9.60 -16.25 -39.23 0.37 + 33 -1.36 -9.53 -16.17 -38.99 0.40 + 34 -1.32 -9.52 -16.17 -38.99 0.40 + 35 -1.45 -9.60 -16.24 -39.23 0.37 36 -1.35 -9.55 -16.20 -39.10 0.38 - 37 -1.42 -9.57 -16.22 -39.14 0.38 - 38 -1.30 -9.51 -16.16 -38.95 0.40 - 39 -1.23 -9.46 -16.11 -38.80 0.43 + 37 -1.42 -9.57 -16.22 -39.13 0.38 + 38 -1.30 -9.50 -16.15 -38.94 0.40 + 39 -1.23 -9.46 -16.10 -38.79 0.43 40 -1.64 -9.73 -16.38 -39.63 0.32 - 41 -1.36 -9.54 -16.19 -39.01 0.39 + 41 -1.36 -9.54 -16.19 -39.01 0.38 42 -1.53 -9.66 -16.31 -39.46 0.35 - 43 -1.52 -9.64 -16.28 -39.31 0.36 - 44 -1.44 -9.60 -16.25 -39.23 0.37 - 45 -1.35 -9.54 -16.20 -39.09 0.39 - 46 -1.40 -9.57 -16.21 -39.13 0.38 + 43 -1.52 -9.64 -16.27 -39.31 0.36 + 44 -1.44 -9.60 -16.24 -39.23 0.37 + 45 -1.35 -9.54 -16.20 -39.08 0.39 + 46 -1.40 -9.57 -16.21 -39.12 0.38 47 -1.34 -9.54 -16.20 -39.08 0.39 - 48 -1.16 -9.41 -16.06 -38.67 0.44 - 49 -1.32 -9.51 -16.15 -38.94 0.41 - 50 -1.25 -9.47 -16.13 -38.87 0.42 + 48 -1.16 -9.41 -16.06 -38.65 0.44 + 49 -1.32 -9.51 -16.15 -38.93 0.41 + 50 -1.25 -9.47 -16.12 -38.86 0.42 slope_1.5--3.5 slope_6.5--10 slope_12--17 1 -0.36 -2.35 -4.56 2 -0.36 -2.34 -4.57 3 -0.36 -2.34 -4.56 4 -0.39 -2.32 -4.61 - 5 -0.31 -2.36 -4.51 + 5 -0.31 -2.36 -4.50 6 -0.39 -2.33 -4.60 7 -0.35 -2.34 -4.55 8 -0.37 -2.34 -4.58 @@ -19099,7 +19099,7 @@ 19 -0.37 -2.34 -4.57 20 -0.41 -2.33 -4.63 21 -0.37 -2.34 -4.57 - 22 -0.36 -2.36 -4.56 + 22 -0.36 -2.35 -4.56 23 -0.40 -2.33 -4.62 24 -0.37 -2.34 -4.58 25 -0.38 -2.33 -4.59 @@ -19108,17 +19108,17 @@ 28 -0.39 -2.33 -4.60 29 -0.37 -2.34 -4.57 30 -0.38 -2.33 -4.60 - 31 -0.39 -2.33 -4.60 - 32 -0.36 -2.33 -4.58 - 33 -0.36 -2.33 -4.57 - 34 -0.36 -2.34 -4.57 + 31 -0.39 -2.33 -4.59 + 32 -0.36 -2.33 -4.57 + 33 -0.36 -2.33 -4.56 + 34 -0.36 -2.34 -4.56 35 -0.38 -2.33 -4.60 36 -0.37 -2.34 -4.58 37 -0.37 -2.33 -4.58 38 -0.36 -2.34 -4.56 39 -0.34 -2.35 -4.54 40 -0.43 -2.31 -4.65 - 41 -0.37 -2.34 -4.57 + 41 -0.37 -2.34 -4.56 42 -0.40 -2.32 -4.63 43 -0.39 -2.32 -4.61 44 -0.39 -2.33 -4.60