Skip to content

Commit

Permalink
Use list2
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasp85 committed Jan 22, 2024
1 parent 65d8db5 commit 269f1eb
Show file tree
Hide file tree
Showing 24 changed files with 66 additions and 66 deletions.
12 changes: 6 additions & 6 deletions R/arc.R
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ stat_arc <- function(mapping = NULL, data = NULL, geom = 'arc',
layer(
stat = StatArc, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}
#' @rdname ggforce-extensions
Expand All @@ -126,7 +126,7 @@ geom_arc <- function(mapping = NULL, data = NULL, stat = 'arc',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomArc,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(arrow = arrow, n = n, lineend = lineend, na.rm = na.rm, ...)
params = list2(arrow = arrow, n = n, lineend = lineend, na.rm = na.rm, ...)
)
}
#' @rdname ggforce-extensions
Expand All @@ -148,7 +148,7 @@ stat_arc2 <- function(mapping = NULL, data = NULL, geom = 'path_interpolate',
layer(
stat = StatArc2, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}
#' @rdname geom_arc
Expand All @@ -160,7 +160,7 @@ geom_arc2 <- function(mapping = NULL, data = NULL, stat = 'arc2',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(arrow = arrow, n = n, lineend = lineend, na.rm = na.rm, ...)
params = list2(arrow = arrow, n = n, lineend = lineend, na.rm = na.rm, ...)
)
}
#' @rdname ggforce-extensions
Expand Down Expand Up @@ -189,7 +189,7 @@ stat_arc0 <- function(mapping = NULL, data = NULL, geom = 'arc0',
layer(
stat = StatArc0, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, ...)
params = list2(na.rm = na.rm, ...)
)
}
#' @rdname ggforce-extensions
Expand Down Expand Up @@ -235,7 +235,7 @@ geom_arc0 <- function(mapping = NULL, data = NULL, stat = 'arc0',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomArc0,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, ncp = ncp, lineend = lineend, na.rm = na.rm,
...
)
Expand Down
6 changes: 3 additions & 3 deletions R/arc_bar.R
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ stat_arc_bar <- function(mapping = NULL, data = NULL, geom = 'arc_bar',
layer(
stat = StatArcBar, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}
#' @rdname ggforce-extensions
Expand Down Expand Up @@ -160,7 +160,7 @@ stat_pie <- function(mapping = NULL, data = NULL, geom = 'arc_bar',
layer(
stat = StatPie, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, sep = sep, ...)
params = list2(na.rm = na.rm, n = n, sep = sep, ...)
)
}
#' @rdname ggforce-extensions
Expand All @@ -180,7 +180,7 @@ geom_arc_bar <- function(mapping = NULL, data = NULL, stat = 'arc_bar',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomArcBar,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, expand = expand, radius = radius, ...)
params = list2(na.rm = na.rm, n = n, expand = expand, radius = radius, ...)
)
}

