Skip to content

Commit 0ea71ea

Browse files
RLumSKRLumSK
committed
Merge branch 'dev_0.1.X'
# Conflicts: # NEWS.Rmd # NEWS.html # NEWS.md # README.html # RLumCarlo.BuildResults/RLumCarlo-TimingExamples.0.1.9.pdf # RLumCarlo.BuildResults/RLumCarlo_0.1.8.tar.gz # RLumCarlo.BuildResults/RLumCarlo_0.1.9.pdf # codemeta.json # man/figures/README-unnamed-chunk-2-1.png # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo.pdf # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_cache/latex/Fig 2_7762aee182b2a1d420b9313af5644cc5.rdb # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_cache/latex/Fig 2_7762aee182b2a1d420b9313af5644cc5.rdx # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_files/figure-latex/Fig 1-1.pdf # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_files/figure-latex/Fig 1b-1.pdf # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_files/figure-latex/Fig 2-1.pdf # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_files/figure-latex/Fig 3-1.pdf # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_files/figure-latex/Fig 4-1.pdf # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_files/figure-latex/Fig 6,Plot average signal-1.pdf # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_files/figure-latex/unnamed-chunk-6-1.pdf # vignettes/RLumCarlo_-_Getting_started_with_RLumCarlo_files/figure-latex/unnamed-chunk-7-1.pdf
2 parents 6cc0281 + 199ea43 commit 0ea71ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+220
-367
lines changed

