From 3f00938649399d5d120a6d325288f6b767fe5d94 Mon Sep 17 00:00:00 2001 From: SERDAR BALCI Date: Tue, 30 Jun 2020 15:41:04 +0300 Subject: [PATCH] # ClinicoPath 0.0.2.0016 - See: https://github.com/sbalci/jjstatsplot/releases/ - See: https://github.com/sbalci/ClinicoPath/releases/ - crosstable function partially resolves https://github.com/jamovi/jamovi/issues/443 - survival function resolves https://github.com/jonathon-love/deathwatch/issues/2 - added export html to crosstables to bypass https://github.com/jamovi/jamovi/issues/892 --- .Rprofile | 20 ++++++ DESCRIPTION | 4 +- NEWS.md | 17 ++++- R/00jmv.R | 31 ++++----- R/crosstable.b.R | 21 +++++- R/tree.b.R | 9 ++- README.Rmd | 36 ++++++++-- README.md | 114 ++++++++++++++++---------------- codemeta.json | 4 +- data/histopathology.omv | Bin 27200 -> 27008 bytes inst/extdata/histopathology.omv | Bin 26028 -> 27200 bytes jamovi/0000.yaml | 4 +- jamovi/00refs.yaml | 31 ++++----- tododata/todo.Rmd | 17 +---- 14 files changed, 189 insertions(+), 119 deletions(-) diff --git a/.Rprofile b/.Rprofile index 48d941ae..43eece16 100644 --- a/.Rprofile +++ b/.Rprofile @@ -9,6 +9,26 @@ options(repos = c("https://cran.microsoft.com/snapshot/2020-05-01")) # .libPaths(new = "~/histopathRprojects/ClinicoPathLibrary") + +# options(repos = c("https://cran.microsoft.com/snapshot/2020-05-01")) + +# .libPaths(new = "C:\\ClinicoPathLibrary") + +# Sys.setenv(TZ = "Europe/Istanbul") + +# Sys.setenv(TEMP = "C:\\temp") + +# Sys.setenv(TMP = "C:\\temp") + + +# jmvtools::check("C://Program Files//jamovi//bin") +# jmvtools::install(home = "C://Program Files//jamovi//bin") +# +# +# + + + # source( # "renv/activate.R" # "~/histopathRprojects/ClinicoPath/renv/activate.R" diff --git a/DESCRIPTION b/DESCRIPTION index 7a31e295..3554a1d3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: ClinicoPath Title: Analysis for Clinicopathological Research -Version: 0.0.2.0015 -Date: 2020-06-28 +Version: 0.0.2.0016 +Date: 2020-06-29 Authors@R: person(given = "Serdar", family = "Balci", diff --git a/NEWS.md b/NEWS.md index 59c03839..208276df 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,24 @@ +# ClinicoPath 0.0.2.0016 + +- See: https://github.com/sbalci/jjstatsplot/releases/ + +- See: https://github.com/sbalci/ClinicoPath/releases/ + +- crosstable function partially resolves https://github.com/jamovi/jamovi/issues/443 + +- survival function resolves https://github.com/jonathon-love/deathwatch/issues/2 + +- added export html to crosstables to bypass https://github.com/jamovi/jamovi/issues/892 + + + + # ClinicoPath 0.0.2.0015 - Added tangram statistical results - Added options to finalfit crosstables fixes: https://github.com/sbalci/ClinicoPathJamoviModule/issues/24 -fixes: https://github.com/jamovi/jamovi/issues/901 +Partially fixes: https://github.com/jamovi/jamovi/issues/901 fixes: https://github.com/ewenharrison/finalfit/issues/52 - Added experimental biblometrics functions diff --git a/R/00jmv.R b/R/00jmv.R index 01d86137..5d4ad9b7 100644 --- a/R/00jmv.R +++ b/R/00jmv.R @@ -314,22 +314,23 @@ `url`="https://CRAN.R-project.org/package=hrbrthemes"), `retractcheck`=list( `type`="software", - `author`=NULL, - `year`=NULL, - `title`="", - `publisher`="[R package]. Retrieved from https://CRAN.R-project.org/package=", - `url`="https://CRAN.R-project.org/package="), + `author`="Chris Hartgerink and Frederik Aust", + `year`=2019, + `title`="retractcheck: Retraction Scanner", + `publisher`="[R package]. Retrieved from https://CRAN.R-project.org/package=retractcheck", + `url`="https://CRAN.R-project.org/package=retractcheck"), `RefManageR`=list( `type`="software", - `author`=NULL, - `year`=NULL, - `title`="", - `publisher`="[R package]. Retrieved from https://CRAN.R-project.org/package=", - `url`="https://CRAN.R-project.org/package="), + `author`="McLean MW", + `year`=2017, + `title`="RefManageR: Import and Manage BibTeX and BibLaTeX References in R. The Journal of Open Source Software.", + `doi`="10.21105/joss.00338", + `publisher`="[R package]. Retrieved from https://CRAN.R-project.org/package=RefManageR", + `url`="https://CRAN.R-project.org/package=RefManageR"), `rcrossref`=list( `type`="software", - `author`=NULL, - `year`=NULL, - `title`="", - `publisher`="[R package]. Retrieved from https://CRAN.R-project.org/package=", - `url`="https://CRAN.R-project.org/package=")) + `author`="Scott Chamberlain and Hao Zhu and Najko Jahn and Carl Boettiger and Karthik Ram", + `year`=2020, + `title`="rcrossref: Client for Various 'CrossRef' 'APIs'", + `publisher`="[R package]. Retrieved from https://CRAN.R-project.org/package=rcrossref", + `url`="https://CRAN.R-project.org/package=rcrossref")) diff --git a/R/crosstable.b.R b/R/crosstable.b.R index 3be0f0e0..75051e6c 100644 --- a/R/crosstable.b.R +++ b/R/crosstable.b.R @@ -268,10 +268,29 @@ crosstableClass <- if (requireNamespace('jmvcore')) R6::R6Class( if (export) { + + + + if (.Platform$OS.type == "windows") { + + stopifnot(file.exists("C:\\temp2")) + + write( + x = tabletangram, + file = "C:\\temp2\\ClinicoPathCrossTable.html" + ) + + + } else { + + write(x = tabletangram, file = "~/Documents/ClinicoPathCrossTable.html" - ) + + } + + } diff --git a/R/tree.b.R b/R/tree.b.R index d881e4a8..8cd1cdee 100644 --- a/R/tree.b.R +++ b/R/tree.b.R @@ -85,7 +85,7 @@ treeClass <- if (requireNamespace('jmvcore')) R6::R6Class( tree <- rpart::rpart(myformula, data = mydata, cp = .02) - # self$results$text2$setContent(tree) + self$results$text2$setContent(tree) # FFTrees ---- @@ -113,7 +113,7 @@ treeClass <- if (requireNamespace('jmvcore')) R6::R6Class( - # self$results$text2$setContent(mydata) + self$results$text2$setContent(mydata) } @@ -200,6 +200,7 @@ treeClass <- if (requireNamespace('jmvcore')) R6::R6Class( myformula <- as.formula(myformula) # FFTrees ---- + # https://ndphillips.github.io/useR2017_pres/#1 mytree.fft <- FFTrees::FFTrees( formula = myformula, @@ -250,7 +251,9 @@ treeClass <- if (requireNamespace('jmvcore')) R6::R6Class( myformula <- as.formula(myformula) - tree <- rpart::rpart(myformula, data = mydata, cp = .02) + tree <- rpart::rpart(myformula, + data = mydata, + cp = .02) plot3 <- rpart.plot::rpart.plot(tree, diff --git a/README.Rmd b/README.Rmd index 3978c569..44317aa4 100644 --- a/README.Rmd +++ b/README.Rmd @@ -4,7 +4,7 @@ output: github_document -```{r, include = FALSE} +```{r global options, include = FALSE} knitr::opts_chunk$set( collapse = TRUE, comment = "#>", @@ -64,17 +64,41 @@ Then you can install this module directly inside the jamovi, using library. ## Installation via sideload [jamovi](https://www.jamovi.org) -- Step 1: Download and install [jamovi](https://www.jamovi.org). +**Step 1: Download and install [jamovi](https://www.jamovi.org).** -- Step 2: Download the relevant `jmo` file for your operating system from +**Step 2: Download the relevant `jmo` file for your operating system from** + +*a: For development version* - - a: For development version - [releases](https://github.com/sbalci/ClinicoPathJamoviModule/releases/) - [sourceforge](https://sourceforge.net/projects/clinicopathjamovimodule/files/latest/download). - - b: For stable version + +*b: For smaller modules* + + +- ClinicoPath: + + +https://github.com/sbalci/ClinicoPath + + +https://github.com/sbalci/ClinicoPath/releases + + +- JJStatsPlot: + + +https://github.com/sbalci/jjstatsplot + +https://github.com/sbalci/jjstatsplot/releases/ + + +*c: For stable version* + + - windows: https://library.jamovi.org/win64/R3.6.3/ClinicoPath-0.0.2.jmo @@ -84,7 +108,7 @@ Then you can install this module directly inside the jamovi, using library. -- Step 3: And install using side-load as shown below: +**Step 3: And install using side-load as shown below:** diff --git a/README.md b/README.md index bf31ab71..6a1a5f2f 100644 --- a/README.md +++ b/README.md @@ -45,18 +45,31 @@ library. ## Installation via sideload [jamovi](https://www.jamovi.org) - - Step 1: Download and install [jamovi](https://www.jamovi.org). +**Step 1: Download and install [jamovi](https://www.jamovi.org).** - - Step 2: Download the relevant `jmo` file for your operating system - from - - - a: For development version +**Step 2: Download the relevant `jmo` file for your operating system +from** - - [releases](https://github.com/sbalci/ClinicoPathJamoviModule/releases/) +*a: For development version* + - [releases](https://github.com/sbalci/ClinicoPathJamoviModule/releases/) - [sourceforge](https://sourceforge.net/projects/clinicopathjamovimodule/files/latest/download). - - - b: For stable version + +*b: For smaller modules* + + - ClinicoPath: + + + + + + - JJStatsPlot: + + + + + +*c: For stable version* - windows: @@ -66,7 +79,7 @@ library. - - Step 3: And install using side-load as shown below: +**Step 3: And install using side-load as shown below:** @@ -293,21 +306,23 @@ Binder](http://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/sbalci/C Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/sbalci/ClinicoPathJamoviModule) [![Download ClinicoPathJamoviModule](https://img.shields.io/sourceforge/dt/clinicopathjamovimodule.svg)](https://sourceforge.net/projects/clinicopathjamovimodule/files/latest/download) -[![Project Status: WIP – Initial development is in progress, but there -has not yet been a stable, usable release suitable for the -public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip) -[![lifecycle](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/) -[![stability-experimental](https://img.shields.io/badge/stability-experimental-orange.svg)](https://github.com/joethorley/stability-badges#experimental) +[![Project Status: Active – The project has reached a stable, usable +state and is being actively +developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) +[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/) +[![stability-unstable](https://img.shields.io/badge/stability-unstable-yellow.svg)](https://github.com/joethorley/stability-badges#unstable) [![GitHub issues](https://img.shields.io/github/issues/sbalci/clinicopathjamovimodule.svg)](https://github.com/sbalci/clinicopathjamovimodule/issues) -![GitHub -issues](https://img.shields.io/github/issues/sbalci/clinicopathjamovimodule) +![R CMD Check via +{tic}](https://github.com/sbalci/ClinicoPathJamoviModule/workflows/R%20CMD%20Check%20via%20%7Btic%7D/badge.svg) +![Render +README](https://github.com/sbalci/ClinicoPathJamoviModule/workflows/Render%20README/badge.svg) ![R-CMD-check](https://github.com/sbalci/ClinicoPathJamoviModule/workflows/R-CMD-check/badge.svg) [![Codacy -Badge](https://api.codacy.com/project/badge/Grade/e15104a9086c48d39f7cd822972d399f)](https://www.codacy.com/manual/drserdarbalci/JournalWatchPBPath?utm_source=github.com&utm_medium=referral&utm_content=sbalci/JournalWatchPBPath&utm_campaign=Badge_Grade) -[![CodeFactor](https://www.codefactor.io/repository/github/sbalci/clinicopathjamovimodule/badge)](https://www.codefactor.io/repository/github/sbalci/clinicopathjamovimodule) +Badge](https://app.codacy.com/project/badge/Grade/cdf2bede535c439d826b6dffdff40764)](https://www.codacy.com/manual/drserdarbalci/ClinicoPathJamoviModule?utm_source=github.com&utm_medium=referral&utm_content=sbalci/ClinicoPathJamoviModule&utm_campaign=Badge_Grade) +[![CodeFactor](https://www.codefactor.io/repository/github/sbalci/clinicopathjamovimodule/badge)](https://www.codefactor.io/repository/github/sbalci/clinicopathjamovimodule) [![Coverage -Status](https://coveralls.io/repos/github/sbalci/clinicopathjamovimodule/badge.svg?branch=master)](https://coveralls.io/github/sbalci/clinicopathjamovimodule?branch=master) +Status](https://coveralls.io/repos/github/sbalci/ClinicoPathJamoviModule/badge.svg?branch=master)](https://coveralls.io/github/sbalci/ClinicoPathJamoviModule?branch=master) [![Build Status](https://travis-ci.com/sbalci/ClinicoPathJamoviModule.svg?branch=master)](https://travis-ci.com/sbalci/ClinicoPathJamoviModule) [![Build @@ -315,35 +330,27 @@ status](https://ci.appveyor.com/api/projects/status/ftdd497g9qamm4ov?svg=true)]( [![codecov](https://codecov.io/gh/sbalci/ClinicoPathJamoviModule/branch/master/graph/badge.svg)](https://codecov.io/gh/sbalci/ClinicoPathJamoviModule) [![CircleCI](https://circleci.com/gh/sbalci/ClinicoPathJamoviModule.svg?style=svg)](https://circleci.com/gh/sbalci/ClinicoPathJamoviModule) [![GuardRails -badge](https://badges.guardrails.io/sbalci/ClinicoPathJamoviModule.svg?token=9402aef8ace3415bad8f423a384b631c7319e5faffc96e2e299b603ace62d68e&provider=github)](https://dashboard.guardrails.io/default/gh/sbalci/ClinicoPathJamoviModule) +badge](https://badges.guardrails.io/sbalci/ClinicoPathJamoviModule.svg?token=9402aef8ace3415bad8f423a384b631c7319e5faffc96e2e299b603ace62d68e&provider=github)](https://dashboard.guardrails.io/gh/sbalci/33943) [![Maintainability](https://api.codeclimate.com/v1/badges/692e4af79330f43dac48/maintainability)](https://codeclimate.com/github/sbalci/ClinicoPathJamoviModule/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/692e4af79330f43dac48/test_coverage)](https://codeclimate.com/github/sbalci/ClinicoPathJamoviModule/test_coverage) -[![DepShield -Badge](https://depshield.sonatype.org/badges/sbalci/ClinicoPathJamoviModule/depshield.svg)](https://depshield.github.io) ![GitHub](https://img.shields.io/github/license/sbalci/clinicopathjamovimodule.svg) -[![GitHub -version](https://img.shields.io/badge/GitHub-0.0.1.1000-orange.svg?style=flat-square)](https://github.com/sbalci/clinicopathjamovimodule/) [![GitHub last commit](https://img.shields.io/github/last-commit/sbalci/clinicopathjamovimodule)](https://github.com/sbalci/clinicopathjamovimodule/commits/master) -[![Last-changedate](https://img.shields.io/badge/last%20change-2020--05--25-yellowgreen.svg)](https://github.com/sbalci/clinicopathjamovimodule/commits/master) +[![Last-changedate](https://img.shields.io/badge/last%20change-2020--06--30-yellowgreen.svg)](https://github.com/sbalci/clinicopathjamovimodule/commits/master) ![GitHub Release Date](https://img.shields.io/github/release-date/sbalci/clinicopathjamovimodule) -![GitHub last -commit](https://img.shields.io/github/last-commit/sbalci/clinicopathjamovimodule) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/sbalci/clinicopathjamovimodule) -[![Website](https://img.shields.io/badge/website-clinicopathjamovimodule-orange.svg?colorB=E91E63)](https://sbalci.github.io/clinicopathjamovimodule/) +[![Website](https://img.shields.io/badge/website-ClinicoPathJamoviModule-orange.svg?colorB=E91E63)](https://sbalci.github.io/ClinicoPathJamoviModule/) [![GitHub code size in -bytes](https://img.shields.io/github/languages/code-size/sbalci/clinicopathjamovimodule.svg)](https://github.com/sbalci/clinicopathjamovimodule) +bytes](https://img.shields.io/github/languages/code-size/sbalci/clinicopathjamovimodule.svg)](https://github.com/sbalci/ClinicoPathJamoviModule) [![minimal R -version](https://img.shields.io/badge/R%3E%3D-3.6.0-6666ff.svg)](https://cran.r-project.org/) +version](https://img.shields.io/badge/R%3E%3D-3.6.3-6666ff.svg)](https://cran.r-project.org/) [![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/sbalci/clinicopathjamovimodule.svg)](https://libraries.io/github/sbalci/clinicopathjamovimodule) [![Requirements Status](https://requires.io/github/sbalci/ClinicoPathJamoviModule/requirements.svg?branch=gh-pages)](https://requires.io/github/sbalci/ClinicoPathJamoviModule/requirements/?branch=gh-pages) -[![DepShield -Badge](https://depshield.sonatype.org/badges/sbalci/clinicopathjamovimodule/depshield.svg)](https://depshield.github.io) [![GitHub forks](https://img.shields.io/github/forks/sbalci/clinicopathjamovimodule.svg)](https://github.com/sbalci/clinicopathjamovimodule/network) ![GitHub @@ -354,9 +361,6 @@ stars](https://img.shields.io/github/stars/sbalci/clinicopathjamovimodule.svg)]( Stars](https://img.shields.io/github/stars/sbalci/clinicopathjamovimodule.svg?style=social&label=Github)](https://github.com/sbalci/clinicopathjamovimodule) ![GitHub stars](https://img.shields.io/github/stars/sbalci/clinicopathjamovimodule?style=social) -[![Twitter](https://img.shields.io/twitter/url/https/github.com/sbalci/clinicopathjamovimodule.svg?style=social)](https://twitter.com/intent/tweet?text=A%20@jamovistats%20module%20for%20%23histopathology%20%23clinicopathology%20%23pathology%20%23research%20using%20various%20%23rstats%20packages%20📦.%20@serdarbalci&url=https%3A%2F%2Fsbalci.github.io%2ClinicoPathJamoviModule%2) -![Twitter -URL](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Fsbalci.github.io%2FClinicoPathJamoviModule%2F) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/sbalci/clinicopathjamovimodule/issues) ![GitHub @@ -372,11 +376,11 @@ Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=git ClinicoPathJamoviModule](https://img.shields.io/sourceforge/dt/clinicopathjamovimodule.svg)](https://sourceforge.net/projects/clinicopathjamovimodule/files/latest/download) **Status** -[![Project Status: WIP – Initial development is in progress, but there -has not yet been a stable, usable release suitable for the -public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip) -[![lifecycle](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/) -[![stability-experimental](https://img.shields.io/badge/stability-experimental-orange.svg)](https://github.com/joethorley/stability-badges#experimental) +[![Project Status: Active – The project has reached a stable, usable +state and is being actively +developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) +[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/) +[![stability-unstable](https://img.shields.io/badge/stability-unstable-yellow.svg)](https://github.com/joethorley/stability-badges#unstable) [![GitHub issues](https://img.shields.io/github/issues/sbalci/clinicopathjamovimodule.svg)](https://github.com/sbalci/clinicopathjamovimodule/issues) ![GitHub @@ -384,11 +388,12 @@ issues](https://img.shields.io/github/issues/sbalci/clinicopathjamovimodule) **Check, CI** ![R-CMD-check](https://github.com/sbalci/ClinicoPathJamoviModule/workflows/R-CMD-check/badge.svg) -[![CodeFactor](https://www.codefactor.io/repository/github/sbalci/clinicopathjamovimodule/badge)](https://www.codefactor.io/repository/github/sbalci/clinicopathjamovimodule) + [![Codacy -Badge](https://api.codacy.com/project/badge/Grade/e15104a9086c48d39f7cd822972d399f)](https://www.codacy.com/manual/drserdarbalci/JournalWatchPBPath?utm_source=github.com&utm_medium=referral&utm_content=sbalci/JournalWatchPBPath&utm_campaign=Badge_Grade) +Badge](https://app.codacy.com/project/badge/Grade/cdf2bede535c439d826b6dffdff40764)](https://www.codacy.com/manual/drserdarbalci/ClinicoPathJamoviModule?utm_source=github.com&utm_medium=referral&utm_content=sbalci/ClinicoPathJamoviModule&utm_campaign=Badge_Grade) +[![CodeFactor](https://www.codefactor.io/repository/github/sbalci/clinicopathjamovimodule/badge)](https://www.codefactor.io/repository/github/sbalci/clinicopathjamovimodule) [![Coverage -Status](https://coveralls.io/repos/github/sbalci/clinicopathjamovimodule/badge.svg?branch=master)](https://coveralls.io/github/sbalci/clinicopathjamovimodule?branch=master) +Status](https://coveralls.io/repos/github/sbalci/ClinicoPathJamoviModule/badge.svg?branch=master)](https://coveralls.io/github/sbalci/ClinicoPathJamoviModule?branch=master) [![Build Status](https://travis-ci.com/sbalci/ClinicoPathJamoviModule.svg?branch=master)](https://travis-ci.com/sbalci/ClinicoPathJamoviModule) [![Build @@ -396,41 +401,36 @@ status](https://ci.appveyor.com/api/projects/status/ftdd497g9qamm4ov?svg=true)]( [![codecov](https://codecov.io/gh/sbalci/ClinicoPathJamoviModule/branch/master/graph/badge.svg)](https://codecov.io/gh/sbalci/ClinicoPathJamoviModule) [![CircleCI](https://circleci.com/gh/sbalci/ClinicoPathJamoviModule.svg?style=svg)](https://circleci.com/gh/sbalci/ClinicoPathJamoviModule) [![GuardRails -badge](https://badges.guardrails.io/sbalci/ClinicoPathJamoviModule.svg?token=9402aef8ace3415bad8f423a384b631c7319e5faffc96e2e299b603ace62d68e&provider=github)](https://dashboard.guardrails.io/default/gh/sbalci/ClinicoPathJamoviModule) +badge](https://badges.guardrails.io/sbalci/ClinicoPathJamoviModule.svg?token=9402aef8ace3415bad8f423a384b631c7319e5faffc96e2e299b603ace62d68e&provider=github)](https://dashboard.guardrails.io/gh/sbalci/33943) [![Maintainability](https://api.codeclimate.com/v1/badges/692e4af79330f43dac48/maintainability)](https://codeclimate.com/github/sbalci/ClinicoPathJamoviModule/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/692e4af79330f43dac48/test_coverage)](https://codeclimate.com/github/sbalci/ClinicoPathJamoviModule/test_coverage) -[![DepShield -Badge](https://depshield.sonatype.org/badges/sbalci/ClinicoPathJamoviModule/depshield.svg)](https://depshield.github.io) + **Recency, Updates** ![GitHub](https://img.shields.io/github/license/sbalci/clinicopathjamovimodule.svg) -[![GitHub -version](https://img.shields.io/badge/GitHub-0.0.1.1000-orange.svg?style=flat-square)](https://github.com/sbalci/clinicopathjamovimodule/) + [![GitHub last commit](https://img.shields.io/github/last-commit/sbalci/clinicopathjamovimodule)](https://github.com/sbalci/clinicopathjamovimodule/commits/master) -[![Last-changedate](https://img.shields.io/badge/last%20change-2020--05--25-yellowgreen.svg)](https://github.com/sbalci/clinicopathjamovimodule/commits/master) +[![Last-changedate](https://img.shields.io/badge/last%20change-2020--06--30-yellowgreen.svg)](https://github.com/sbalci/clinicopathjamovimodule/commits/master) ![GitHub Release Date](https://img.shields.io/github/release-date/sbalci/clinicopathjamovimodule) -![GitHub last -commit](https://img.shields.io/github/last-commit/sbalci/clinicopathjamovimodule) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/sbalci/clinicopathjamovimodule) **Webpage, Links, Size, Download** -[![Website](https://img.shields.io/badge/website-clinicopathjamovimodule-orange.svg?colorB=E91E63)](https://sbalci.github.io/clinicopathjamovimodule/) +[![Website](https://img.shields.io/badge/website-ClinicoPathJamoviModule-orange.svg?colorB=E91E63)](https://sbalci.github.io/ClinicoPathJamoviModule/) [![GitHub code size in -bytes](https://img.shields.io/github/languages/code-size/sbalci/clinicopathjamovimodule.svg)](https://github.com/sbalci/clinicopathjamovimodule) +bytes](https://img.shields.io/github/languages/code-size/sbalci/clinicopathjamovimodule.svg)](https://github.com/sbalci/ClinicoPathJamoviModule) **Dependencies** [![minimal R -version](https://img.shields.io/badge/R%3E%3D-3.6.0-6666ff.svg)](https://cran.r-project.org/) +version](https://img.shields.io/badge/R%3E%3D-3.6.3-6666ff.svg)](https://cran.r-project.org/) [![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/sbalci/clinicopathjamovimodule.svg)](https://libraries.io/github/sbalci/clinicopathjamovimodule) [![Requirements Status](https://requires.io/github/sbalci/ClinicoPathJamoviModule/requirements.svg?branch=gh-pages)](https://requires.io/github/sbalci/ClinicoPathJamoviModule/requirements/?branch=gh-pages) -[![DepShield -Badge](https://depshield.sonatype.org/badges/sbalci/clinicopathjamovimodule/depshield.svg)](https://depshield.github.io) + **Interaction, Shares** [![GitHub @@ -444,8 +444,6 @@ Stars](https://img.shields.io/github/stars/sbalci/clinicopathjamovimodule.svg?st ![GitHub stars](https://img.shields.io/github/stars/sbalci/clinicopathjamovimodule?style=social) [![Twitter](https://img.shields.io/twitter/url/https/github.com/sbalci/clinicopathjamovimodule.svg?style=social)](https://twitter.com/intent/tweet?text=A%20@jamovistats%20module%20for%20%23histopathology%20%23clinicopathology%20%23pathology%20%23research%20using%20various%20%23rstats%20packages%20📦.%20@serdarbalci&url=https%3A%2F%2Fsbalci.github.io%2ClinicoPathJamoviModule%2) -![Twitter -URL](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Fsbalci.github.io%2FClinicoPathJamoviModule%2F) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/sbalci/clinicopathjamovimodule/issues) ![GitHub diff --git a/codemeta.json b/codemeta.json index 4e753a62..937c3254 100644 --- a/codemeta.json +++ b/codemeta.json @@ -14,7 +14,7 @@ ], "issueTracker": "\n https://github.com/sbalci/ClinicoPathJamoviModule/issues/", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "0.0.2.15", + "version": "0.0.2.16", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -657,6 +657,6 @@ "survival-analysis", "natural-language-summaries" ], - "fileSize": "301.543KB", + "fileSize": "302.144KB", "readme": "https://github.com/sbalci/ClinicoPathJamoviModule/blob/master/README.md" } diff --git a/data/histopathology.omv b/data/histopathology.omv index 11ef86ca4f388f6b898054cfb6466e4f8f0fffd8..4b3cbd8928ddc7748ce1fd15ffce0c7dbb90e21d 100644 GIT binary patch delta 5819 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 delta 6011 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 P`@6{g)(Ke4e@_1gmAbc@ delta 7124 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 -date: '2020-06-28' +date: '2020-06-29' type: R description: >- ClinicoPath help researchers to generate natural language summaries of their diff --git a/jamovi/00refs.yaml b/jamovi/00refs.yaml index ac5b2bf7..ec7ceaaa 100644 --- a/jamovi/00refs.yaml +++ b/jamovi/00refs.yaml @@ -365,29 +365,30 @@ refs: retractcheck: type: 'software' - author: - year: - title: "" - publisher: '[R package]. Retrieved from https://CRAN.R-project.org/package=' - url: https://CRAN.R-project.org/package= + author: Chris Hartgerink and Frederik Aust + year: 2019 + title: "retractcheck: Retraction Scanner" + publisher: '[R package]. Retrieved from https://CRAN.R-project.org/package=retractcheck' + url: https://CRAN.R-project.org/package=retractcheck RefManageR: type: 'software' - author: - year: - title: "" - publisher: '[R package]. Retrieved from https://CRAN.R-project.org/package=' - url: https://CRAN.R-project.org/package= + author: McLean MW + year: 2017 + title: 'RefManageR: Import and Manage BibTeX and BibLaTeX References in R. The Journal of Open Source Software.' + doi: 10.21105/joss.00338 + publisher: '[R package]. Retrieved from https://CRAN.R-project.org/package=RefManageR' + url: https://CRAN.R-project.org/package=RefManageR rcrossref: type: 'software' - author: - year: - title: "" - publisher: '[R package]. Retrieved from https://CRAN.R-project.org/package=' - url: https://CRAN.R-project.org/package= + author: Scott Chamberlain and Hao Zhu and Najko Jahn and Carl Boettiger and Karthik Ram + year: 2020 + title: "rcrossref: Client for Various 'CrossRef' 'APIs'" + publisher: '[R package]. Retrieved from https://CRAN.R-project.org/package=rcrossref' + url: https://CRAN.R-project.org/package=rcrossref ... diff --git a/tododata/todo.Rmd b/tododata/todo.Rmd index f37956ae..ff48ea6d 100644 --- a/tododata/todo.Rmd +++ b/tododata/todo.Rmd @@ -1065,24 +1065,13 @@ readyfunctions <- c( "^oddsratio", # "^competingsurvival", -# JJ Functions - "statsplot2", - "^jjbarstats\\.", - "^jjbetweenstats", - "^jjcorrmat", - "^jjdotplotstats", - "^jjhistostats", - "^jjpiestats", - "^jjscatterstats", - "^jjwithinstats", - # Agreement - "^agreement" + "^agreement", # "^icccoeff", # Decision - # "^decision", - # "^decisioncalculator", + "^decision", + "^decisioncalculator" # "^roc", # "^tree" )