diff --git a/.zenodo.json b/.zenodo.json index b92e364..3a34a25 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -33,10 +33,10 @@ "relation": "isReferencedBy" } ], - "version": "0.2.12.9000-1", + "version": "0.2.12.9000-17", "upload_type": "software", "keywords": ["data import", "power diffraction", "R"], - "publication_date": "2023-03-06", + "publication_date": "2023-09-20", "creators": [ { "orcid": "0000-0002-0734-2199", diff --git a/DESCRIPTION b/DESCRIPTION index 7d8edde..e563b67 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,8 +3,8 @@ Type: Package Title: Import XY-Data into R Description: Provides access to the 'xylib' C library for to import xy data from powder diffraction, spectroscopy and other experimental methods. -Version: 0.2.12.9000-1 -Date: 2023-03-06 +Version: 0.2.12.9000-17 +Date: 2023-09-20 Author: Sebastian Kreutzer [aut, trl, cre] (), Johannes Friedrich [aut] (), RLum Team [ctb], diff --git a/NEWS.md b/NEWS.md index 2fc7a39..e794fb5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,8 +5,11 @@ -## Changes in version 0.2.12.9000-1 (2023-03-06) +## Changes in version 0.2.12.9000-17 (2023-09-20) **This version has C++17 as a system requirement.** -- Dummy +- `read_xyData()` no throws more meaningful errors if the underlying + library throws errors. +- Update `xrdml.cpp` to work with nodes of type “counts” instead of + “intensities” diff --git a/codemeta.json b/codemeta.json index 05c2ffa..f3dba26 100644 --- a/codemeta.json +++ b/codemeta.json @@ -7,13 +7,13 @@ "codeRepository": "https://github.com/R-Lum/rxylib", "issueTracker": "https://github.com/R-Lum/rxylib/issues", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "0.2.12.9000.1", + "version": "0.2.12.9000.17", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R Under development (unstable) (2023-03-04 r83937)", + "runtimePlatform": "R Under development (unstable) (2023-07-21 r84719)", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -115,8 +115,7 @@ }, "SystemRequirements": "\n C++17" }, - "fileSize": "5010.456KB", - "releaseNotes": "https://github.com/R-Lum/rxylib/blob/master/NEWS.md", + "fileSize": "3431.963KB", "contIntegration": "https://app.codecov.io/gh/R-Lum/rxylib", "relatedLink": "https://CRAN.R-project.org/package=rxylib" } diff --git a/man/convert_xy2TKA.Rd b/man/convert_xy2TKA.Rd index d1ffee3..0468623 100644 --- a/man/convert_xy2TKA.Rd +++ b/man/convert_xy2TKA.Rd @@ -60,7 +60,7 @@ Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany } \section{How to cite}{ -Kreutzer, S., 2023. convert_xy2TKA(): Convert xy-data to TKA. Function version 0.1.1. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-1. https://github.com/R-Lum/rxylib +Kreutzer, S., 2023. convert_xy2TKA(): Convert xy-data to TKA. Function version 0.1.1. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-17. https://github.com/R-Lum/rxylib } \keyword{IO} diff --git a/man/read_xyData.Rd b/man/read_xyData.Rd index 0f05a88..89a28b0 100644 --- a/man/read_xyData.Rd +++ b/man/read_xyData.Rd @@ -62,7 +62,7 @@ University of Bayreuth (Germany) } \section{How to cite}{ -Kreutzer, S., Friedrich, J., 2023. read_xyData(): Import xy-Data for Supported Formats into R. Function version 0.3.0. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-1. https://github.com/R-Lum/rxylib +Kreutzer, S., Friedrich, J., 2023. read_xyData(): Import xy-Data for Supported Formats into R. Function version 0.3.0. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-17. https://github.com/R-Lum/rxylib } \keyword{IO} diff --git a/rxylib.BuildResults/rxylib-Ex.timings.0.2.12.9000-1.WARNING b/rxylib.BuildResults/rxylib-Ex.timings.0.2.12.9000-17.WARNING similarity index 100% rename from rxylib.BuildResults/rxylib-Ex.timings.0.2.12.9000-1.WARNING rename to rxylib.BuildResults/rxylib-Ex.timings.0.2.12.9000-17.WARNING diff --git a/rxylib.BuildResults/rxylib-TimingExamples.0.2.12.9000-1.pdf b/rxylib.BuildResults/rxylib-TimingExamples.0.2.12.9000-17.pdf similarity index 87% rename from rxylib.BuildResults/rxylib-TimingExamples.0.2.12.9000-1.pdf rename to rxylib.BuildResults/rxylib-TimingExamples.0.2.12.9000-17.pdf index ab1b8e7..239beae 100644 Binary files a/rxylib.BuildResults/rxylib-TimingExamples.0.2.12.9000-1.pdf and b/rxylib.BuildResults/rxylib-TimingExamples.0.2.12.9000-17.pdf differ diff --git a/rxylib.BuildResults/rxylib_0.2.12.9000-1.tar.gz b/rxylib.BuildResults/rxylib_0.2.12.9000-1.tar.gz deleted file mode 100644 index 752d50a..0000000 Binary files a/rxylib.BuildResults/rxylib_0.2.12.9000-1.tar.gz and /dev/null differ diff --git a/rxylib.BuildResults/rxylib_0.2.12.9000-1-Functions.csv b/rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.csv similarity index 93% rename from rxylib.BuildResults/rxylib_0.2.12.9000-1-Functions.csv rename to rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.csv index 37a3e91..939e884 100644 --- a/rxylib.BuildResults/rxylib_0.2.12.9000-1-Functions.csv +++ b/rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.csv @@ -1,8 +1,8 @@ "Name","Title","Description","Version","m.Date","m.Time","Author","Citation" "convert_xy2TKA","Convert xy-data to TKA","Convert data to the Toolkit file format (TKA) as exported by, e.g., by the software Canberra Genie 2000.","0.1.1 -",NA,NA,"Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany
","Kreutzer, S., 2023. convert_xy2TKA(): Convert xy-data to TKA. Function version 0.1.1. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-1. https://github.com/R-Lum/rxylib +",NA,NA,"Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany
","Kreutzer, S., 2023. convert_xy2TKA(): Convert xy-data to TKA. Function version 0.1.1. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-17. https://github.com/R-Lum/rxylib " "methods_rxylib","methods_rxylib","S3-methods support by the package rxylib . Listed functions can be passed directly into S3 generics (e.g., plot , print ) without reshaping the data.",NA,NA,NA,NA,NA "read_xyData","Import xy-Data for Supported Formats into R","The function provides access to the underlying xylib to import data for supported file formats into R. In most cases, only the file path is needed with further arguments to import the data. The function automatically recognises allowed formats. See rxylib-package for supported formats.","0.3.0 -",NA,NA,"Sebastian Kreutzer, Institute of Geography, Ruprecht-Karl-University of Heidelberg (Germany), Johannes Friedrich,
University of Bayreuth (Germany)
","Kreutzer, S., Friedrich, J., 2023. read_xyData(): Import xy-Data for Supported Formats into R. Function version 0.3.0. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-1. https://github.com/R-Lum/rxylib +",NA,NA,"Sebastian Kreutzer, Institute of Geography, Ruprecht-Karl-University of Heidelberg (Germany), Johannes Friedrich,
University of Bayreuth (Germany)
","Kreutzer, S., Friedrich, J., 2023. read_xyData(): Import xy-Data for Supported Formats into R. Function version 0.3.0. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-17. https://github.com/R-Lum/rxylib " diff --git a/rxylib.BuildResults/rxylib_0.2.12.9000-1-Functions.html b/rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.html similarity index 94% rename from rxylib.BuildResults/rxylib_0.2.12.9000-1-Functions.html rename to rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.html index 06d4556..896f1f1 100644 --- a/rxylib.BuildResults/rxylib_0.2.12.9000-1-Functions.html +++ b/rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.html @@ -1,6 +1,6 @@

Major functions in the R package 'Luminescence'

-

[version: 0.2.12.9000-1 ]

+

[version: 0.2.12.9000-17 ]