Skip to content

Commit

Permalink
Collate field popoulation
Browse files Browse the repository at this point in the history
  • Loading branch information
RLumSK committed May 30, 2024
1 parent 5512fbf commit dce2b1f
Show file tree
Hide file tree
Showing 145 changed files with 942 additions and 934 deletions.
4 changes: 2 additions & 2 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"resource_type": "software"
}
],
"version": "0.9.24.9000-106",
"version": "0.9.24.9000-107",
"upload_type": "software",
"keywords": ["Luminescence", "Luminescence dating", "Chronology", "Age models"],
"publication_date": "2024-05-06",
"publication_date": "2024-05-30",
"creators": [
{
"orcid": "0000-0002-0734-2199",
Expand Down
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: Luminescence
Type: Package
Title: Comprehensive Luminescence Dating Data Analysis
Version: 0.9.24.9000-106
Date: 2024-05-06
Version: 0.9.24.9000-107
Date: 2024-05-30
Author: Sebastian Kreutzer [aut, trl, cre, dtc] (<https://orcid.org/0000-0002-0734-2199>),
Christoph Burow [aut, trl, dtc] (<https://orcid.org/0000-0002-5023-4046>),
Michael Dietze [aut] (<https://orcid.org/0000-0001-6063-1726>),
Expand Down Expand Up @@ -189,6 +189,7 @@ Collate:
'install_DevelopmentVersion.R'
'internal_as.latex.table.R'
'internals_RLum.R'
'internals_Thermochronometry.R'
'merge_RLum.Analysis.R'
'merge_RLum.Data.Curve.R'
'merge_RLum.R'
Expand Down
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ @Manual{
title = {Luminescence: Comprehensive Luminescence Dating Data Analysis},
author = {Sebastian Kreutzer and Christoph Burow and Michael Dietze and Margret C. Fuchs and Christoph Schmidt and Manfred Fischer and Johannes Friedrich and Norbert Mercier and Anne Philippe and Svenja Riedesel and Martin Autzen and Dirk Mittelstrass and Harrison J. Gray and Jean-Michel Galharret},
year = {2024},
note = {R package version 0.9.24.9000-106},
note = {R package version 0.9.24.9000-107},
url = {https://CRAN.R-project.org/package=Luminescence},
}

Expand Down

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
39 changes: 24 additions & 15 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@

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

# Changes in version 0.9.24.9000-106 (2024-05-06)
# Changes in version 0.9.24.9000-107 (2024-05-30)

**This package version requires R \>= 4.3**

## New functions

- `trim_RLum.Data()`: This new function enables to trim off the number
- `trim_RLum.Data()`: This new function enables trimming off the number
of channels of all supported `RLum.Data-class` on the time domain. For
instance, an OSL curve (`RLum.Data.Curve-class`) has 1000 channels,
instance, an OSL curve (`RLum.Data.Curve-class`) has 1000 channels;
one may want to extract only channels 10 to 100. Moreover, sometimes,
`RLum.Data-class` objects have a different number of channels but are
otherwise measured with the same time resolution. Until now, it was
otherwise measured with the exact time resolution. Until now, it was
possible to merge those curves, but the subsequent analysis usually
failed because most of the analysis functions check whether the number
of channels matches.
Expand All @@ -26,6 +26,15 @@
that can import a file is chosen. This function simplifies writing of
scripts for different data formats.

## The Thermochronometry functions (internal)

- Add internal function to import thermochronometry XLSX sheets into R;
an R implementation of `STAGE1, ExcelToStructure`
- `import_Data()`: A convenience wrapper around all functions commencing
with `read_`. The functions steps through all functions and the one
that can import a file is chosen. This function simplifies writing of
scripts for different data formats.

## Bugfixes and changes

### `analyse_IRSARRF()`
Expand Down Expand Up @@ -180,19 +189,19 @@
moment because they do not really belong to measurement data. This may
change future.

### Internals
## Internals

- Add internal download helper `.download_file()` for a more consistent
approach to detect URL schemes and download file across the package
approach to detect URL schemes and download files across the package
- Cover tricky edge case for the internal function
`.expand_parameters()`. The function is used to recycle and expand
function parameters if the input is a list object. It apparently
showed odd behaviour if a function was used in a loop with objects if
its own, e.g., `f(x = i + 1)` then the function would recycle `i + 1`
and then evaluate `i + 1` in the function environment. Usually this
should throw an error but in particular `i` is an object name commonly
used in loops, so the function went upwards in the environments until
if found the first `i`. However, this is not the `i` inserted by the
use. The results was that the loop did not seem to work for no
apparent reason. Now `.expand_parameters()` evaluates input in the
parent environment before passing it down.
showed odd behaviour if a function was used in a loop with objects of
its own, e.g., `f(x = i + 1)`, then the function would recycle `i + 1`
and then evaluate `i + 1` in the function environment. Usually, this
should throw an error, but in particular, `i` is an object name
commonly used in loops, so the function went upwards in the
environments until it found the first `i`. However, this is not the
`i` inserted by the user. The result was that the loop did not seem to
work for no apparent reason. Now, `.expand_parameters()` evaluates
input in the parent environment before passing it down.
2 changes: 0 additions & 2 deletions R/internals_Thermochronometry.R
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,3 @@

return(records)
}

a <- .ExcelToStruct(file = "~/Downloads/OSLThermo-main/Data/CLBR.xlsx")
2 changes: 1 addition & 1 deletion man/Analyse_SAR.OSLdata.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/CW2pHMi.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/CW2pLM.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/CW2pLMi.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/CW2pPMi.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/GitHub-API.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/PSL2Risoe.BINfileData.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/RLum-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/RLum.Analysis-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/RLum.Data.Curve-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/RLum.Data.Image-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/RLum.Data.Spectrum-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/RLum.Results-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/Risoe.BINfileData-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dce2b1f

Please sign in to comment.