Prepare CRAN release for 0.2.5

R-Lum · Dec 11, 2019 · 80620be · 80620be
1 parent 5695574
commit 80620be
Show file tree

Hide file tree

Showing 17 changed files with 663 additions and 631 deletions.
diff --git 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] (<https://orcid.org/0000-0002-0805-9547>),
     Sebastian Kreutzer [aut, ths] (<https://orcid.org/0000-0002-0734-2199>),
     Christoph Schmidt [aut, ths] (<https://orcid.org/0000-0002-2309-3209>)
@@ -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
@@ -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
@@ -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-Ex.timings.0.2.5.9000-6.WARNING → ...esults/RLumModel-Ex.timings.0.2.5.WARNING b/...RLumModel-Ex.timings.0.2.5.9000-6.WARNING → ...esults/RLumModel-Ex.timings.0.2.5.WARNING
diff --git a/...RLumModel-TimingExamples.0.2.5.9000-6.pdf → ...esults/RLumModel-TimingExamples.0.2.5.pdf b/...RLumModel-TimingExamples.0.2.5.9000-6.pdf → ...esults/RLumModel-TimingExamples.0.2.5.pdf
diff --git a/...ults/RLumModel_0.2.5.9000-6-Functions.csv → ...uildResults/RLumModel_0.2.5-Functions.csv b/...ults/RLumModel_0.2.5.9000-6-Functions.csv → ...uildResults/RLumModel_0.2.5-Functions.csv
@@ -2,8 +2,8 @@
 "ExampleData.ModelOutput","Example data (TL curve) simulated with parameter set from Pagonis 2007","Example data (TL curve) simulated with parameter set from Pagonis 2007","0.1.1
 ",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany)<br />",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),<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br />","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),<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br />","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),<br />","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),<br />","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/...lts/RLumModel_0.2.5.9000-6-Functions.html → ...ildResults/RLumModel_0.2.5-Functions.html b/...lts/RLumModel_0.2.5.9000-6-Functions.html → ...ildResults/RLumModel_0.2.5-Functions.html
@@ -1,6 +1,6 @@
 
 <p class='character'><h2 align="center">Major functions in the R package 'Luminescence'</h2>
-           <h4 align="center"> [version: 0.2.5.9000-6 ]</h4>
+           <h4 align="center"> [version: 0.2.5 ]</h4>
            <style type="text/css">
            <!--
 
@@ -92,7 +92,7 @@ <h4 align="center"> [version: 0.2.5.9000-6 ]</h4>
 </td>
 <td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br />
 </td>
-<td class=cellinside>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
+<td class=cellinside>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
 
 </td></tr>
 
@@ -114,7 +114,7 @@ <h4 align="center"> [version: 0.2.5.9000-6 ]</h4>
 </td>
 <td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br />
 </td>
-<td class=cellinside>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
+<td class=cellinside>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
 
 </td></tr>
 
@@ -124,7 +124,7 @@ <h4 align="center"> [version: 0.2.5.9000-6 ]</h4>
  <br>
 
 <p class='character'><h2 align="center">Major functions in the R package 'Luminescence'</h2>
-           <h4 align="center"> [version: 0.2.5.9000-6 ]</h4>
+           <h4 align="center"> [version: 0.2.5 ]</h4>
            <style type="text/css">
            <!--
 
@@ -216,7 +216,7 @@ <h4 align="center"> [version: 0.2.5.9000-6 ]</h4>
 </td>
 <td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br />
 </td>
-<td class=cellinside>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
+<td class=cellinside>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
 
 </td></tr>
 
@@ -238,7 +238,7 @@ <h4 align="center"> [version: 0.2.5.9000-6 ]</h4>
 </td>
 <td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br />
 </td>
-<td class=cellinside>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
+<td class=cellinside>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
 
 </td></tr>
 

diff --git a/...ults/RLumModel_0.2.5.9000-6-Functions.tex → ...uildResults/RLumModel_0.2.5-Functions.tex b/...ults/RLumModel_0.2.5.9000-6-Functions.tex → ...uildResults/RLumModel_0.2.5-Functions.tex
@@ -7,10 +7,10 @@
 1 & ExampleData.ModelOutput & Example data (TL curve) simulated with parameter set from Pagonis 2007 & Example data (TL curve) simulated with parameter set from Pagonis 2007 & 0.1.1
  &  &  & Johannes Friedrich, University of Bayreuth (Germany)$<$br /$>$ &  \\ 
   2 & 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
- &  &  & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)$<$br /$>$ & 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
+ &  &  & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)$<$br /$>$ & 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
  \\ 
   3 & 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
- &  &  & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ & 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
+ &  &  & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ & 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
  \\ 
    \hline
 \end{tabular}