From 80620be5de5adc09f8922704dddd9ec70a92e40c Mon Sep 17 00:00:00 2001 From: RLumSK Date: Wed, 11 Dec 2019 22:55:41 +0100 Subject: [PATCH] Prepare CRAN release for 0.2.5 --- DESCRIPTION | 6 +- NEWS.Rmd | 5 + NEWS.md | 8 +- ...ING => RLumModel-Ex.timings.0.2.5.WARNING} | 0 ...pdf => RLumModel-TimingExamples.0.2.5.pdf} | Bin 4553 -> 4551 bytes ...ions.csv => RLumModel_0.2.5-Functions.csv} | 4 +- ...ns.html => RLumModel_0.2.5-Functions.html} | 12 +- ...ions.tex => RLumModel_0.2.5-Functions.tex} | 4 +- ... => RLumModel_0.2.5-Functions_Markdown.md} | 10 +- ...y.bib => RLumModel_0.2.5-bibliography.bib} | 2 +- ...b => RLumModel_0.2.5-fun_bibliography.bib} | 4 +- ...l_0.2.5.9000-6.pdf => RLumModel_0.2.5.pdf} | Bin 125176 -> 125164 bytes man/model_LuminescenceSignals.Rd | 2 +- man/read_SEQ2R.Rd | 2 +- ...odel_-_Getting_started_with_RLumModel.html | 542 +++++++++--------- ...el_-_Simulating_luminescence_in_Al2O3.html | 373 ++++++------ .../RLumModel_-_Using_own_parameter_sets.html | 320 ++++++----- 17 files changed, 663 insertions(+), 631 deletions(-) rename RLumModel.BuildResults/{RLumModel-Ex.timings.0.2.5.9000-6.WARNING => RLumModel-Ex.timings.0.2.5.WARNING} (100%) rename RLumModel.BuildResults/{RLumModel-TimingExamples.0.2.5.9000-6.pdf => RLumModel-TimingExamples.0.2.5.pdf} (83%) rename RLumModel.BuildResults/{RLumModel_0.2.5.9000-6-Functions.csv => RLumModel_0.2.5-Functions.csv} (90%) rename RLumModel.BuildResults/{RLumModel_0.2.5.9000-6-Functions.html => RLumModel_0.2.5-Functions.html} (93%) rename RLumModel.BuildResults/{RLumModel_0.2.5.9000-6-Functions.tex => RLumModel_0.2.5-Functions.tex} (90%) rename RLumModel.BuildResults/{RLumModel_0.2.5.9000-6-Functions_Markdown.md => RLumModel_0.2.5-Functions_Markdown.md} (93%) rename RLumModel.BuildResults/{RLumModel_0.2.5.9000-6-bibliography.bib => RLumModel_0.2.5-bibliography.bib} (85%) rename RLumModel.BuildResults/{RLumModel_0.2.5.9000-6-fun_bibliography.bib => RLumModel_0.2.5-fun_bibliography.bib} (89%) rename RLumModel.BuildResults/{RLumModel_0.2.5.9000-6.pdf => RLumModel_0.2.5.pdf} (95%) diff --git a/DESCRIPTION b/DESCRIPTION index 135800e..485bbb8 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: RLumModel Type: Package Title: Solving Ordinary Differential Equations to Understand Luminescence -Version: 0.2.5.9000-6 -Date: 2019-11-24 +Version: 0.2.5 +Date: 2019-12-11 Author: Johannes Friedrich [aut, trl, cre] (), Sebastian Kreutzer [aut, ths] (), Christoph Schmidt [aut, ths] () @@ -51,7 +51,7 @@ Collate: simulate_RF_and_heating.R simulate_TL.R translate_sequence.R -RoxygenNote: 7.0.1 +RoxygenNote: 7.0.2 Encoding: UTF-8 LazyData: true VignetteBuilder: knitr diff --git a/NEWS.Rmd b/NEWS.Rmd index f03f362..018a404 100755 --- a/NEWS.Rmd +++ b/NEWS.Rmd @@ -10,6 +10,11 @@ header-includes: ## Changes in version `r RLumBuild::.get_pkg_version()` (`r Sys.Date()`) +* Changes in 'Luminescence' broke the vignette; now modified with a workaround +* Updated maintainer email address + +## Changes in version 0.2.4 (16nd August, 2018) + * Minor internal corrections ## Changes in version 0.2.3 (22nd November, 2017) diff --git a/NEWS.md b/NEWS.md index 1da2bff..442e689 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,7 +7,13 @@ # NEWS for the R Package RLumModel -## Changes in version 0.2.5.9000-6 (2019-11-24) +## Changes in version 0.2.5 (2019-12-11) + + - Changes in ‘Luminescence’ broke the vignette; now modified with a + workaround + - Updated maintainer email address + +## Changes in version 0.2.4 (16nd August, 2018) - Minor internal corrections diff --git a/RLumModel.BuildResults/RLumModel-Ex.timings.0.2.5.9000-6.WARNING b/RLumModel.BuildResults/RLumModel-Ex.timings.0.2.5.WARNING similarity index 100% rename from RLumModel.BuildResults/RLumModel-Ex.timings.0.2.5.9000-6.WARNING rename to RLumModel.BuildResults/RLumModel-Ex.timings.0.2.5.WARNING diff --git a/RLumModel.BuildResults/RLumModel-TimingExamples.0.2.5.9000-6.pdf b/RLumModel.BuildResults/RLumModel-TimingExamples.0.2.5.pdf similarity index 83% rename from RLumModel.BuildResults/RLumModel-TimingExamples.0.2.5.9000-6.pdf rename to RLumModel.BuildResults/RLumModel-TimingExamples.0.2.5.pdf index b463bc4c26de519c8330d5f836e4153eeb051f8c..55819ef918e45204054b87259ad1a41e407b47e3 100644 GIT binary patch delta 658 zcmX@9d|Y{gnW~YYp^=fPk%^Hem%eX)ic4Zis)B}#m63s=r6F8yV)Q*mgUMEms`dG| z90d0M4nHHvH}~C}b9Fzwrnop|Efw*$Rp8?^3=$|4;>oJ7J1)Of{E5Z|xjmmgf3B{( zH#4%yQXuD{ZRLd5*DEdEsP zQu{Nv!f9J$!`;tinF`uVL{4;UZ(GyQIn!yIZ{Fr(KZ=)biE>z zi{??QHUHs+@b+)Tr?X7AX-+&j{X}$L zu=+MW)9pKdPgvSA<<9X(n)km8wjcYu{@fR~nF|@FNx!$+(R@_$uG00E)sabuOum$` zv&Ut>)V%yzR;FUH4cqYs@j&!B~MRpbu*0W+wzWU?VJD^rQ97cr_U|!GM?P!CiTcINit}r z_~Vsz;e8wD3(Q^rg+JEEv8Ubbg@W<*%OT~5oIkN^x7b|UY{NW{*Vb6U00b2B6u7_) x0|QGVGjuUS0~1S3F$<%~;)2$i=IAme2F4~BVur?sldA>YIE=YeRbBnvxB&a>9AE$d delta 632 zcmX@Ed{TLWnW~|YiJ^g^iGjH$m%eX)ic4Zis)B}#m63s=r6F8yV)Q*mqsdl`s`dT1 z3v?mA$^a_4-WX6ClW#NgS(p5Bw`u2TPu zVx|8ro;FoXn&U?O`!=ynPNy1sDzY`SX3WqOx&6lZqSXJ`m1~`oqn7UT&D=BnZ|>AD ztM-&RE;ClQD}Qfb>6Y9W+gDWcX#boy{iZVWRtcE}-^`w2^FFb7&Gq)>&!tXjPG~*3 zzWr5dxY^};QIXH5T_^1O;oogKv%*5;LV0xfJGr=7p9J|*i(k}j&k0MOJ!!@s?>$dV z%adLQ6i@#xvT53cNxvg%^}jFgaDMnNJhiI%OaSBQ?sD5Z2Ol-Pn~;6jb=r(1+kKa8 zWh&M#U3RAP{lf#&PYr(v-#^@PUX;!DgRIPt%{!KVVXk*h?wOykzGU(Aq^}vfABQHp zTk5GQ|IHD8o00!#;Tn^LXN7g+*PC`-ELv1*p7FHp(S(e{U!%(8LTAkkxpZlQn2`5m zul*AKh3jIH?jmeuzPlpY5AA;QDkRuk*=)r;k5|)F!2kpl@)Wqh z3",NA "model_LuminescenceSignals","Model Luminescence Signals","This function models luminescence signals for quartz based on published physical models. It is possible to simulate TL, (CW-) OSL, RF measurements in a arbitrary sequence. This sequence is definded as a list of certain abrivations. Furthermore it is possible to load a sequence direct from the Riso Sequence Editor. The output is an RLum.Analysis object and so the plots are done by the plot_RLum.Analysis function. If a SAR sequence is simulated the plot output can be disabled and SAR analyse functions can be used.","0.1.5 -",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),
Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)
","Friedrich, J., Kreutzer, S., 2019. model_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2019. RLumModel: Solving Ordinary Differential Equations to Understand LuminescenceR package version 0.2.5.9000-6. https://CRAN.R-project.org/package=RLumModel +",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),
Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)
","Friedrich, J., Kreutzer, S., 2019. model_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2019. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.5. https://CRAN.R-project.org/package=RLumModel " "read_SEQ2R","Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence","A SEQ-file created by the Risoe Sequence Editor can be imported to simulate the sequence written in the sequence editor.","0.1.0 -",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),
","Friedrich, J., 2019. read_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2019. RLumModel: Solving Ordinary Differential Equations to Understand LuminescenceR package version 0.2.5.9000-6. https://CRAN.R-project.org/package=RLumModel +",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),
","Friedrich, J., 2019. read_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2019. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.5. https://CRAN.R-project.org/package=RLumModel " diff --git a/RLumModel.BuildResults/RLumModel_0.2.5.9000-6-Functions.html b/RLumModel.BuildResults/RLumModel_0.2.5-Functions.html similarity index 93% rename from RLumModel.BuildResults/RLumModel_0.2.5.9000-6-Functions.html rename to RLumModel.BuildResults/RLumModel_0.2.5-Functions.html index feca1ec..48c7f53 100644 --- a/RLumModel.BuildResults/RLumModel_0.2.5.9000-6-Functions.html +++ b/RLumModel.BuildResults/RLumModel_0.2.5-Functions.html @@ -1,6 +1,6 @@

Major functions in the R package 'Luminescence'

-

[version: 0.2.5.9000-6 ]

+

[version: 0.2.5 ]