Expand Down
2 changes: 1 addition & 1 deletion R/autodensity.R
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ geom_autodensity <- function(mapping = NULL, data = NULL,
position = position,
show.legend = show.legend,
inherit.aes = inherit.aes,
params = list(
params = list2(
bw = bw,
adjust = adjust,
kernel = kernel,
Expand Down
2 changes: 1 addition & 1 deletion R/autohistogram.R
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ geom_autohistogram <- function(mapping = NULL, data = NULL,
position = position,
show.legend = show.legend,
inherit.aes = inherit.aes,
params = list(
params = list2(
bins = bins,
na.rm = na.rm,
...
Expand Down
2 changes: 1 addition & 1 deletion R/autopoint.R
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ geom_autopoint <- function(mapping = NULL, data = NULL,
position = position,
show.legend = show.legend,
inherit.aes = inherit.aes,
params = list(
params = list2(
na.rm = na.rm,
...
)
Expand Down
12 changes: 6 additions & 6 deletions R/bezier.R
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ stat_bezier <- function(mapping = NULL, data = NULL, geom = 'path',
layer(
stat = StatBezier, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}
#' @rdname geom_bezier
Expand All @@ -143,7 +143,7 @@ geom_bezier <- function(mapping = NULL, data = NULL, stat = 'bezier',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomPath,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
...
)
Expand Down Expand Up @@ -201,7 +201,7 @@ stat_bezier2 <- function(mapping = NULL, data = NULL, geom = 'path_interpolate',
layer(
stat = StatBezier2, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}
#' @rdname geom_bezier
Expand All @@ -213,7 +213,7 @@ geom_bezier2 <- function(mapping = NULL, data = NULL, stat = 'bezier2',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
...
)
Expand Down Expand Up @@ -280,7 +280,7 @@ stat_bezier0 <- function(mapping = NULL, data = NULL, geom = 'bezier0',
layer(
stat = StatBezier0, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, ...)
params = list2(na.rm = na.rm, ...)
)
}
#' @rdname geom_bezier
Expand All @@ -292,6 +292,6 @@ geom_bezier0 <- function(mapping = NULL, data = NULL, stat = 'bezier0',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomBezier0,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(arrow = arrow, lineend = lineend, na.rm = na.rm, ...)
params = list2(arrow = arrow, lineend = lineend, na.rm = na.rm, ...)
)
}
12 changes: 6 additions & 6 deletions R/bspline.R
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ stat_bspline <- function(mapping = NULL, data = NULL, geom = 'path',
layer(
stat = StatBspline, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, type = type, ...)
params = list2(na.rm = na.rm, n = n, type = type, ...)
)
}
#' @rdname geom_bspline
Expand All @@ -137,7 +137,7 @@ geom_bspline <- function(mapping = NULL, data = NULL, stat = 'bspline',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomPath,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
type = type, ...
)
Expand Down Expand Up @@ -190,7 +190,7 @@ stat_bspline2 <- function(mapping = NULL, data = NULL, geom = 'path_interpolate'
layer(
stat = StatBspline2, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, type = type, ...)
params = list2(na.rm = na.rm, n = n, type = type, ...)
)
}
#' @rdname geom_bspline
Expand All @@ -202,7 +202,7 @@ geom_bspline2 <- function(mapping = NULL, data = NULL, stat = 'bspline2',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
type = type, ...
)
Expand Down Expand Up @@ -242,7 +242,7 @@ stat_bspline0 <- function(mapping = NULL, data = NULL, geom = 'bspline0',
layer(
stat = StatIdentity, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, type = type, ...)
params = list2(na.rm = na.rm, type = type, ...)
)
}
#' @rdname geom_bspline
Expand All @@ -254,7 +254,7 @@ geom_bspline0 <- function(mapping = NULL, data = NULL, stat = 'identity',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomBspline0,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, lineend = lineend, na.rm = na.rm, type = type,
...
)
Expand Down
6 changes: 3 additions & 3 deletions R/bspline_closed.R
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ stat_bspline_closed <- function(mapping = NULL, data = NULL, geom = 'shape',
layer(
stat = StatBspline, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}
#' @rdname geom_bspline_closed
Expand All @@ -82,7 +82,7 @@ geom_bspline_closed <- function(mapping = NULL, data = NULL, stat = 'bspline',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomShape,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, type = 'closed', ...)
params = list2(na.rm = na.rm, n = n, type = 'closed', ...)
)
}
#' @rdname ggforce-extensions
Expand Down Expand Up @@ -118,6 +118,6 @@ geom_bspline_closed0 <- function(mapping = NULL, data = NULL, stat = 'identity',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomBsplineClosed0,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, ...)
params = list2(na.rm = na.rm, ...)
)
}
4 changes: 2 additions & 2 deletions R/circle.R
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ stat_circle <- function(mapping = NULL, data = NULL, geom = 'circle',
layer(
stat = StatCircle, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}
#' @rdname ggforce-extensions
Expand All @@ -107,6 +107,6 @@ geom_circle <- function(mapping = NULL, data = NULL, stat = 'circle',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomCircle,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(n = n, na.rm = na.rm, ...)
params = list2(n = n, na.rm = na.rm, ...)
)
}
12 changes: 6 additions & 6 deletions R/diagonal.R
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ stat_diagonal <- function(mapping = NULL, data = NULL, geom = 'path',
layer(
stat = StatDiagonal, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
params = list2(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
)
}
#' @rdname geom_diagonal
Expand All @@ -142,7 +142,7 @@ geom_diagonal <- function(mapping = NULL, data = NULL, stat = 'diagonal',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomPath,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
params = list2(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
)
}
#' @rdname ggforce-extensions
Expand Down Expand Up @@ -178,7 +178,7 @@ stat_diagonal2 <- function(mapping = NULL, data = NULL,
layer(
stat = StatDiagonal2, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
params = list2(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
)
}
#' @rdname geom_diagonal
Expand All @@ -190,7 +190,7 @@ geom_diagonal2 <- function(mapping = NULL, data = NULL, stat = 'diagonal2',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, lineend = lineend, na.rm = na.rm, orientation = orientation,
n = n, strength = strength, ...
)
Expand Down Expand Up @@ -236,7 +236,7 @@ stat_diagonal0 <- function(mapping = NULL, data = NULL, geom = 'bezier0',
layer(
stat = StatDiagonal0, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, orientation = orientation, strength = strength, ...)
params = list2(na.rm = na.rm, orientation = orientation, strength = strength, ...)
)
}
#' @rdname geom_diagonal
Expand All @@ -248,7 +248,7 @@ geom_diagonal0 <- function(mapping = NULL, data = NULL, stat = 'diagonal0',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomBezier0,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, lineend = lineend, na.rm = na.rm, orientation = orientation,
strength = strength, ...
)
Expand Down
4 changes: 2 additions & 2 deletions R/diagonal_wide.R
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ stat_diagonal_wide <- function(mapping = NULL, data = NULL, geom = 'shape',
layer(
stat = StatDiagonalWide, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, orientation = orientation, n = n,
params = list2(na.rm = na.rm, orientation = orientation, n = n,
strength = strength, ...)
)
}
Expand All @@ -109,7 +109,7 @@ geom_diagonal_wide <- function(mapping = NULL, data = NULL, stat = 'diagonal_wid
layer(
data = data, mapping = mapping, stat = stat, geom = GeomShape,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, orientation = orientation, n = n,
params = list2(na.rm = na.rm, orientation = orientation, n = n,
strength = strength, ...)
)
}
4 changes: 2 additions & 2 deletions R/ellipse.R
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ stat_ellip <- function(mapping = NULL, data = NULL, geom = 'circle',
layer(
stat = StatEllip, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}

Expand All @@ -106,6 +106,6 @@ geom_ellipse <- function(mapping = NULL, data = NULL, stat = 'ellip',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomCircle,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(n = n, na.rm = na.rm, ...)
params = list2(n = n, na.rm = na.rm, ...)
)
}
2 changes: 1 addition & 1 deletion R/errorbar.R
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ stat_err <- function(
layer(
stat = StatErr, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, ...)
params = list2(na.rm = na.rm, ...)
)
}
8 changes: 4 additions & 4 deletions R/link.R
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ stat_link <- function(mapping = NULL, data = NULL, geom = 'path',
layer(
stat = StatLink, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}
#' @rdname ggforce-extensions
Expand Down Expand Up @@ -150,7 +150,7 @@ stat_link2 <- function(mapping = NULL, data = NULL, geom = 'path_interpolate',
layer(
stat = StatLink2, data = data, mapping = mapping, geom = geom,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(na.rm = na.rm, n = n, ...)
params = list2(na.rm = na.rm, n = n, ...)
)
}
#' @rdname geom_link
Expand All @@ -162,7 +162,7 @@ geom_link <- function(mapping = NULL, data = NULL, stat = 'link',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomPath,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
...
)
Expand All @@ -177,7 +177,7 @@ geom_link2 <- function(mapping = NULL, data = NULL, stat = 'link2',
layer(
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
params = list(
params = list2(
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
...
)
Expand Down
2 changes: 1 addition & 1 deletion R/mark_circle.R
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ geom_mark_circle <- function(mapping = NULL, data = NULL, stat = 'identity',
position = position,
show.legend = show.legend,
inherit.aes = inherit.aes,
params = list(
params = list2(
na.rm = na.rm,
expand = expand,
radius = radius,
Expand Down
Loading

0 comments on commit 269f1eb

Please sign in to comment.