Skip to content

Commit

Permalink
Fix overflow error on Solaris
Browse files Browse the repository at this point in the history
  • Loading branch information
koenderks committed Sep 26, 2021
1 parent adb571b commit 5a7ddcd
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 9 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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: 0.1.2
Date: 2021-09-25
Version: 0.1.3
Date: 2021-09-26
Authors@R:
person(given = "Koen",
family = "Derks",
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# aRtsy 0.1.3

**Minor changes**

- Fixed the `call of overloaded ‘ceil(int)’ is ambiguous` error on Solaris indicated by CRAN.

# aRtsy 0.1.2

**New features**
Expand Down
7 changes: 3 additions & 4 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
## This is a submission for version 0.1.2
This is a submission for aRtsy version 0.1.2. In this version I have:
## This is a submission for version 0.1.3
This is a submission for aRtsy version 0.1.3. In this version I have:

* Added two several new functions.
* Added `checkUserInterrupt()` in `c++` functions.
* Fixed the `call of overloaded ‘ceil(int)’ is ambiguous` error on Solaris to retain package on CRAN.

## Test environments
* Windows install, (on github actions) R release
Expand Down
4 changes: 2 additions & 2 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ bibentry(bibtype = "Manual",
title = "aRtsy: Generative Art with 'ggplot2'.",
author = person("Koen", "Derks"),
year = "2021",
note = "R package version 0.1.2",
note = "R package version 0.1.3",
url = "https://CRAN.R-project.org/package=aRtsy",
textVersion = "Derks, K. (2021). aRtsy: Generative Art with 'ggplot2'. R package version 0.1.2.")
textVersion = "Derks, K. (2021). aRtsy: Generative Art with 'ggplot2'. R package version 0.1.3.")
Binary file added man/manual/aRtsy_0.1.3.pdf
Binary file not shown.
Binary file modified png/flows/2021-09-24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/canvas_ant.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ arma::mat draw_ant(arma::mat X,
int c = 0; // The current color starts at the first in the colors
int t0 = 0; // 0 = R; 1 = L
int t1 = 0; // 0 = L; 1 = R
int s = ceil(iters / ncolors); // When to switch colors in the ant
int s = iters / ncolors; // When to switch colors in the ant
while (i < iters) {
Rcpp::checkUserInterrupt();
if (i%s == 0) { // Switch color every s iterations
Expand Down

0 comments on commit 5a7ddcd

Please sign in to comment.