Skip to content

Commit

Permalink
minor edits
Browse files Browse the repository at this point in the history
  • Loading branch information
kylehamilton committed Jun 21, 2016
1 parent 005b02a commit 42fbe43
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 25 deletions.
Binary file modified .RData
Binary file not shown.
12 changes: 12 additions & 0 deletions .Rhistory
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,15 @@ shiny::runApp('inst/shiny')
shiny::runApp('inst/shiny')
shiny::runApp('inst/shiny')
shiny::runApp('inst/shiny')
remove.packages("MAVIS", lib="~/R/win-library/3.3")
install.packages(c("shiny", "shinyAce", "shinyBS", "meta", "metafor", "metamisc", "MAd", "MAc", "quantreg", "ggplot2", "compute.es", "SCMA", "SCRT"))
shiny::runApp('inst/shiny')
install.packages("weightr")
library("weightr", lib.loc="~/R/win-library/3.3")
runApp('inst/shiny')
runApp('inst/shiny')
runApp('inst/shiny')
runApp('inst/shiny')
runApp('inst/shiny')
runApp('inst/shiny')
runApp('inst/shiny')
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Package: MAVIS
Type: Package
Title: Meta Analysis via Shiny
Version: 1.1.2
Date: 2016-04-26
Authors@R: c(person("William Kyle", "Hamilton", role = c("aut", "cre"), email = "[email protected]"),
person("Atsushi", "Mizumoto", role = "aut"),
person("Burak", "Aydin", role = c("ctb", "trl")))
Maintainer: William Kyle Hamilton <[email protected]>
Date: 2016-06-21
Authors@R: c(person("W. Kyle", "Hamilton", role = c("aut", "cre"), email = "[email protected]"),
person("Burak", "Aydin", role = "aut"),
person("Atsushi", "Mizumoto", role = "aut"))
Maintainer: W. Kyle Hamilton <[email protected]>
Description: Interactive shiny application for running a meta-analysis,
provides support for both random effects and fixed effects models with the 'metafor' package.
Additional support is included for calculating effect sizes plus
Expand Down
13 changes: 11 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
# CHANGES TO MAVIS 1.1.2 #

## SIGNIFICANT USER-VISIBILE CHANGES ##

* Examples now include data from published papers
* More effect size calculators have been added

## MINOR CHANGES ##
* Added the framework to include the weightr package

# CHANGES TO MAVIS 1.1.1 #

## SIGNIFICANT USER-VISIBILE CHANGES ##

* Turkish version of MAVIS (aRma) is now added to the package and can be started using startaRma
* Turkish version of MAVIS (aRma) is now added to the package and can be started using startaRma

# CHANGES TO MAVIS 1.1 #

Expand All @@ -21,4 +31,3 @@
## MINOR CHANGES ##
* Information provide about GPLv3.
* References for methods added throughout interface.

