Improve flame function

koenderks · Nov 20, 2024 · d5daa57 · d5daa57
1 parent b1c6ade
commit d5daa57
Show file tree

Hide file tree

Showing 6 changed files with 468 additions and 363 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: aRtsy
 Title: Generative Art with 'ggplot2'
 Description: Provides algorithms for creating artworks in the 'ggplot2' language that incorporate some form of randomness.
-Version: 1.0.0
-Date: 2024-11-05
+Version: 1.0.1
+Date: 2024-11-20
 Authors@R: 
     person(given = "Koen",
            family = "Derks",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# aRtsy 1.0.1
+
+- Faster runtime of the `canvas_flame()` funtion.
+
 # aRtsy 1.0.0
 
 - Fixed a bug in the `canvas_flame()` code when `blend = FALSE` and `weighted = TRUE`.

diff --git a/R/canvas_flame.R b/R/canvas_flame.R
@@ -241,11 +241,11 @@ canvas_flame <- function(colors,
     stats::runif(4, 0, 1), # padj.a, pdj.b, pdj.c, pdj.d
     stats::runif(1, 0, 1), # rings2.val
     stats::runif(1, 10, 80), stats::runif(1, 1, 10), # perspective.angle, perspective.dist
-    stats::runif(1, 1, 5), stats::runif(1, 0.1, 1), # juliaN.power, juliaN.dist
-    stats::runif(1, 1, 5), stats::runif(1, 0.1, 1), # juliaScope.power, juliaScope.dist
+    stats::runif(1, -5, 5), stats::runif(1, 0.1, 1), # juliaN.power, juliaN.dist
+    stats::runif(1, -5, 5), stats::runif(1, 0.1, 1), # juliaScope.power, juliaScope.dist
     stats::runif(1, 0, 360), stats::runif(1, 0.5, 10), # radialBlur.angle, v_36
     sample(x = 3:8, size = 1), stats::runif(1, 1, 360), stats::runif(1, 0, 1), # pie.slices, pie.rotation, pie.thickness
-    stats::runif(1, 1, 2), sample(3:9, size = 1), sample(3:9, size = 1), stats::runif(1, 0, 1), # ngon.power, ngon.sides, ngon.corners, ngon.circle
+    stats::runif(1, 1, 5), sample(3:9, size = 1), sample(3:9, size = 1), stats::runif(1, 0, 1), # ngon.power, ngon.sides, ngon.corners, ngon.circle
     stats::runif(1, -1.5, -0.5), stats::runif(1, 0.5, 1.5), # curl.c1, curl.c2
     stats::runif(1, -1, 1), stats::runif(1, -1, 1), # rectangles.x, rectangles.y
     stats::runif(1, -1, 1), # v_41

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,8 +1,7 @@
-## aRtsy version 1.0.0
-This is a submission for aRtsy version 1.0.0. In this version I have:
+## aRtsy version 1.0.1
+This is a submission for aRtsy version 1.0.1. In this version I have:
 
-* Fixed a bug in the c++ code.
-* Improved documentation.
+* Improved performance of c++ code.
 
 ## Test environments
 * Windows install, (on github actions) R release

diff --git a/inst/CITATION b/inst/CITATION
@@ -4,7 +4,7 @@ bibentry(bibtype = "Manual",
          title = "aRtsy: Generative Art with 'ggplot2'",
          author = person("Koen", "Derks"),
          year = "2024",
-         note = "R package version 1.0.0",
+         note = "R package version 1.0.1",
          url = "https://CRAN.R-project.org/package=aRtsy",
          doi = "10.32614/CRAN.package.aRtsy",
-         textVersion = "Derks, K. (2024). aRtsy: Generative Art with 'ggplot2'. R package version 1.0.0. https://doi.org/10.32614/CRAN.package.aRtsy")
+         textVersion = "Derks, K. (2024). aRtsy: Generative Art with 'ggplot2'. R package version 1.0.1. https://doi.org/10.32614/CRAN.package.aRtsy")