Skip to content

Commit

Permalink
Changes in description and one example
Browse files Browse the repository at this point in the history
  • Loading branch information
ZauchnerP committed Oct 24, 2023
1 parent 6dd92c9 commit 316c970
Show file tree
Hide file tree
Showing 32 changed files with 83 additions and 56 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Package: gmoTree
Title: Get and Modify oTree Data
Version: 1.0.0
Date: 2023-10-20
Title: Get and Modify 'oTree' Data
Version: 1.0.1
Date: 2023-10-24
Authors@R:
person("Patricia F.", "Zauchner", , "[email protected]", role = c("aut", "trl", "cre", "cph"),
comment = c(ORCID = "https://orcid.org/0000-0002-5938-1683"))
Description: Manage data from oTree experiments. Import oTree data and
Description: Manage data from 'oTree' experiments. Import 'oTree' data and
clean them up by using functions to deal with messy data, dropouts, and
other problematic cases. Create IDs, calculate the time, transfer
variables between app data frames, and delete sensitive information.
You can also check your experimental data before running the
experiment. Information on oTree is found in Chen, D. L., Schonger, M.,
experiment. Information on 'oTree' is found in Chen, D. L., Schonger, M.,
& Wickens, C. (2016) <doi: 10.1016/j.jbef.2015.12.001>.
License: GPL (>= 3)
URL: https://zauchnerp.github.io/gmoTree/,
Expand Down
12 changes: 11 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@

# gmoTree 1.0.1

* Minor changes in examples and DESCRIPTION file.
* Changes in functions: NONE

# gmoTree 1.0.0

* Makes file names of the examples portable. Changes import_otree() code to import those files as well.
* Changes in functions:
** Minor change in import_otree(). Makes file names of the examples portable.
Changes import_otree() code to import those files as well.

# gmoTree 0.0.3

* Minor improvement of the documentation & website.
* Changes in functions: NONE

# gmoTree 0.0.2

* Minor improvement of the documentation & website. (Sent to CRAN and omitted here.)
* Changes in functions: NONE

# gmoTree 0.0.1

Expand Down
12 changes: 6 additions & 6 deletions R/make_ids.R
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
#'
#' # Make session IDs and group IDs
#' # Not working with this data set because group ID is not the same in all apps
#' # try({
#' # oTree2 <- make_ids(oTree, gmake = TRUE)
#' \dontrun{
#' oTree2 <- make_ids(oTree, gmake = TRUE)
#'
#' # Show new variables
#' # oTree2$all_apps_wide$session_id
#' # oTree2$all_apps_wide$group_id
#' # })
#' # Show new variables
#' oTree2$all_apps_wide$session_id
#' oTree2$all_apps_wide$group_id
#' }
#'
#' # Get IDs from variable "dictator.1.group.id_in_subsession"
#' # in the data frame "all_apps_wide"
Expand Down
10 changes: 10 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# Version 1.0.1 (Resubmission)

[x] make_ids() function accidentally left the # in the code although putting a try() around the functions.
Now the try() function is replaced by \dontrun{} and the # are removed.

[x] oTree in the title and description of the DESCRIPTION file is now in single quotations.

[] There should be examples in comments in oTree.Rd; however, there are no examples in this file.


# Version 1.0.0 (Resubmission)

[x] Portable file names warning is now circumvented.
Expand Down
2 changes: 1 addition & 1 deletion docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/articles/intro_to_gmoTree.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/impressum.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pkgdown: 2.0.7
pkgdown_sha: ~
articles:
intro_to_gmoTree: intro_to_gmoTree.html
last_built: 2023-10-20T13:49Z
last_built: 2023-10-24T16:42Z
urls:
reference: https://zauchnerp.github.io/gmoTree/reference
article: https://zauchnerp.github.io/gmoTree/articles
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/apptime.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/assignv.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/assignv_to_aaw.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/delete_cases.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/delete_dropouts.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/delete_duplicate.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/delete_plabels.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/delete_sessions.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/extime.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/import_otree.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions docs/reference/make_ids.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/messy_chat.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/messy_time.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/oTree.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/pagesec.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/show_constant.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/show_dropouts.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ bibentry(
title = "gmoTree: oTree Data Manipulation Tool",
author = "Patricia F. Zauchner",
year = "2023",
note = "R package version 1.0.0",
note = "R package version 1.0.1",
url = "https://github.com/ZauchnerP/gmoTree",
textVersion = "Zauchner, Patricia F. (2023). gmoTree: oTree Data Manipulation Tool. R package version 1.0.0, <https://github.com/ZauchnerP/gmoTree/>."
textVersion = "Zauchner, Patricia F. (2023). gmoTree: oTree Data Manipulation Tool. R package version 1.0.1, <https://github.com/ZauchnerP/gmoTree/>."
)
Loading

0 comments on commit 316c970

Please sign in to comment.