17 changes: 10 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
MAVIS: Meta Analysis via Shiny v1.1.1 "Smiling Fox"
MAVIS: Meta Analysis via Shiny v1.1.2 "Smiling Fox"
=====
[![CRAN Version](http://www.r-pkg.org/badges/version/MAVIS)](http://cran.rstudio.com/web/packages/MAVIS)
[![Monthly Downloads](http://cranlogs.r-pkg.org/badges/MAVIS)](http://cranlogs.r-pkg.org/badges/MAVIS)
[![Total Downloads](http://cranlogs.r-pkg.org/badges/grand-total/MAVIS)](http://cranlogs.r-pkg.org/badges/grand-total/MAVIS)

### Live demo of MAVIS v1.1.1 can be found here http://kylehamilton.net/shiny/MAVIS/
### Live demo of MAVIS v1.1.2 can be found here http://kylehamilton.net/shiny/MAVIS/

#### News about MAVIS

June 21, 2016
* Examples now include data from published papers
* More effect size calculators have been added

August 4, 2015
* Version 1.1.1 has been sent to CRAN
* Added one new effect size calculator and included the Turkish version of MAVIS (aRma) to the package.

* April 29, 2015
April 29, 2015
* Version 1.1 has been sent to CRAN and can be found here http://cran.r-project.org/web/packages/MAVIS/index.html.


Expand Down Expand Up @@ -42,17 +45,17 @@ Image Licensed under https://creativecommons.org/licenses/by/2.0/
### Acknowledgments and Authors

#### Acknowledgments
William Kyle Hamilton would like to thank the [Health Communications and Interventions Lab at UC Merced](http://cameronhcilab.com/) for their comments and beta testing efforts on this application as well as [Kathleen Coburn](http://psychology.ucmerced.edu/content/kathleen-coburn) for her feedback and evaluation of the statistical methods related to this project.
W. Kyle Hamilton would like to thank the [Health Communications and Interventions Lab at UC Merced](http://cameronhcilab.com/) for their comments and beta testing efforts on this application as well as [Kathleen Coburn](http://psychology.ucmerced.edu/content/kathleen-coburn) for her feedback and evaluation of the statistical methods related to this project.

Atsushi Mizumoto would like to thank [Dr. Luke Plonsky](http://oak.ucc.nau.edu/ldp3/) and [Dr. Yo In'nami](https://sites.google.com/site/yoinnami/) for their support and feedback to create this web application.


#### Authors


![alt text](http://kylehamilton.com/wp-content/uploads/2014/11/kyle80.jpg "Logo Title Text 1") [William Kyle Hamilton - University of California, Merced](http://www.kylehamilton.com)
![alt text](http://kylehamilton.com/wp-content/uploads/2014/11/kyle80.jpg "Logo Title Text 1") [W. Kyle Hamilton - University of California, Merced](http://www.kylehamilton.com)

William Kyle Hamilton maintains this application and has authored new features.
W. Kyle Hamilton maintains this application and has authored new features.

![alt text](http://oi59.tinypic.com/2mnrcci.jpg "Logo Title Text 1") [Burak Aydin, PhD - Recep Tayyip Erdoğan University](http://akademisyen.erdogan.edu.tr/akademisyen.php?uyeid=827a0e170c32e5ce6e7b31ebda784148)

Expand Down
8 changes: 4 additions & 4 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ citHeader("To cite package 'MAVIS' in publications use: ")

citEntry(entry="Manual",
title = "MAVIS: Meta Analysis via Shiny",
author = "William Kyle Hamilton and Atsushi Mizumoto",
year = 2015,
author = "W. Kyle Hamilton, Burak Aydin, Atsushi Mizumoto",
year = 2016,
note = vers,
textVersion =
paste("William Kyle Hamilton and Atsushi Mizumoto (",
2015,
paste("W. Kyle Hamilton, Burak Aydin, and Atsushi Mizumoto (",
2016,
"). MAVIS: Meta Analysis via Shiny. ",
vers, ".", sep=""),
url = {"http://CRAN.R-project.org/package=MAVIS"})
14 changes: 7 additions & 7 deletions inst/shiny/ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ library("compute.es")
library("SCMA")
library("SCRT")
library("weightr")
shinyUI(navbarPage(title=div(img(src="http://kylehamilton.com/wp-content/uploads/2015/04/mavis1a-e1430059956805.png")), windowTitle="MAVIS v1.1.1",
shinyUI(navbarPage(title=div(img(src="http://kylehamilton.com/wp-content/uploads/2015/04/mavis1a-e1430059956805.png")), windowTitle="MAVIS v1.1.2",
#shinyUI(navbarPage("MAVIS: Meta Analysis Via Shiny v1.0.4", windowTitle="MAVIS v1.0.4",
# If I want to add a theme here is how to do it
# shinyUI(navbarPage(theme = shinytheme("flatly"),"MAVIS: Meta Analysis Via Shiny v1.0.3",
Expand Down Expand Up @@ -874,8 +874,8 @@ p("MAVIS was designed from the beginning to help users run a meta-analysis as ef
MAVIS a positive user experience with an easy to use interface along with the power of R to provide
the best possible user experience."),
br(),
strong("MAVIS Version 1.1.1"),
p("Last Updated July 20th 2015"),
strong("MAVIS Version 1.1.2"),
p("Last Updated June 21th 2016"),
p("Number of monthly downloads from CRAN"),
img(src = "http://cranlogs.r-pkg.org/badges/MAVIS", seamless=NA),

Expand All @@ -887,7 +887,7 @@ br()

strong('Acknowledgments'),

p('William Kyle Hamilton would like to thank the ',
p('W. Kyle Hamilton would like to thank the ',
a("Health Communications and Interventions Lab at the University of California, Merced", href="http://cameronhcilab.com/", target="_blank"),
'for their comments and beta testing efforts on this application ', 'as well as',
a("Kathleen Coburn", href="http://psychology.ucmerced.edu/content/kathleen-coburn", target="_blank"),
Expand All @@ -903,8 +903,8 @@ br(),
strong('Authors'),

HTML('<div style="clear: left;"><img src="http://kylehamilton.com/wp-content/uploads/2014/11/kyle80.jpg" alt="" style="float: left; margin-right:5px" /></div>'),
p(a("William Kyle Hamilton - University of California, Merced", href="http://www.kylehamilton.com", target="_blank")),
p("William Kyle Hamilton maintains this application and has authored new features."),
p(a("W. Kyle Hamilton - University of California, Merced", href="http://www.kylehamilton.com", target="_blank")),
p("W. Kyle Hamilton maintains this application and has authored new features."),
br(),
HTML('<div style="clear: left;"><img src="http://oi59.tinypic.com/2mnrcci.jpg" alt="" style="float: left; margin-right:5px" /></div>'),
p(a("Burak Aydin, PhD - RTE University", href="http://www.aydinburak.net/", target="_blank"),br(),
Expand Down Expand Up @@ -954,7 +954,7 @@ br()
strong('License'),

p("MAVIS: Meta Analysis via Shiny"),
p(" Copyright 2015 William Kyle Hamilton and Atsushi Mizumoto"),
p(" Copyright 2016 W. Kyle Hamilton, Burak Aydin, and Atsushi Mizumoto"),

p(" This program is free software you can redistribute it and or modify
it under the terms of the GNU General Public License as published by
Expand Down

0 comments on commit 42fbe43

Please sign in to comment.