Skip to content

Commit

Permalink
fixed problem with unknown UTF-8 code
Browse files Browse the repository at this point in the history
  • Loading branch information
tscheypidi committed Dec 14, 2020
1 parent 7676c75 commit aec6671
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '95913930'
ValidationKey: '95953160'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
Expand Down
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "magclass: Data Class and Tools for Handling Spatial-Temporal Data",
"version": "5.15.5",
"version": "5.15.6",
"description": "<p>Data class for increased interoperability working with spatial-\n temporal data together with corresponding functions and methods (conversions,\n basic calculations and basic data manipulation). The class distinguishes\n between spatial, temporal and other dimensions to facilitate the development\n and interoperability of tools build for it. Additional features are name-based\n addressing of data and internal consistency checks (e.g. checking for the right\n data order in calculations).<\/p>",
"creators": [
{
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: magclass
Type: Package
Title: Data Class and Tools for Handling Spatial-Temporal Data
Version: 5.15.5
Date: 2020-12-10
Version: 5.15.6
Date: 2020-12-14
Authors@R: c(person("Jan Philipp", "Dietrich", email = "dietrich@pik-potsdam.de", role = c("aut","cre")),
person("Benjamin Leon", "Bodirsky", email = "bodirsky@pik-potsdam.de", role = "aut"),
person("Markus", "Bonsch", role = "aut"),
Expand Down
4 changes: 2 additions & 2 deletions R/read.report.R
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ read.report <- function(file,as.list=TRUE) {
ndots <- nchar(gsub("[^\\.]*","",names))
if(any(ndots!=ndots[1])) names <- gsub("\\.","",names)
#replace weird ° in tables after sub function evaluation
names <- sub(pattern="\U3e30623cC",replacement = "K", x = names, useBytes = TRUE)
names(names) <- sub(pattern="\U3e30623cC",replacement = "K", x = names(names), useBytes = TRUE)
names <- sub(pattern="\U{00B0}C",replacement = "K", x = names, useBytes = TRUE)
names(names) <- sub(pattern="\U{00B0}C",replacement = "K", x = names(names), useBytes = TRUE)
mag <- new.magpie(sub("ZZZZZZGLO","GLO",(sort(sub("GLO","ZZZZZZGLO",regions)))),years,names)
yearelems <- grep("^X[0-9]{4}$",dimnames(tmp)[[2]])
regions[order(sub("GLO","ZZZZZZGLO",regions))] <- dimnames(mag)[[1]]
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Data Class and Tools for Handling Spatial-Temporal Data

R package **magclass**, version **5.15.5**
R package **magclass**, version **5.15.6**

[![Travis build status](https://travis-ci.com/pik-piam/magclass.svg?branch=master)](https://travis-ci.com/pik-piam/magclass) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158580.svg)](https://doi.org/10.5281/zenodo.1158580) [![codecov](https://codecov.io/gh/pik-piam/magclass/branch/master/graph/badge.svg)](https://codecov.io/gh/pik-piam/magclass)

Expand Down Expand Up @@ -54,8 +54,9 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi

To cite package **magclass** in publications use:

Dietrich J, Bodirsky B, Bonsch M, Humpenoeder F, Bi S, Karstens K (2020). _magclass: Data Class and Tools for Handling
Spatial-Temporal Data_. doi: 10.5281/zenodo.1158580 (URL: https://doi.org/10.5281/zenodo.1158580), R package version 5.15.5, <URL:
Dietrich J, Bodirsky B, Bonsch M, Humpenoeder F, Bi S, Karstens K (2020). _magclass: Data
Class and Tools for Handling Spatial-Temporal Data_. doi: 10.5281/zenodo.1158580 (URL:
https://doi.org/10.5281/zenodo.1158580), R package version 5.15.6, <URL:
https://github.com/pik-piam/magclass>.

A BibTeX entry for LaTeX users is
Expand All @@ -65,7 +66,7 @@ A BibTeX entry for LaTeX users is
title = {magclass: Data Class and Tools for Handling Spatial-Temporal Data},
author = {Jan Philipp Dietrich and Benjamin Leon Bodirsky and Markus Bonsch and Florian Humpenoeder and Stephen Bi and Kristine Karstens},
year = {2020},
note = {R package version 5.15.5},
note = {R package version 5.15.6},
doi = {10.5281/zenodo.1158580},
url = {https://github.com/pik-piam/magclass},
}
Expand Down
4 changes: 2 additions & 2 deletions man/replace_non_finite.Rd

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

0 comments on commit aec6671

Please sign in to comment.