Pre-release build

R-Lum · Nov 3, 2023 · ce5bcdc · ce5bcdc
1 parent cf32603
commit ce5bcdc
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 32 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -33,10 +33,10 @@
       "relation": "isReferencedBy"
     }
   ],
-  "version": "0.2.12.9000-17",
+  "version": "0.2.12",
   "upload_type": "software",
   "keywords": ["data import", "power diffraction", "R"],
-  "publication_date": "2023-09-20",
+  "publication_date": "2023-11-03",
   "creators": [
     {
       "orcid": "0000-0002-0734-2199",

diff --git 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-17
-Date: 2023-09-20
+Version: 0.2.12
+Date: 2023-11-03
 Author: Sebastian Kreutzer [aut, trl, cre] (<https://orcid.org/0000-0002-0734-2199>), 
   Johannes Friedrich [aut] (<https://orcid.org/0000-0002-0805-9547>),
   RLum Team [ctb],

diff --git a/NEWS.Rmd b/NEWS.Rmd
@@ -10,6 +10,7 @@ header-includes:
 
 **This version has C++17 as a system requirement.**
 
-* `read_xyData()` no throws more meaningful errors if the underlying library throws 
+* `read_xyData()` now throws more meaningful errors if the underlying library throws 
 errors.
-* Update `xrdml.cpp` to work with nodes of type "counts" instead of "intensities"
+* Update `xrdml.cpp` to work with nodes of type "counts" instead of "intensities" (depending
+on what is available)
diff --git a/NEWS.md b/NEWS.md
@@ -5,11 +5,11 @@
 
 <!-- NEWS.md was auto-generated by NEWS.Rmd. Please DO NOT edit by hand!-->
 
-## Changes in version 0.2.12.9000-17 (2023-09-20)
+## Changes in version 0.2.12 (2023-11-03)
 
 **This version has C++17 as a system requirement.**
 
-- `read_xyData()` no throws more meaningful errors if the underlying
+- `read_xyData()` now throws more meaningful errors if the underlying
   library throws errors.
 - Update `xrdml.cpp` to work with nodes of type “counts” instead of
-  “intensities”
+  “intensities” (depending on what is available)
diff --git 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.17",
+  "version": "0.2.12",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R Under development (unstable) (2023-07-21 r84719)",
+  "runtimePlatform": "R Under development (unstable) (2023-10-30 r85440)",
   "provider": {
     "@id": "https://cran.r-project.org",
     "@type": "Organization",
@@ -115,7 +115,8 @@
     },
     "SystemRequirements": "\n    C++17"
   },
-  "fileSize": "3431.963KB",
+  "fileSize": "3431.965KB",
+  "releaseNotes": "https://github.com/R-Lum/rxylib/blob/master/NEWS.md",
   "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
diff --git a/man/read_xyData.Rd b/man/read_xyData.Rd
diff --git a/.../rxylib-Ex.timings.0.2.12.9000-17.WARNING → ...dResults/rxylib-Ex.timings.0.2.12.WARNING b/.../rxylib-Ex.timings.0.2.12.9000-17.WARNING → ...dResults/rxylib-Ex.timings.0.2.12.WARNING
diff --git a/.../rxylib-TimingExamples.0.2.12.9000-17.pdf → ...dResults/rxylib-TimingExamples.0.2.12.pdf b/.../rxylib-TimingExamples.0.2.12.9000-17.pdf → ...dResults/rxylib-TimingExamples.0.2.12.pdf
diff --git a/...sults/rxylib_0.2.12.9000-17-Functions.csv → ....BuildResults/rxylib_0.2.12-Functions.csv b/...sults/rxylib_0.2.12.9000-17-Functions.csv → ....BuildResults/rxylib_0.2.12-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<br />","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
+",NA,NA,"Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany<br />","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. 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,<br /> University of Bayreuth (Germany)<br />","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
+",NA,NA,"Sebastian Kreutzer, Institute of Geography, Ruprecht-Karl-University of Heidelberg (Germany), Johannes Friedrich,<br /> University of Bayreuth (Germany)<br />","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. https://github.com/R-Lum/rxylib
 "
diff --git a/...ults/rxylib_0.2.12.9000-17-Functions.html → ...BuildResults/rxylib_0.2.12-Functions.html b/...ults/rxylib_0.2.12.9000-17-Functions.html → ...BuildResults/rxylib_0.2.12-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.12.9000-17 ]</h4>
+           <h4 align="center"> [version: 0.2.12 ]</h4>
            <style type="text/css">
            <!--
 
@@ -71,7 +71,7 @@ <h4 align="center"> [version: 0.2.12.9000-17 ]</h4>
 </td>
 <td class=cellinside>Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany<br />
 </td>
-<td class=cellinside>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
+<td class=cellinside>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. https://github.com/R-Lum/rxylib
 
 </td></tr>
 
@@ -113,7 +113,7 @@ <h4 align="center"> [version: 0.2.12.9000-17 ]</h4>
 </td>
 <td class=cellinside>Sebastian Kreutzer, Institute of Geography, Ruprecht-Karl-University of Heidelberg (Germany), Johannes Friedrich,<br /> University of Bayreuth (Germany)<br />
 </td>
-<td class=cellinside>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
+<td class=cellinside>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. https://github.com/R-Lum/rxylib
 
 </td></tr>
 
@@ -123,7 +123,7 @@ <h4 align="center"> [version: 0.2.12.9000-17 ]</h4>
  <br>
 
 <p class='character'><h2 align="center">Major functions in the R package 'Luminescence'</h2>
-           <h4 align="center"> [version: 0.2.12.9000-17 ]</h4>
+           <h4 align="center"> [version: 0.2.12 ]</h4>
            <style type="text/css">
            <!--
 
@@ -194,7 +194,7 @@ <h4 align="center"> [version: 0.2.12.9000-17 ]</h4>
 </td>
 <td class=cellinside>Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany<br />
 </td>
-<td class=cellinside>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
+<td class=cellinside>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. https://github.com/R-Lum/rxylib
 
 </td></tr>
 
@@ -236,7 +236,7 @@ <h4 align="center"> [version: 0.2.12.9000-17 ]</h4>
 </td>
 <td class=cellinside>Sebastian Kreutzer, Institute of Geography, Ruprecht-Karl-University of Heidelberg (Germany), Johannes Friedrich,<br /> University of Bayreuth (Germany)<br />
 </td>
-<td class=cellinside>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
+<td class=cellinside>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. https://github.com/R-Lum/rxylib
 
 </td></tr>
 

diff --git a/...sults/rxylib_0.2.12.9000-17-Functions.tex → ....BuildResults/rxylib_0.2.12-Functions.tex b/...sults/rxylib_0.2.12.9000-17-Functions.tex → ....BuildResults/rxylib_0.2.12-Functions.tex
@@ -5,11 +5,11 @@
  & Name & Title & Description & Version & m.Date & m.Time & Author & Citation \\ 
   \hline
 1 & 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
- &  &  & Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany$<$br /$>$ & 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
+ &  &  & Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany$<$br /$>$ & 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. https://github.com/R-Lum/rxylib
  \\ 
   2 & 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. &  &  &  &  &  \\ 
   3 & 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
- &  &  & Sebastian Kreutzer, Institute of Geography, Ruprecht-Karl-University of Heidelberg (Germany), Johannes Friedrich,$<$br /$>$ University of Bayreuth (Germany)$<$br /$>$ & 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
+ &  &  & Sebastian Kreutzer, Institute of Geography, Ruprecht-Karl-University of Heidelberg (Germany), Johannes Friedrich,$<$br /$>$ University of Bayreuth (Germany)$<$br /$>$ & 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. https://github.com/R-Lum/rxylib
  \\ 
    \hline
 \end{tabular}

diff --git a/...ylib_0.2.12.9000-17-Functions_Markdown.md → ...sults/rxylib_0.2.12-Functions_Markdown.md b/...ylib_0.2.12.9000-17-Functions_Markdown.md → ...sults/rxylib_0.2.12-Functions_Markdown.md
@@ -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-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-17. https://github.com/R-Lum/rxylib |
+| 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. 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. https://github.com/R-Lum/rxylib |