‎.zenodo.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
}
1010
],
1111
"upload_type": "software",
12-
"version": "0.1.8",
12+
"version": "0.1.9",
1313
"keywords": ["Modelling", "Monte-Carlo Simulations", "Luminescence"],
14-
"publication_date": "2022-02-20",
14+
"publication_date": "2022-08-08",
1515
"creators": [
1616
{
1717
"orcid": "0000-0002-0805-9547",

‎DESCRIPTION

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: RLumCarlo
22
Type: Package
33
Title: Monte-Carlo Methods for Simulating Luminescence Phenomena
4-
Version: 0.1.8
5-
Date: 2022-02-20
4+
Version: 0.1.9
5+
Date: 2022-08-08
66
Author: Johannes Friedrich [aut, trl] (<https://orcid.org/0000-0002-0805-9547>),
77
Sebastian Kreutzer [aut, trl, cre] (<https://orcid.org/0000-0002-0734-2199>),
88
Vasilis Pagonis [aut] (<https://orcid.org/0000-0002-4852-9312>),
@@ -13,14 +13,14 @@ Author: Johannes Friedrich [aut, trl] (<https://orcid.org/0000-0002-0805-9547>),
1313
Authors@R: c(
1414
person("Johannes", "Friedrich", role = c("aut","trl"), comment = c(ORCID = "0000-0002-0805-9547")),
1515
person("Sebastian", "Kreutzer", role = c("aut","trl","cre"), comment = c(ORCID = "0000-0002-0734-2199"),
16-
email = "sebastian.kreutzer@aber.ac.uk"),
16+
email = "sebastian.kreutzer@uni-heidelberg.de"),
1717
person("Vasilis", "Pagonis", role = c("aut"), comment = c(ORCID = "0000-0002-4852-9312")),
1818
person("Christoph", "Schmidt", role = c("aut"), comment = c(ORCID = "0000-0002-2309-3209")),
1919
person("Christian", "Laag", role = c("ctb"), comment = c(ORCID = "0000-0002-6012-1029")),
2020
person("Ena", "Rajovic", role = c("ctb")),
2121
person("Alex Roy", "Duncan", role = c("ctb"))
2222
)
23-
Maintainer: Sebastian Kreutzer <sebastian.kreutzer@aber.ac.uk>
23+
Maintainer: Sebastian Kreutzer <sebastian.kreutzer@uni-heidelberg.de>
2424
Description: A collection of functions to simulate luminescence production in
2525
dosimetric materials using Monte Carlo methods. Implemented are models for
2626
delocalised transitions (e.g., Chen and McKeever (1997) <doi:10.1142/2781>),
@@ -32,32 +32,32 @@ Description: A collection of functions to simulate luminescence production in
3232
linearly-modulated optically stimulated luminescence (LM-OSL),
3333
linearly-modulated infrared stimulated luminescence (LM-IRSL),
3434
and isothermal luminescence (ITL or ISO-TL).
35-
Contact: Package Developer Team <sebastian.kreutzer@aber.ac.uk>
35+
Contact: Package Developer Team <sebastian.kreutzer@uni-heidelberg.de>
3636
License: GPL-3
3737
BugReports: https://github.com/R-Lum/RLumCarlo/issues
3838
Depends:
39-
R (>= 4.0),
39+
R (>= 4.1),
4040
utils,
4141
magrittr
4242
URL: https://CRAN.R-project.org/package=RLumCarlo
4343
LinkingTo:
44-
Rcpp (>= 1.0.5),
45-
RcppArmadillo (>= 0.10.1.2.0)
44+
Rcpp (>= 1.0.9),
45+
RcppArmadillo (>= 0.11.2.0.0)
4646
Imports:
4747
abind (>= 1.4-5),
48-
doParallel (>= 1.0.15),
49-
foreach (>= 1.5.0),
50-
khroma (>= 1.3.0),
48+
doParallel (>= 1.0.17),
49+
foreach (>= 1.5.2),
50+
khroma (>= 1.9.0),
5151
methods,
5252
parallel,
53-
Rcpp (>= 1.0.5),
53+
Rcpp (>= 1.0.9),
5454
scatterplot3d (>= 0.3),
5555
stats
5656
Suggests:
57-
spelling (>= 2.1),
58-
R.rsp (>= 0.43.2),
59-
testthat (>= 3.0.0)
57+
spelling (>= 2.2),
58+
R.rsp (>= 0.45.0),
59+
testthat (>= 3.1.4)
6060
Encoding: UTF-8
6161
Language: en-GB
6262
VignetteBuilder: R.rsp
63-
RoxygenNote: 7.1.2
63+
RoxygenNote: 7.2.1

‎NEWS.Rmd

+2-48
Original file line numberDiff line numberDiff line change
@@ -8,52 +8,6 @@ header-includes:
88

99
# RLumCarlo `r RLumBuild::.get_pkg_version()` (`r Sys.Date()`)
1010

11-
*This package version needs at least R >= 4.0.*
12-
13-
* Add reference to manuscript where `RLumCarlo` is described
14-
* Fixes an internal CRAN issues related to the logo.
15-
16-
# RLumCarlo 0.1.7 (2020-12-10)
17-
18-
*This package version needs at least R >= 3.5.0.*
19-
20-
* Update internal tests to function properly with `testthat >= 3.0.0`
21-
* Correct several code-documentation mismatches (thanks to an anonymous
22-
R Journal reviewer)
23-
24-
## RLumCarlo 0.1.6 (2020-07-05)
25-
26-
* The last update to prevent the failed checks for the Solaris platform
27-
on CRAN came with unwanted side effects. After the compiler complained about `pow(<int>,<int>)`,
28-
we used `<double>` for all objects. Unfortunately, this led to complete wrong
29-
simulation results we did not detect during the tests
30-
before the submission. This issue was solved.
31-
32-
* The package now has a central C++ header file defining functions and constants
33-
used in the other files. This change has no user-visible effect.
34-
35-
## RLumCarlo 0.1.5 (2020-06-12)
36-
37-
* Fix problem on CRAN Solaris
38-
39-
## RLumCarlo 0.1.4 (2020-06-12)
40-
41-
* Fix CRAN requests
42-
43-
## RLumCarlo 0.1.3 (2020-06-05) (never published on CRAN)
44-
45-
* CRAN request correction: Misspelled word in `DESCRIPTION` corrected
46-
47-
## RLumCarlo 0.1.2 (2020-06-03) (never published on CRAN)
48-
49-
* CRAN request corrections, the package URL in the `README.md` became a little bit more canonical
50-
using capital letters for `CRAN` and `R`.
51-
52-
## RLumCarlo 0.1.1 (2020-06-03) (never published on CRAN)
53-
54-
* CRAN request corrections
55-
56-
## RLumCarlo 0.1.0 (2020-05-27) (never published on CRAN)
57-
58-
* Initial version
11+
* Update maintainer's e-mail address
12+
* Fix some wrong calls in `if()` using `class()`
5913

‎NEWS.html

+4-56
Original file line numberDiff line numberDiff line change
@@ -602,63 +602,11 @@
602602

603603
<!-- NEWS.md was auto-generated by NEWS.Rmd. Please DO NOT edit by hand!-->
604604

605-
<h1 id="rlumcarlo-018-2022-02-20">RLumCarlo 0.1.8 (2022-02-20)</h1>
606-
<p><em>This package version needs at least R &gt;= 4.0.</em></p>
605+
<h1 id="rlumcarlo-019-2022-08-08">RLumCarlo 0.1.9 (2022-08-08)</h1>
607606
<ul>
608-
<li>Add reference to manuscript where <code>RLumCarlo</code> is
609-
described</li>
610-
<li>Fixes an internal CRAN issues related to the logo.</li>
611-
</ul>
612-
<h1 id="rlumcarlo-017-2020-12-10">RLumCarlo 0.1.7 (2020-12-10)</h1>
613-
<p><em>This package version needs at least R &gt;= 3.5.0.</em></p>
614-
<ul>
615-
<li>Update internal tests to function properly with
616-
<code>testthat &gt;= 3.0.0</code></li>
617-
<li>Correct several code-documentation mismatches (thanks to an
618-
anonymous R Journal reviewer)</li>
619-
</ul>
620-
<h2 id="rlumcarlo-016-2020-07-05">RLumCarlo 0.1.6 (2020-07-05)</h2>
621-
<ul>
622-
<li><p>The last update to prevent the failed checks for the Solaris
623-
platform on CRAN came with unwanted side effects. After the compiler
624-
complained about <code>pow(&lt;int&gt;,&lt;int&gt;)</code>, we used
625-
<code>&lt;double&gt;</code> for all objects. Unfortunately, this led to
626-
complete wrong simulation results we did not detect during the tests
627-
before the submission. This issue was solved.</p></li>
628-
<li><p>The package now has a central C++ header file defining functions
629-
and constants used in the other files. This change has no user-visible
630-
effect.</p></li>
631-
</ul>
632-
<h2 id="rlumcarlo-015-2020-06-12">RLumCarlo 0.1.5 (2020-06-12)</h2>
633-
<ul>
634-
<li>Fix problem on CRAN Solaris</li>
635-
</ul>
636-
<h2 id="rlumcarlo-014-2020-06-12">RLumCarlo 0.1.4 (2020-06-12)</h2>
637-
<ul>
638-
<li>Fix CRAN requests</li>
639-
</ul>
640-
<h2 id="rlumcarlo-013-2020-06-05-never-published-on-cran">RLumCarlo
641-
0.1.3 (2020-06-05) (never published on CRAN)</h2>
642-
<ul>
643-
<li>CRAN request correction: Misspelled word in <code>DESCRIPTION</code>
644-
corrected</li>
645-
</ul>
646-
<h2 id="rlumcarlo-012-2020-06-03-never-published-on-cran">RLumCarlo
647-
0.1.2 (2020-06-03) (never published on CRAN)</h2>
648-
<ul>
649-
<li>CRAN request corrections, the package URL in the
650-
<code>README.md</code> became a little bit more canonical using capital
651-
letters for <code>CRAN</code> and <code>R</code>.</li>
652-
</ul>
653-
<h2 id="rlumcarlo-011-2020-06-03-never-published-on-cran">RLumCarlo
654-
0.1.1 (2020-06-03) (never published on CRAN)</h2>
655-
<ul>
656-
<li>CRAN request corrections</li>
657-
</ul>
658-
<h2 id="rlumcarlo-010-2020-05-27-never-published-on-cran">RLumCarlo
659-
0.1.0 (2020-05-27) (never published on CRAN)</h2>
660-
<ul>
661-
<li>Initial version</li>
607+
<li>Update maintainer’s e-mail address</li>
608+
<li>Fix some wrong calls in <code>if()</code> using
609+
<code>class()</code></li>
662610
</ul>
663611

664612
</body>

‎NEWS.md

+3-52
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,7 @@
55

66
<!-- NEWS.md was auto-generated by NEWS.Rmd. Please DO NOT edit by hand!-->
77

8-
# RLumCarlo 0.1.8 (2022-02-20)
8+
# RLumCarlo 0.1.9 (2022-08-08)
99

10-
*This package version needs at least R \>= 4.0.*
11-
12-
- Add reference to manuscript where `RLumCarlo` is described
13-
- Fixes an internal CRAN issues related to the logo.
14-
15-
# RLumCarlo 0.1.7 (2020-12-10)
16-
17-
*This package version needs at least R \>= 3.5.0.*
18-
19-
- Update internal tests to function properly with `testthat >= 3.0.0`
20-
- Correct several code-documentation mismatches (thanks to an
21-
anonymous R Journal reviewer)
22-
23-
## RLumCarlo 0.1.6 (2020-07-05)
24-
25-
- The last update to prevent the failed checks for the Solaris
26-
platform on CRAN came with unwanted side effects. After the compiler
27-
complained about `pow(<int>,<int>)`, we used `<double>` for all
28-
objects. Unfortunately, this led to complete wrong simulation
29-
results we did not detect during the tests before the submission.
30-
This issue was solved.
31-
32-
- The package now has a central C++ header file defining functions and
33-
constants used in the other files. This change has no user-visible
34-
effect.
35-
36-
## RLumCarlo 0.1.5 (2020-06-12)
37-
38-
- Fix problem on CRAN Solaris
39-
40-
## RLumCarlo 0.1.4 (2020-06-12)
41-
42-
- Fix CRAN requests
43-
44-
## RLumCarlo 0.1.3 (2020-06-05) (never published on CRAN)
45-
46-
- CRAN request correction: Misspelled word in `DESCRIPTION` corrected
47-
48-
## RLumCarlo 0.1.2 (2020-06-03) (never published on CRAN)
49-
50-
- CRAN request corrections, the package URL in the `README.md` became
51-
a little bit more canonical using capital letters for `CRAN` and
52-
`R`.
53-
54-
## RLumCarlo 0.1.1 (2020-06-03) (never published on CRAN)
55-
56-
- CRAN request corrections
57-
58-
## RLumCarlo 0.1.0 (2020-05-27) (never published on CRAN)
59-
60-
- Initial version
10+
- Update maintainer’s e-mail address
11+
- Fix some wrong calls in `if()` using `class()`

‎R/RLumCarlo-package.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#' @docType package
3535
#'
3636
#' @author Johannes Friedrich, University of Bayreuth (Germany), \cr
37-
#' Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom) \cr
37+
#' Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany) \cr
3838
#' Vasilis Pagonis, McDaniel College Westminster (MD, USA), \cr
3939
#' Christoph Schmidt, University of Bayreuth (Germany), \cr
4040
#' Ena Rajovic, University of Bayreuth (Germany), \cr

‎R/create_ClusterSystem.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#'
4040
#'@section Function version: 0.1.0
4141
#'
42-
#'@author Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
42+
#'@author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
4343
#'
4444
#'@examples
4545
#'create_ClusterSystem(n = 10, plot = TRUE)

‎R/methods.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#'
55
#' @param ... input objects or further function arguments
66
#'
7-
#' @author Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom),
7+
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany),
88
#' Johannes Friedrich, University of Bayreuth (Germany),
99
#'
1010
#' @keywords internal
@@ -112,7 +112,7 @@ summary.RLumCarlo_Model_Output <- function(object, verbose = TRUE, ...){
112112
#' @export
113113
c.RLumCarlo_Model_Output <- function(...){
114114
## remove everything that does not belong into this list
115-
objects <- lapply(list(...), function(x) if(class(x) == "RLumCarlo_Model_Output") x)
115+
objects <- lapply(list(...), function(x) if(inherits(x, "RLumCarlo_Model_Output")) x)
116116
objects[sapply(objects, is.null)] <- NULL
117117

118118
## we can only merge results from the same stimulation mode

‎R/plot_RLumCarlo.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#'
3939
#' @section Function version: 0.1.0
4040
#'
41-
#' @author Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)\cr
41+
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)\cr
4242
#' Johannes Friedrich, University of Bayreuth (Germany)
4343
#'
4444
#' @examples

‎R/run_MC_CW_IRSL_LOC.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#'
4646
#' @section Function version: 0.1.0
4747
#'
48-
#' @author Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
48+
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
4949
#'
5050
#' @references
5151
#' Pagonis, V., Friedrich, J., Discher, M., Müller-Kirschbaum, A., Schlosser, V., Kreutzer, S.,

‎R/run_MC_CW_IRSL_TUN.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
#' @section Function version: 0.2.0
5656
#'
5757
#' @author Johannes Friedrich, University of Bayreuth (Germany),
58-
#' Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
58+
#' Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
5959
#'
6060
#' @references
6161
#' Huntley, D.J., 2006. An explanation of the power-law decay of luminescence.

‎R/run_MC_CW_OSL_DELOC.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#'
4848
#' @section Function version: 0.1.0
4949
#'
50-
#' @author Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
50+
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
5151
#'
5252
#' @references
5353
#' Pagonis, V., Friedrich, J., Discher, M., Müller-Kirschbaum, A., Schlosser, V., Kreutzer, S.,

‎R/run_MC_ISO_DELOC.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#'
5555
#' @section Function version: 0.1.0
5656
#'
57-
#' @author Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
57+
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
5858
#'
5959
#' @references
6060
#'

‎R/run_MC_ISO_LOC.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#'
5555
#' @section Function version: 0.1.0
5656
#'
57-
#' @author Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
57+
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
5858
#'
5959
#' @references
6060
#' Pagonis, V., Friedrich, J., Discher, M., Müller-Kirschbaum, A., Schlosser, V.,

‎R/run_MC_ISO_TUN.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#' @section Function version: 0.1.0
6464
#'
6565
#' @author Johannes Friedrich, University of Bayreuth (Germany),
66-
#' Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
66+
#' Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
6767
#'
6868
#' @references
6969
#' Pagonis, V. and Kulp, C., 2017. Monte Carlo simulations of tunneling phenomena

‎R/run_MC_LM_OSL_DELOC.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#'
4949
#' @section Function version: 0.1.0
5050
#'
51-
#' @author Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
51+
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
5252
#'
5353
#' @references
5454
#' Pagonis, V., Friedrich, J., Discher, M., Müller-Kirschbaum, A., Schlosser, V., Kreutzer, S.,

‎R/run_MC_LM_OSL_LOC.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#'
4949
#' @section Function version: 0.1.0
5050
#'
51-
#' @author Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
51+
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
5252
#'
5353
#' @references
5454
#' Pagonis, V., Friedrich, J., Discher, M., Müller-Kirschbaum, A., Schlosser, V.,

‎R/run_MC_LM_OSL_TUN.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#' @section Function version: 0.1.0
5555
#'
5656
#' @author Johannes Friedrich, University of Bayreuth (Germany),
57-
#' Sebastian Kreutzer, Geography & Earth Sciences, Aberystwyth University (United Kingdom)
57+
#' Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
5858
#'
5959
#' @references
6060
#' Huntley, D.J., 2006. An explanation of the power-law decay of luminescence.

0 commit comments

Comments
 (0)