diff --git a/PCEvalidation/data/Analysis_11/plpResult.rds b/PCEvalidation/data/Analysis_11/plpResult.rds index 6c813335..02a1fd19 100644 Binary files a/PCEvalidation/data/Analysis_11/plpResult.rds and b/PCEvalidation/data/Analysis_11/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_12/plpResult.rds b/PCEvalidation/data/Analysis_12/plpResult.rds index de278ac4..28accde3 100644 Binary files a/PCEvalidation/data/Analysis_12/plpResult.rds and b/PCEvalidation/data/Analysis_12/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_15/plpResult.rds b/PCEvalidation/data/Analysis_15/plpResult.rds index 2abb4a1e..10ae8cd7 100644 Binary files a/PCEvalidation/data/Analysis_15/plpResult.rds and b/PCEvalidation/data/Analysis_15/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_16/plpResult.rds b/PCEvalidation/data/Analysis_16/plpResult.rds index 9e5345be..9d664614 100644 Binary files a/PCEvalidation/data/Analysis_16/plpResult.rds and b/PCEvalidation/data/Analysis_16/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_19/plpResult.rds b/PCEvalidation/data/Analysis_19/plpResult.rds index daa31935..4d310155 100644 Binary files a/PCEvalidation/data/Analysis_19/plpResult.rds and b/PCEvalidation/data/Analysis_19/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_20/plpResult.rds b/PCEvalidation/data/Analysis_20/plpResult.rds index 83bcee45..f99935ad 100644 Binary files a/PCEvalidation/data/Analysis_20/plpResult.rds and b/PCEvalidation/data/Analysis_20/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_23/plpResult.rds b/PCEvalidation/data/Analysis_23/plpResult.rds index 1923c8cf..07e676f4 100644 Binary files a/PCEvalidation/data/Analysis_23/plpResult.rds and b/PCEvalidation/data/Analysis_23/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_24/plpResult.rds b/PCEvalidation/data/Analysis_24/plpResult.rds index 269c69d8..6a381d36 100644 Binary files a/PCEvalidation/data/Analysis_24/plpResult.rds and b/PCEvalidation/data/Analysis_24/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_27/plpResult.rds b/PCEvalidation/data/Analysis_27/plpResult.rds index a8d91593..d720c6d6 100644 Binary files a/PCEvalidation/data/Analysis_27/plpResult.rds and b/PCEvalidation/data/Analysis_27/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_28/plpResult.rds b/PCEvalidation/data/Analysis_28/plpResult.rds index 40edcb7b..2e32429b 100644 Binary files a/PCEvalidation/data/Analysis_28/plpResult.rds and b/PCEvalidation/data/Analysis_28/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_3/plpResult.rds b/PCEvalidation/data/Analysis_3/plpResult.rds index 2e05f517..4399e9bb 100644 Binary files a/PCEvalidation/data/Analysis_3/plpResult.rds and b/PCEvalidation/data/Analysis_3/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_31/plpResult.rds b/PCEvalidation/data/Analysis_31/plpResult.rds index 3024fc2d..784e58e0 100644 Binary files a/PCEvalidation/data/Analysis_31/plpResult.rds and b/PCEvalidation/data/Analysis_31/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_32/plpResult.rds b/PCEvalidation/data/Analysis_32/plpResult.rds index f057bf05..c3f2610f 100644 Binary files a/PCEvalidation/data/Analysis_32/plpResult.rds and b/PCEvalidation/data/Analysis_32/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_4/plpResult.rds b/PCEvalidation/data/Analysis_4/plpResult.rds index c2703d4d..b61f1951 100644 Binary files a/PCEvalidation/data/Analysis_4/plpResult.rds and b/PCEvalidation/data/Analysis_4/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_51/plpResult.rds b/PCEvalidation/data/Analysis_51/plpResult.rds new file mode 100644 index 00000000..19d65925 Binary files /dev/null and b/PCEvalidation/data/Analysis_51/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_52/plpResult.rds b/PCEvalidation/data/Analysis_52/plpResult.rds new file mode 100644 index 00000000..f2647da4 Binary files /dev/null and b/PCEvalidation/data/Analysis_52/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_53/plpResult.rds b/PCEvalidation/data/Analysis_53/plpResult.rds new file mode 100644 index 00000000..e4b3b14b Binary files /dev/null and b/PCEvalidation/data/Analysis_53/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_54/plpResult.rds b/PCEvalidation/data/Analysis_54/plpResult.rds new file mode 100644 index 00000000..da4b5221 Binary files /dev/null and b/PCEvalidation/data/Analysis_54/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_56/plpResult.rds b/PCEvalidation/data/Analysis_56/plpResult.rds new file mode 100644 index 00000000..7c32ea57 Binary files /dev/null and b/PCEvalidation/data/Analysis_56/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_58/plpResult.rds b/PCEvalidation/data/Analysis_58/plpResult.rds new file mode 100644 index 00000000..fac4c62d Binary files /dev/null and b/PCEvalidation/data/Analysis_58/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_7/plpResult.rds b/PCEvalidation/data/Analysis_7/plpResult.rds index 7470f0f3..9446ee50 100644 Binary files a/PCEvalidation/data/Analysis_7/plpResult.rds and b/PCEvalidation/data/Analysis_7/plpResult.rds differ diff --git a/PCEvalidation/data/Analysis_8/plpResult.rds b/PCEvalidation/data/Analysis_8/plpResult.rds index a75ee957..5ce55264 100644 Binary files a/PCEvalidation/data/Analysis_8/plpResult.rds and b/PCEvalidation/data/Analysis_8/plpResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibration/Analysis_51/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_51/validationResult.rds new file mode 100644 index 00000000..f4898683 Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_51/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibration/Analysis_52/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_52/validationResult.rds new file mode 100644 index 00000000..bc2f9529 Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_52/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibration/Analysis_53/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_53/validationResult.rds new file mode 100644 index 00000000..05ef69f4 Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_53/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibration/Analysis_54/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_54/validationResult.rds new file mode 100644 index 00000000..5ecaefdb Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_54/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibration/Analysis_56/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_56/validationResult.rds new file mode 100644 index 00000000..5c452925 Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_56/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibration/Analysis_58/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_58/validationResult.rds new file mode 100644 index 00000000..44c6b919 Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibration/Analysis_58/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_51/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_51/validationResult.rds new file mode 100644 index 00000000..a31aeb4b Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_51/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_52/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_52/validationResult.rds new file mode 100644 index 00000000..6d6933bc Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_52/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_53/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_53/validationResult.rds new file mode 100644 index 00000000..3d834783 Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_53/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_54/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_54/validationResult.rds new file mode 100644 index 00000000..8d57c7e9 Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_54/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_56/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_56/validationResult.rds new file mode 100644 index 00000000..3be5c2fe Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_56/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_58/validationResult.rds b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_58/validationResult.rds new file mode 100644 index 00000000..77c35328 Binary files /dev/null and b/PCEvalidation/data/Validation/ccae_recalibrationIntercept/Analysis_58/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod/Analysis_51/validationResult.rds b/PCEvalidation/data/Validation/optumDod/Analysis_51/validationResult.rds new file mode 100644 index 00000000..03ae981a Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod/Analysis_51/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod/Analysis_52/validationResult.rds b/PCEvalidation/data/Validation/optumDod/Analysis_52/validationResult.rds new file mode 100644 index 00000000..1a20b6bb Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod/Analysis_52/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod/Analysis_53/validationResult.rds b/PCEvalidation/data/Validation/optumDod/Analysis_53/validationResult.rds new file mode 100644 index 00000000..9dd3a30c Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod/Analysis_53/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod/Analysis_54/validationResult.rds b/PCEvalidation/data/Validation/optumDod/Analysis_54/validationResult.rds new file mode 100644 index 00000000..d772cd7c Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod/Analysis_54/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod/Analysis_56/validationResult.rds b/PCEvalidation/data/Validation/optumDod/Analysis_56/validationResult.rds new file mode 100644 index 00000000..110ef653 Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod/Analysis_56/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod/Analysis_58/validationResult.rds b/PCEvalidation/data/Validation/optumDod/Analysis_58/validationResult.rds new file mode 100644 index 00000000..5e513aa9 Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod/Analysis_58/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_51/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_51/validationResult.rds new file mode 100644 index 00000000..7406e0c2 Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_51/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_52/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_52/validationResult.rds new file mode 100644 index 00000000..0a4eaa5a Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_52/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_53/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_53/validationResult.rds new file mode 100644 index 00000000..c7ca3161 Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_53/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_54/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_54/validationResult.rds new file mode 100644 index 00000000..3d07262f Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_54/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_56/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_56/validationResult.rds new file mode 100644 index 00000000..c67e31df Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_56/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_58/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_58/validationResult.rds new file mode 100644 index 00000000..9b26b11c Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibration/Analysis_58/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_51/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_51/validationResult.rds new file mode 100644 index 00000000..7ba13fdc Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_51/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_52/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_52/validationResult.rds new file mode 100644 index 00000000..dac8ca06 Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_52/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_53/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_53/validationResult.rds new file mode 100644 index 00000000..f77cf40e Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_53/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_54/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_54/validationResult.rds new file mode 100644 index 00000000..fddc64c3 Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_54/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_56/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_56/validationResult.rds new file mode 100644 index 00000000..c083890f Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_56/validationResult.rds differ diff --git a/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_58/validationResult.rds b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_58/validationResult.rds new file mode 100644 index 00000000..b6892473 Binary files /dev/null and b/PCEvalidation/data/Validation/optumDod_recalibrationIntercept/Analysis_58/validationResult.rds differ diff --git a/PCEvalidation/data/settings.csv b/PCEvalidation/data/settings.csv index 4a383220..6f06f854 100644 --- a/PCEvalidation/data/settings.csv +++ b/PCEvalidation/data/settings.csv @@ -1,33 +1,41 @@ "","targetId","targetName","outcomeId","outcomeName","model","modelSettingsId","analysisId","cohortName","devDatabase","valDatabase","modelSettingName","populationSettingId","covariateSettingId" -"1",1322,"Black Female Persons who are statin-risk eligible",1354,"first of AMI or ischemic stroke or death","pooled_female_black_model.csv",1,"Analysis_1","Black Female Persons who are statin-risk eligible","NA","ccae","pooled_female_black_model.csv",1,1 -"2",1325,"Black Male Persons who are statin-risk eligible",1354,"first of AMI or ischemic stroke or death","pooled_male_black_model.csv",3,"Analysis_2","Black Male Persons who are statin-risk eligible","NA","ccae","pooled_male_black_model.csv",1,3 -"3",1326,"Non-Black Male Persons who are statin-risk eligible",1354,"first of AMI or ischemic stroke or death","pooled_male_non_black_model.csv",4,"Analysis_3","Non-Black Male Persons who are statin-risk eligible","NA","ccae","pooled_male_non_black_model.csv",1,4 -"4",1328,"Non-Black Female Persons who are statin-risk eligible",1354,"first of AMI or ischemic stroke or death","pooled_female_non_black_model.csv",2,"Analysis_4","Non-Black Female Persons who are statin-risk eligible","NA","ccae","pooled_female_non_black_model.csv",1,2 -"5",1358,"Black Male Persons who are statin-risk eligible not censored at statin initiation",1354,"first of AMI or ischemic stroke or death","pooled_male_black_model.csv",3,"Analysis_5","Black Male Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_male_black_model.csv",1,3 -"6",1359,"Black Female Persons who are statin-risk eligible not censored at statin initiation",1354,"first of AMI or ischemic stroke or death","pooled_female_black_model.csv",1,"Analysis_6","Black Female Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_female_black_model.csv",1,1 -"7",1360,"Non-Black Male Persons who are statin-risk eligible not censored at statin initiation",1354,"first of AMI or ischemic stroke or death","pooled_male_non_black_model.csv",4,"Analysis_7","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_male_non_black_model.csv",1,4 -"8",1361,"Non-Black Female Persons who are statin-risk eligible not censored at statin initiation",1354,"first of AMI or ischemic stroke or death","pooled_female_non_black_model.csv",2,"Analysis_8","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_female_non_black_model.csv",1,2 -"9",1322,"Black Female Persons who are statin-risk eligible",1357,"first of AMI or ischemic stroke or death, no IP required","pooled_female_black_model.csv",1,"Analysis_9","Black Female Persons who are statin-risk eligible","NA","ccae","pooled_female_black_model.csv",1,1 -"10",1325,"Black Male Persons who are statin-risk eligible",1357,"first of AMI or ischemic stroke or death, no IP required","pooled_male_black_model.csv",3,"Analysis_10","Black Male Persons who are statin-risk eligible","NA","ccae","pooled_male_black_model.csv",1,3 -"11",1326,"Non-Black Male Persons who are statin-risk eligible",1357,"first of AMI or ischemic stroke or death, no IP required","pooled_male_non_black_model.csv",4,"Analysis_11","Non-Black Male Persons who are statin-risk eligible","NA","ccae","pooled_male_non_black_model.csv",1,4 -"12",1328,"Non-Black Female Persons who are statin-risk eligible",1357,"first of AMI or ischemic stroke or death, no IP required","pooled_female_non_black_model.csv",2,"Analysis_12","Non-Black Female Persons who are statin-risk eligible","NA","ccae","pooled_female_non_black_model.csv",1,2 -"13",1358,"Black Male Persons who are statin-risk eligible not censored at statin initiation",1357,"first of AMI or ischemic stroke or death, no IP required","pooled_male_black_model.csv",3,"Analysis_13","Black Male Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_male_black_model.csv",1,3 -"14",1359,"Black Female Persons who are statin-risk eligible not censored at statin initiation",1357,"first of AMI or ischemic stroke or death, no IP required","pooled_female_black_model.csv",1,"Analysis_14","Black Female Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_female_black_model.csv",1,1 -"15",1360,"Non-Black Male Persons who are statin-risk eligible not censored at statin initiation",1357,"first of AMI or ischemic stroke or death, no IP required","pooled_male_non_black_model.csv",4,"Analysis_15","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_male_non_black_model.csv",1,4 -"16",1361,"Non-Black Female Persons who are statin-risk eligible not censored at statin initiation",1357,"first of AMI or ischemic stroke or death, no IP required","pooled_female_non_black_model.csv",2,"Analysis_16","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_female_non_black_model.csv",1,2 -"17",1322,"Black Female Persons who are statin-risk eligible",1365,"first occurrence of atheroclerotic cardiovascular disease","pooled_female_black_model.csv",1,"Analysis_17","Black Female Persons who are statin-risk eligible","NA","ccae","pooled_female_black_model.csv",1,1 -"18",1325,"Black Male Persons who are statin-risk eligible",1365,"first occurrence of atheroclerotic cardiovascular disease","pooled_male_black_model.csv",3,"Analysis_18","Black Male Persons who are statin-risk eligible","NA","ccae","pooled_male_black_model.csv",1,3 -"19",1326,"Non-Black Male Persons who are statin-risk eligible",1365,"first occurrence of atheroclerotic cardiovascular disease","pooled_male_non_black_model.csv",4,"Analysis_19","Non-Black Male Persons who are statin-risk eligible","NA","ccae","pooled_male_non_black_model.csv",1,4 -"20",1328,"Non-Black Female Persons who are statin-risk eligible",1365,"first occurrence of atheroclerotic cardiovascular disease","pooled_female_non_black_model.csv",2,"Analysis_20","Non-Black Female Persons who are statin-risk eligible","NA","ccae","pooled_female_non_black_model.csv",1,2 -"21",1358,"Black Male Persons who are statin-risk eligible not censored at statin initiation",1365,"first occurrence of atheroclerotic cardiovascular disease","pooled_male_black_model.csv",3,"Analysis_21","Black Male Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_male_black_model.csv",1,3 -"22",1359,"Black Female Persons who are statin-risk eligible not censored at statin initiation",1365,"first occurrence of atheroclerotic cardiovascular disease","pooled_female_black_model.csv",1,"Analysis_22","Black Female Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_female_black_model.csv",1,1 -"23",1360,"Non-Black Male Persons who are statin-risk eligible not censored at statin initiation",1365,"first occurrence of atheroclerotic cardiovascular disease","pooled_male_non_black_model.csv",4,"Analysis_23","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_male_non_black_model.csv",1,4 -"24",1361,"Non-Black Female Persons who are statin-risk eligible not censored at statin initiation",1365,"first occurrence of atheroclerotic cardiovascular disease","pooled_female_non_black_model.csv",2,"Analysis_24","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_female_non_black_model.csv",1,2 -"25",1322,"Black Female Persons who are statin-risk eligible",1366,"first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_female_black_model.csv",1,"Analysis_25","Black Female Persons who are statin-risk eligible","NA","ccae","pooled_female_black_model.csv",1,1 -"26",1325,"Black Male Persons who are statin-risk eligible",1366,"first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_male_black_model.csv",3,"Analysis_26","Black Male Persons who are statin-risk eligible","NA","ccae","pooled_male_black_model.csv",1,3 -"27",1326,"Non-Black Male Persons who are statin-risk eligible",1366,"first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_male_non_black_model.csv",4,"Analysis_27","Non-Black Male Persons who are statin-risk eligible","NA","ccae","pooled_male_non_black_model.csv",1,4 -"28",1328,"Non-Black Female Persons who are statin-risk eligible",1366,"first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_female_non_black_model.csv",2,"Analysis_28","Non-Black Female Persons who are statin-risk eligible","NA","ccae","pooled_female_non_black_model.csv",1,2 -"29",1358,"Black Male Persons who are statin-risk eligible not censored at statin initiation",1366,"first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_male_black_model.csv",3,"Analysis_29","Black Male Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_male_black_model.csv",1,3 -"30",1359,"Black Female Persons who are statin-risk eligible not censored at statin initiation",1366,"first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_female_black_model.csv",1,"Analysis_30","Black Female Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_female_black_model.csv",1,1 -"31",1360,"Non-Black Male Persons who are statin-risk eligible not censored at statin initiation",1366,"first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_male_non_black_model.csv",4,"Analysis_31","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_male_non_black_model.csv",1,4 -"32",1361,"Non-Black Female Persons who are statin-risk eligible not censored at statin initiation",1366,"first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_female_non_black_model.csv",2,"Analysis_32","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation","NA","ccae","pooled_female_non_black_model.csv",1,2 +"1","1322","Black Female Persons who are statin-risk eligible","1354","first of AMI or ischemic stroke or death","pooled_female_black_model.csv","1","Analysis_1","Black Female Persons who are statin-risk eligible",NA,"ccae","pooled_female_black_model.csv","1","1" +"2","1325","Black Male Persons who are statin-risk eligible","1354","first of AMI or ischemic stroke or death","pooled_male_black_model.csv","3","Analysis_2","Black Male Persons who are statin-risk eligible",NA,"ccae","pooled_male_black_model.csv","1","3" +"3","1326","Non-Black Male Persons who are statin-risk eligible","1354","first of AMI or ischemic stroke or death","pooled_male_non_black_model.csv","4","Analysis_3","Non-Black Male Persons who are statin-risk eligible",NA,"ccae","pooled_male_non_black_model.csv","1","4" +"4","1328","Non-Black Female Persons who are statin-risk eligible","1354","first of AMI or ischemic stroke or death","pooled_female_non_black_model.csv","2","Analysis_4","Non-Black Female Persons who are statin-risk eligible",NA,"ccae","pooled_female_non_black_model.csv","1","2" +"5","1358","Black Male Persons who are statin-risk eligible not censored at statin initiation","1354","first of AMI or ischemic stroke or death","pooled_male_black_model.csv","3","Analysis_5","Black Male Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_male_black_model.csv","1","3" +"6","1359","Black Female Persons who are statin-risk eligible not censored at statin initiation","1354","first of AMI or ischemic stroke or death","pooled_female_black_model.csv","1","Analysis_6","Black Female Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_female_black_model.csv","1","1" +"7","1360","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation","1354","first of AMI or ischemic stroke or death","pooled_male_non_black_model.csv","4","Analysis_7","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_male_non_black_model.csv","1","4" +"8","1361","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation","1354","first of AMI or ischemic stroke or death","pooled_female_non_black_model.csv","2","Analysis_8","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_female_non_black_model.csv","1","2" +"9","1322","Black Female Persons who are statin-risk eligible","1357","first of AMI or ischemic stroke or death, no IP required","pooled_female_black_model.csv","1","Analysis_9","Black Female Persons who are statin-risk eligible",NA,"ccae","pooled_female_black_model.csv","1","1" +"10","1325","Black Male Persons who are statin-risk eligible","1357","first of AMI or ischemic stroke or death, no IP required","pooled_male_black_model.csv","3","Analysis_10","Black Male Persons who are statin-risk eligible",NA,"ccae","pooled_male_black_model.csv","1","3" +"11","1326","Non-Black Male Persons who are statin-risk eligible","1357","first of AMI or ischemic stroke or death, no IP required","pooled_male_non_black_model.csv","4","Analysis_11","Non-Black Male Persons who are statin-risk eligible",NA,"ccae","pooled_male_non_black_model.csv","1","4" +"12","1328","Non-Black Female Persons who are statin-risk eligible","1357","first of AMI or ischemic stroke or death, no IP required","pooled_female_non_black_model.csv","2","Analysis_12","Non-Black Female Persons who are statin-risk eligible",NA,"ccae","pooled_female_non_black_model.csv","1","2" +"13","1358","Black Male Persons who are statin-risk eligible not censored at statin initiation","1357","first of AMI or ischemic stroke or death, no IP required","pooled_male_black_model.csv","3","Analysis_13","Black Male Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_male_black_model.csv","1","3" +"14","1359","Black Female Persons who are statin-risk eligible not censored at statin initiation","1357","first of AMI or ischemic stroke or death, no IP required","pooled_female_black_model.csv","1","Analysis_14","Black Female Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_female_black_model.csv","1","1" +"15","1360","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation","1357","first of AMI or ischemic stroke or death, no IP required","pooled_male_non_black_model.csv","4","Analysis_15","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_male_non_black_model.csv","1","4" +"16","1361","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation","1357","first of AMI or ischemic stroke or death, no IP required","pooled_female_non_black_model.csv","2","Analysis_16","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_female_non_black_model.csv","1","2" +"17","1322","Black Female Persons who are statin-risk eligible","1365","first occurrence of atheroclerotic cardiovascular disease","pooled_female_black_model.csv","1","Analysis_17","Black Female Persons who are statin-risk eligible",NA,"ccae","pooled_female_black_model.csv","1","1" +"18","1325","Black Male Persons who are statin-risk eligible","1365","first occurrence of atheroclerotic cardiovascular disease","pooled_male_black_model.csv","3","Analysis_18","Black Male Persons who are statin-risk eligible",NA,"ccae","pooled_male_black_model.csv","1","3" +"19","1326","Non-Black Male Persons who are statin-risk eligible","1365","first occurrence of atheroclerotic cardiovascular disease","pooled_male_non_black_model.csv","4","Analysis_19","Non-Black Male Persons who are statin-risk eligible",NA,"ccae","pooled_male_non_black_model.csv","1","4" +"20","1328","Non-Black Female Persons who are statin-risk eligible","1365","first occurrence of atheroclerotic cardiovascular disease","pooled_female_non_black_model.csv","2","Analysis_20","Non-Black Female Persons who are statin-risk eligible",NA,"ccae","pooled_female_non_black_model.csv","1","2" +"21","1358","Black Male Persons who are statin-risk eligible not censored at statin initiation","1365","first occurrence of atheroclerotic cardiovascular disease","pooled_male_black_model.csv","3","Analysis_21","Black Male Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_male_black_model.csv","1","3" +"22","1359","Black Female Persons who are statin-risk eligible not censored at statin initiation","1365","first occurrence of atheroclerotic cardiovascular disease","pooled_female_black_model.csv","1","Analysis_22","Black Female Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_female_black_model.csv","1","1" +"23","1360","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation","1365","first occurrence of atheroclerotic cardiovascular disease","pooled_male_non_black_model.csv","4","Analysis_23","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_male_non_black_model.csv","1","4" +"24","1361","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation","1365","first occurrence of atheroclerotic cardiovascular disease","pooled_female_non_black_model.csv","2","Analysis_24","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_female_non_black_model.csv","1","2" +"25","1322","Black Female Persons who are statin-risk eligible","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_female_black_model.csv","1","Analysis_25","Black Female Persons who are statin-risk eligible",NA,"ccae","pooled_female_black_model.csv","1","1" +"26","1325","Black Male Persons who are statin-risk eligible","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_male_black_model.csv","3","Analysis_26","Black Male Persons who are statin-risk eligible",NA,"ccae","pooled_male_black_model.csv","1","3" +"27","1326","Non-Black Male Persons who are statin-risk eligible","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_male_non_black_model.csv","4","Analysis_27","Non-Black Male Persons who are statin-risk eligible",NA,"ccae","pooled_male_non_black_model.csv","1","4" +"28","1328","Non-Black Female Persons who are statin-risk eligible","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_female_non_black_model.csv","2","Analysis_28","Non-Black Female Persons who are statin-risk eligible",NA,"ccae","pooled_female_non_black_model.csv","1","2" +"29","1358","Black Male Persons who are statin-risk eligible not censored at statin initiation","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_male_black_model.csv","3","Analysis_29","Black Male Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_male_black_model.csv","1","3" +"30","1359","Black Female Persons who are statin-risk eligible not censored at statin initiation","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_female_black_model.csv","1","Analysis_30","Black Female Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_female_black_model.csv","1","1" +"31","1360","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_male_non_black_model.csv","4","Analysis_31","Non-Black Male Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_male_non_black_model.csv","1","4" +"32","1361","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","pooled_female_non_black_model.csv","2","Analysis_32","Non-Black Female Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","pooled_female_non_black_model.csv","1","2" +"33","-1","Persons who are statin-risk eligible","1354","first of AMI or ischemic stroke or death","combined","1","Analysis_51","Persons who are statin-risk eligible",NA,"ccae","combined","1","1" +"34","-1","Persons who are statin-risk eligible not censored at statin initiation","1354","first of AMI or ischemic stroke or death","combined","1","Analysis_52","Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","combined","1","1" +"35","-1","Persons who are statin-risk eligible","1357","first of AMI or ischemic stroke or death, no IP required","combined","1","Analysis_52","Persons who are statin-risk eligible",NA,"ccae","combined","1","1" +"36","-1","Persons who are statin-risk eligible not censored at statin initiation","1357","first of AMI or ischemic stroke or death, no IP required","combined","1","Analysis_54","Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","combined","1","1" +"37","-1","Persons who are statin-risk eligible","1365","first occurrence of atheroclerotic cardiovascular disease","combined","1","Analysis_53","Persons who are statin-risk eligible",NA,"ccae","combined","1","1" +"38","-1","Persons who are statin-risk eligible not censored at statin initiation","1365","first occurrence of atheroclerotic cardiovascular disease","combined","1","Analysis_56","Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","combined","1","1" +"39","-1","Persons who are statin-risk eligible","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","combined","1","Analysis_54","Persons who are statin-risk eligible",NA,"ccae","combined","1","1" +"40","-1","Persons who are statin-risk eligible not censored at statin initiation","1366","first occurrence of atheroclerotic cardiovascular disease no IP required","combined","1","Analysis_58","Persons who are statin-risk eligible not censored at statin initiation",NA,"ccae","combined","1","1" diff --git a/PCEvalidation/server.R b/PCEvalidation/server.R index bee0b6d6..a96cfcfa 100644 --- a/PCEvalidation/server.R +++ b/PCEvalidation/server.R @@ -116,29 +116,6 @@ server <- shiny::shinyServer(function(input, output, session) { rownames = T, colnames = F) - # PLOTTING FUNCTION - plotters <- shiny::reactive({ - - eval <- plpResult()$performanceEvaluation - if(is.null(eval)){return(NULL)} - - calPlot <- NULL - rocPlot <- NULL - prPlot <- NULL - f1Plot <- NULL - - if(!is.null(eval)){ - #intPlot <- plotShiny(eval, input$slider1) -- RMS - intPlot <- plotShiny(eval) - rocPlot <- intPlot$roc - prPlot <- intPlot$pr - f1Plot <- intPlot$f1score - - list(rocPlot= rocPlot, - prPlot=prPlot, f1Plot=f1Plot) - } - }) - performance <- shiny::reactive({ @@ -175,6 +152,7 @@ server <- shiny::shinyServer(function(input, output, session) { estat10 = estat10) }) + # nb @ thresholds #nbPlot output$nbPlot <- shiny::renderPlot({ if(is.null(plpResult()$performanceEvaluation)){ @@ -193,36 +171,29 @@ server <- shiny::shinyServer(function(input, output, session) { } }) - - # preference plot - output$prefdist <- shiny::renderPlot({ - if(is.null(plpResult()$performanceEvaluation)){ - return(NULL) - } else{ - plotPreferencePDF(plpResult()$performanceEvaluation) #+ - # ggplot2::geom_vline(xintercept=plotters()$prefthreshold) -- RMS - } - }) - - output$preddist <- shiny::renderPlot({ - if(is.null(plpResult()$performanceEvaluation)){ - return(NULL) - } else{ - plotPredictedPDF(plpResult()$performanceEvaluation) # + - #ggplot2::geom_vline(xintercept=plotters()$threshold) -- RMS - } - }) - - output$box <- shiny::renderPlot({ - if(is.null(plpResult()$performanceEvaluation)){ + #nbPlot + nbVals <- shiny::reactive({ + if(is.null(plpResult()$performanceEvaluation$nbSummary)){ return(NULL) } else{ - plotPredictionDistribution(plpResult()$performanceEvaluation) + + nb10 <- plpResult()$performanceEvaluation$nbSummary$p[plpResult()$performanceEvaluation$nbSummary$threshold==0.075 & plpResult()$performanceEvaluation$nbSummary$time==10] + nb5 <- plpResult()$performanceEvaluation$nbSummary$p[plpResult()$performanceEvaluation$nbSummary$threshold==0.038 & plpResult()$performanceEvaluation$nbSummary$time==5] + nb3 <- plpResult()$performanceEvaluation$nbSummary$p[plpResult()$performanceEvaluation$nbSummary$threshold==0.023 & plpResult()$performanceEvaluation$nbSummary$time==3] + nb2 <- plpResult()$performanceEvaluation$nbSummary$p[plpResult()$performanceEvaluation$nbSummary$threshold==0.015 & plpResult()$performanceEvaluation$nbSummary$time==2] + + } + + list(nb10 = nb10, + nb5 = nb5, + nb3 = nb3, + nb2 = nb2) + }) - + output$cal <- shiny::renderPlot({ if(is.null(plpResult()$performanceEvaluation)){ return(NULL) @@ -231,33 +202,6 @@ server <- shiny::shinyServer(function(input, output, session) { } }) - output$demo <- shiny::renderPlot({ - if(is.null(plpResult()$performanceEvaluation)){ - return(NULL) - } else{ - tryCatch(plotDemographicSummary(plpResult()$performanceEvaluation), - error= function(cond){return(NULL)}) - } - }) - - - - # Do the tables and plots: - - output$roc <- plotly::renderPlotly({ - plotters()$rocPlot - }) - - output$pr <- plotly::renderPlotly({ - plotters()$prPlot - }) - output$f1 <- plotly::renderPlotly({ - plotters()$f1Plot - }) - - - - # covariate model plots @@ -284,18 +228,25 @@ server <- shiny::shinyServer(function(input, output, session) { output$cstat2 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( - "C-statistic", paste0(round(performance()$cstat2*1000)/10, "%"), icon = shiny::icon("thumbs-up"), + "C-statistic", paste0(round(performance()$cstat2*1000)/10, "%"), icon = shiny::icon("filter"), color = "orange" ) }) output$estat2 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( - "E-statistic", paste0(round(performance()$estat2*1000)/10, "%"), icon = shiny::icon("bullseye"), + "E-statistic", paste0(signif(performance()$estat2*100, digits = 4), "%"), icon = shiny::icon("bullseye"), color = "purple" ) }) + output$netben2 <- shinydashboard::renderInfoBox({ + shinydashboard::infoBox( + "Net Benefit", paste0(signif(nbVals()$nb2*100, digits = 4), "%"), icon = shiny::icon("balance-scale"), + color = "blue" + ) + }) + output$survival3 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( "Outcome", paste0(round(performance()$survival3*100, digits=3),'%'), icon = shiny::icon("ambulance"), @@ -305,18 +256,25 @@ server <- shiny::shinyServer(function(input, output, session) { output$cstat3 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( - "C-statistic", paste0(round(performance()$cstat3*1000)/10, "%"), icon = shiny::icon("thumbs-up"), + "C-statistic", paste0(round(performance()$cstat3*1000)/10, "%"), icon = shiny::icon("filter"), color = "orange" ) }) output$estat3 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( - "E-statistic", paste0(round(performance()$estat3*1000)/10, "%"), icon = shiny::icon("bullseye"), + "E-statistic", paste0(signif(performance()$estat3*100, digits = 4), "%"), icon = shiny::icon("bullseye"), color = "purple" ) }) + output$netben3 <- shinydashboard::renderInfoBox({ + shinydashboard::infoBox( + "Net Benefit", paste0(signif(nbVals()$nb3*100, digits = 4), "%"), icon = shiny::icon("balance-scale"), + color = "blue" + ) + }) + output$survival5 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( "Outcome", paste0(round(performance()$survival5*100, digits=3),'%'), icon = shiny::icon("ambulance"), @@ -326,17 +284,24 @@ server <- shiny::shinyServer(function(input, output, session) { output$cstat5 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( - "C-statistic", paste0(round(performance()$cstat5*1000)/10, "%"), icon = shiny::icon("thumbs-up"), + "C-statistic", paste0(round(performance()$cstat5*1000)/10, "%"), icon = shiny::icon("filter"), color = "orange" ) }) output$estat5 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( - "E-statistic", paste0(round(performance()$estat5*1000)/10, "%"), icon = shiny::icon("bullseye"), + "E-statistic", paste0(signif(performance()$estat5*100, digits = 4), "%"), icon = shiny::icon("bullseye"), color = "purple" ) }) + + output$netben5 <- shinydashboard::renderInfoBox({ + shinydashboard::infoBox( + "Net Benefit", paste0(signif(nbVals()$nb5*100, digits = 4), "%"), icon = shiny::icon("balance-scale"), + color = "blue" + ) + }) output$survival10 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( @@ -347,18 +312,25 @@ server <- shiny::shinyServer(function(input, output, session) { output$cstat10 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( - "C-statistic", paste0(round(performance()$cstat10*1000)/10, "%"), icon = shiny::icon("thumbs-up"), + "C-statistic", paste0(round(performance()$cstat10*1000)/10, "%"), icon = shiny::icon("filter"), color = "orange" ) }) output$estat10 <- shinydashboard::renderInfoBox({ shinydashboard::infoBox( - "E-statistic", paste0(round(performance()$estat10*1000)/10, "%"), icon = shiny::icon("bullseye"), + "E-statistic", paste0(signif(performance()$estat10*100, digits = 4), "%"), icon = shiny::icon("bullseye"), color = "purple" ) }) + output$netben10 <- shinydashboard::renderInfoBox({ + shinydashboard::infoBox( + "Net Benefit", paste0(signif(nbVals()$nb10*100, digits = 4), "%"), icon = shiny::icon("balance-scale"), + color = "blue" + ) + }) + # SELECTING RESULTS - for PERFORMANCE/MODEl ##selectedRow <- shiny::reactiveVal(value = 1) diff --git a/PCEvalidation/ui.R b/PCEvalidation/ui.R index 3ae60b60..348b4b6e 100644 --- a/PCEvalidation/ui.R +++ b/PCEvalidation/ui.R @@ -177,33 +177,37 @@ ui <- shinydashboard::dashboardPage(skin = 'black', shinydashboard::box(width = 12, title = "2-Year Dashboard", status = "warning", solidHeader = TRUE, - shinydashboard::infoBoxOutput("survival2"), - shinydashboard::infoBoxOutput("cstat2"), - shinydashboard::infoBoxOutput("estat2") + shinydashboard::infoBoxOutput("survival2", width = 3), + shinydashboard::infoBoxOutput("cstat2", width = 3), + shinydashboard::infoBoxOutput("estat2", width = 3), + shinydashboard::infoBoxOutput("netben2", width = 3) ), shinydashboard::box(width = 12, title = "3-Year Dashboard", status = "warning", solidHeader = TRUE, - shinydashboard::infoBoxOutput("survival3"), - shinydashboard::infoBoxOutput("cstat3"), - shinydashboard::infoBoxOutput("estat3") + shinydashboard::infoBoxOutput("survival3", width = 3), + shinydashboard::infoBoxOutput("cstat3", width = 3), + shinydashboard::infoBoxOutput("estat3", width = 3), + shinydashboard::infoBoxOutput("netben3", width = 3) ), shinydashboard::box(width = 12, title = "5-Year Dashboard", status = "warning", solidHeader = TRUE, - shinydashboard::infoBoxOutput("survival5"), - shinydashboard::infoBoxOutput("cstat5"), - shinydashboard::infoBoxOutput("estat5") + shinydashboard::infoBoxOutput("survival5", width = 3), + shinydashboard::infoBoxOutput("cstat5", width = 3), + shinydashboard::infoBoxOutput("estat5", width = 3), + shinydashboard::infoBoxOutput("netben5", width = 3) ), shinydashboard::box(width = 12, title = "10-Year Dashboard", status = "warning", solidHeader = TRUE, - shinydashboard::infoBoxOutput("survival10"), - shinydashboard::infoBoxOutput("cstat10"), - shinydashboard::infoBoxOutput("estat10") + shinydashboard::infoBoxOutput("survival10", width = 3), + shinydashboard::infoBoxOutput("cstat10", width = 3), + shinydashboard::infoBoxOutput("estat10", width = 3), + shinydashboard::infoBoxOutput("netben10", width = 3) ) ) @@ -211,43 +215,7 @@ ui <- shinydashboard::dashboardPage(skin = 'black', ), # end summary - tabPanel("Discrimination", - - shiny::fluidRow( - shinydashboard::box( status = 'info', - title = actionLink("rocHelp", "ROC Plot", icon = icon("info")), - solidHeader = TRUE, - shinycssloaders::withSpinner(plotly::plotlyOutput('roc'))), - shinydashboard::box(status = 'info', - title = actionLink("prcHelp", "Precision recall plot", icon = icon("info")), - solidHeader = TRUE, - side = "right", - shinycssloaders::withSpinner(plotly::plotlyOutput('pr')))), - - shiny::fluidRow( - shinydashboard::box(status = 'info', - title = actionLink("f1Help", "F1 Score Plot", icon = icon("info")), - solidHeader = TRUE, - shinycssloaders::withSpinner(plotly::plotlyOutput('f1'))), - shinydashboard::box(status = 'info', - title = actionLink("boxHelp","Box Plot", icon = icon("info")), - solidHeader = TRUE, - side = "right", - shinycssloaders::withSpinner(shiny::plotOutput('box')))), - - shiny::fluidRow( - shinydashboard::box(status = 'info', - title = actionLink("predDistHelp","Prediction Score Distribution", icon = icon("info")), - solidHeader = TRUE, - shinycssloaders::withSpinner(shiny::plotOutput('preddist'))), - shinydashboard::box(status = 'info', - title = actionLink("prefDistHelp","Preference Score Distribution", icon = icon("info")), - solidHeader = TRUE, - side = "right", - shinycssloaders::withSpinner(shiny::plotOutput('prefdist')))) - - - ), + tabPanel("Net Benefit", shiny::fluidRow(