Skip to content

Commit

Permalink
fix latest CRAN comments
Browse files Browse the repository at this point in the history
  • Loading branch information
markheckmann committed Feb 18, 2024
1 parent 2b2183c commit f4e14af
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 12 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Description: Analyze repertory grids, a qualitative-quantitative
2004, ISBN: 978-0-470-09080-0). The package is part of the The package is part of the
<https://openrepgrid.org/> project.
Version: 0.1.15
Date: 2023-12-26
Date: 2024-02-18
Encoding: UTF-8
URL: https://github.com/markheckmann/OpenRepGrid, http://markheckmann.github.io/OpenRepGrid/
Imports:
Expand Down Expand Up @@ -70,7 +70,7 @@ Collate:
'utils-import.r'
'utils.r'
'zzz.r'
RoxygenNote: 7.2.3
RoxygenNote: 7.3.0
NeedsCompilation: no
Suggests:
testthat (>= 2.1.0),
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
S3method("[",openrepgridSettings)
S3method(dim,gridlist)
S3method(dim,repgrid)
S3method(drawDetails,gmSplitTextGrob)
S3method(plot,indexDilemma)
S3method(print,alignByLoadings)
S3method(print,constructCor)
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OpenRepGrid (development version)
# OpenRepGrid (0.1.15)

* rename `ward` method to `ward.D` in `cluster` (fix #36)
* `indexDDI` and `indexUncertainty`, two dispersion indexes for dependency (e.g., situation-resource) grids added. Jon Raskin kindly helped with the documentation.
Expand Down
1 change: 1 addition & 0 deletions OpenRepGrid.Rproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ StripTrailingWhitespace: Yes
BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
PackageRoxygenize: rd,collate,namespace

QuitChildProcessesOnExit: Yes
2 changes: 2 additions & 0 deletions R/gmMain.r
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@ gmSplitTextGrob <- function(text, x = unit(0.5, "npc"), y = unit(0.5, "npc"), ju


# variation to explore
#' @export
#' @keywords internal
drawDetails.gmSplitTextGrob <- function(x, recording) # drawdetails method is called when resizing window
{
# str(x);
Expand Down
3 changes: 1 addition & 2 deletions R/openrepgrid.r
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,5 @@
#'
#' @name OpenRepGrid-overview
#' @keywords package
#' @docType package
#'
NULL
"_PACKAGE"
2 changes: 1 addition & 1 deletion R/repgrid-basicops.r
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ makeRepgrid <- function(args) {
l <- c(list(x = x), args) # make a new repgrid object
x <- do.call(e.setElements, l)
l <- c(list(x = x), args) # make a new repgrid object
x <- do.call(c.setConstructs, l)
x <- do.call(c_setConstructs, l)
x <- initRatingArray(x) # initialize rating array
l <- c(list(x = x), args) # make a new repgrid object
x[, ] <- matrix(args$scores, ncol = getNoOfElements(x), byrow = T) # to fill matrix rowwise
Expand Down
10 changes: 5 additions & 5 deletions R/repgrid-constructs.r
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@ c_makeNewConstruct <- function(x = NULL, l.name = NA, l.preferred = NA, l.emerge



# internal: c.setConstructs sets constructs by index
c.setConstructs <- function(x, l.name = NA, l.preferred = NA, l.emerged = NA,
# internal: c_setConstructs sets constructs by index
c_setConstructs <- function(x, l.name = NA, l.preferred = NA, l.emerged = NA,
r.name = NA, r.preferred = NA, r.emerged = NA,
index = NULL, ...) {
if (!inherits(x, "repgrid")) { # check if x is repgrid object
Expand All @@ -355,8 +355,8 @@ c.setConstructs <- function(x, l.name = NA, l.preferred = NA, l.emerged = NA,
x
}
# x <- makeEmptyRepgrid()
# x <- c.setConstructs(x, l.name=c("construct left 1", "construct left 2"))
# x <- c.setConstructs(x, l.n=c("construct left 3", "construct left 4"), index=3:4)
# x <- c_setConstructs(x, l.name=c("construct left 1", "construct left 2"))
# x <- c_setConstructs(x, l.n=c("construct left 3", "construct left 4"), index=3:4)
# str(x@constructs, m=3)


Expand Down Expand Up @@ -424,7 +424,7 @@ c_addConstructs <- function(x, l.name = NA, l.preferred = NA, l.emerged = NA,
}
### NOT RUN
# x <- makeEmptyRepgrid()
# x <- c.setConstructs(x, l.name=c("construct left 1", "construct left 2"))
# x <- c_setConstructs(x, l.name=c("construct left 1", "construct left 2"))
# x <- c_addConstructs(x, l.name="construct added at the end")
# x <- c_addConstructs(x, l.name="construct left inserted at position 1", pos=1)
# x <- c_addConstructs(x, l.name="construct right inserted at position 1", pos=1)
Expand Down
8 changes: 8 additions & 0 deletions man/OpenRepGrid-overview.Rd

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

3 changes: 2 additions & 1 deletion man/OpenRepGrid.Rd

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

0 comments on commit f4e14af

Please sign in to comment.