increment version, linter fix variable names

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '799040'
+ValidationKey: '819385'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

CITATION.cff

@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'reporttransport: Reporting package for edgeTransport'
-version: 0.4.0
-date-released: '2024-09-10'
+version: 0.4.1
+date-released: '2024-09-19'
 abstract: This package contains edgeTransport-specific routines to report model results.
   The main functionality is to generate transport reporting variables in MIF format
   from a given edgeTransport model run folder or REMIND input data.

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: reporttransport
 Title: Reporting package for edgeTransport
-Version: 0.4.0
-Date: 2024-09-10
+Version: 0.4.1
+Date: 2024-09-19
 Authors@R:
     person("Johanna", "Hoppe", , "[email protected]", role = c("aut", "cre"))
 Description: This package contains edgeTransport-specific routines to

README.md

@@ -1,6 +1,6 @@
 # Reporting package for edgeTransport
 
-R package **reporttransport**, version **0.4.0**
+R package **reporttransport**, version **0.4.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/reporttransport)](https://cran.r-project.org/package=reporttransport)  [![R build status](https://github.com/pik-piam/reporttransport/workflows/check/badge.svg)](https://github.com/pik-piam/reporttransport/actions) [![codecov](https://codecov.io/gh/pik-piam/reporttransport/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/reporttransport) [![r-universe](https://pik-piam.r-universe.dev/badges/reporttransport)](https://pik-piam.r-universe.dev/builds)
 
@@ -41,7 +41,7 @@ In case of questions / problems please contact Johanna Hoppe <johanna.hoppe@pik-
 
 To cite package **reporttransport** in publications use:
 
-Hoppe J (2024). _reporttransport: Reporting package for edgeTransport_. R package version 0.4.0, <https://github.com/pik-piam/reporttransport>.
+Hoppe J (2024). _reporttransport: Reporting package for edgeTransport_. R package version 0.4.1, <https://github.com/pik-piam/reporttransport>.
 
 A BibTeX entry for LaTeX users is
 
@@ -50,7 +50,7 @@ A BibTeX entry for LaTeX users is
   title = {reporttransport: Reporting package for edgeTransport},
   author = {Johanna Hoppe},
   year = {2024},
-  note = {R package version 0.4.0},
+  note = {R package version 0.4.1},
   url = {https://github.com/pik-piam/reporttransport},
 }
 ```

inst/compareScenarios/cs_02_energy_services.Rmd

@@ -1,7 +1,7 @@
 # Energy Services
 ## Passenger without bunkers
 ```{r}
-tot_wobunk <- "ES|Transport edge|Pass"
+totWoBunk <- "ES|Transport edge|Pass"
 items <- c(
     "ES|Transport|Pass|Domestic Aviation",
     "ES|Transport|Pass|Rail|HSR",
@@ -12,13 +12,13 @@ items <- c(
     "ES|Transport|Pass|Non-motorized|Walk",
     "ES|Transport|Pass|Non-motorized|Cycle"
   )
-showAreaAndBarPlots(data, items, tot_wobunk, orderVars = "user")
-showAreaAndBarPlots(data, items, tot_wobunk, fill=TRUE, orderVars = "user")
+showAreaAndBarPlots(data, items, totWoBunk, orderVars = "user")
+showAreaAndBarPlots(data, items, totWoBunk, fill = TRUE, orderVars = "user")
 ```
 
 ## Passenger with bunkers
 ```{r}
-tot_wbunk <- "ES|Transport|Pass with bunkers"
+totBunk <- "ES|Transport|Pass with bunkers"
 items <- c(
     "ES|Transport|Bunkers|Pass|International Aviation",
     "ES|Transport|Pass|Domestic Aviation",
@@ -30,10 +30,11 @@ items <- c(
     "ES|Transport|Pass|Non-motorized|Walk",
     "ES|Transport|Pass|Non-motorized|Cycle"
   )
-showAreaAndBarPlots(data, items, tot_wbunk,  orderVars = "user")
-showAreaAndBarPlots(data, items, tot_wbunk, fill=TRUE, orderVars = "user")
-showLinePlots(data, tot_wbunk)
-walk(c( "ES|Transport|Pass|Aviation", tot_wobunk, items[1:5], "ES|Transport|Pass|Road|LDV", items[6:9]), showLinePlots, data = data)
+showAreaAndBarPlots(data, items, totBunk,  orderVars = "user")
+showAreaAndBarPlots(data, items, totBunk, fill = TRUE, orderVars = "user")
+showLinePlots(data, totBunk)
+walk(c("ES|Transport|Pass|Aviation", totWoBunk, items[1:5], "ES|Transport|Pass|Road|LDV", items[6:9]),
+     showLinePlots, data = data)
 ```
 
 ## Passenger per Capita
@@ -52,7 +53,7 @@ items <- c(
     "ES|Transport|Pass|Non-motorized|Walk pCap",
     "ES|Transport|Pass|Non-motorized|Cycle pCap"
     )
-showMultiLinePlots(data, items)    
+showMultiLinePlots(data, items)
 showMultiLinePlotsByVariable(data, items, "GDP|PPP pCap")
 walk(items, showLinePlotsByVariable, data = data, xVar = "GDP|PPP pCap")
 ```
@@ -84,19 +85,19 @@ items <- c(
   )
 
 showAreaAndBarPlots(data, items, tot, orderVars = "user")
-showAreaAndBarPlots(data, items, tot, fill=TRUE, orderVars = "user")
+showAreaAndBarPlots(data, items, tot, fill = TRUE, orderVars = "user")
 ```
 
 ## LDV 2-Wheelers by technology
 ```{r}
 tot <- "ES|Transport|Pass|Road|LDV|Two Wheelers"
 items <- c(
      "ES|Transport|Pass|Road|LDV|Two Wheelers|BEV",
-     "ES|Transport|Pass|Road|LDV|Two Wheelers|Liquids" 
+     "ES|Transport|Pass|Road|LDV|Two Wheelers|Liquids"
   )
 
 showAreaAndBarPlots(data, items, tot, orderVars = "user")
-showAreaAndBarPlots(data, items, tot, fill=TRUE, orderVars = "user")
+showAreaAndBarPlots(data, items, tot, fill = TRUE, orderVars = "user")
 ```
 
 ## Busses by technology
@@ -106,38 +107,38 @@ items <- c(
        "ES|Transport|Pass|Road|Bus|BEV",
        "ES|Transport|Pass|Road|Bus|FCEV",
        "ES|Transport|Pass|Road|Bus|Gases",
-       "ES|Transport|Pass|Road|Bus|Liquids" 
+       "ES|Transport|Pass|Road|Bus|Liquids"
   )
 
 showAreaAndBarPlots(data, items, tot, orderVars = "user")
-showAreaAndBarPlots(data, items, tot, fill=TRUE, orderVars = "user")
+showAreaAndBarPlots(data, items, tot, fill = TRUE, orderVars = "user")
 ```
 
 ## Freight without bunkers
 ```{r}
-tot_wobunk <- "ES|Transport edge|Freight"
+totWoBunk <- "ES|Transport edge|Freight"
 items <- c(
       "ES|Transport|Freight|Domestic Shipping",
       "ES|Transport|Freight|Rail",
       "ES|Transport|Freight|Road"
   )
-showAreaAndBarPlots(data, items, tot_wobunk, orderVars = "user")
-showAreaAndBarPlots(data, items, tot_wobunk, fill=TRUE, orderVars = "user")
+showAreaAndBarPlots(data, items, totWoBunk, orderVars = "user")
+showAreaAndBarPlots(data, items, totWoBbunk, fill = TRUE, orderVars = "user")
 ```
 
 ## Freight with bunkers
 ```{r}
-tot_wbunk <- "ES|Transport|Freight with bunkers"
+totBunk <- "ES|Transport|Freight with bunkers"
 items <- c(
       "ES|Transport|Bunkers|Freight|International Shipping",
       "ES|Transport|Freight|Domestic Shipping",
       "ES|Transport|Freight|Rail",
       "ES|Transport|Freight|Road"
   )
-showAreaAndBarPlots(data, items, tot_wbunk, orderVars = "user")
-showAreaAndBarPlots(data, items, tot_wbunk, fill=TRUE, orderVars = "user")
-showLinePlots(data, tot_wbunk)
-walk(items, showLinePlots, data=data)
+showAreaAndBarPlots(data, items, totBunk, orderVars = "user")
+showAreaAndBarPlots(data, items, totBunk, fill = TRUE, orderVars = "user")
+showLinePlots(data, totBunk)
+walk(items, showLinePlots, data = data)
 ```
 
 
@@ -151,10 +152,9 @@ items <- c(
       "ES|Transport|Freight|Rail pCap",
       "ES|Transport|Freight|Road pCap"
     )
-showMultiLinePlots(data, items)    
+showMultiLinePlots(data, items)
 showMultiLinePlotsByVariable(data, items, "GDP|PPP pCap")
 walk(items, showLinePlotsByVariable, data = data, xVar = "GDP|PPP pCap")
-
 ```
 
 ## Trucks
@@ -171,7 +171,7 @@ items <- c(
   )
 
 showAreaAndBarPlots(data, items, tot, orderVars = "user")
-showAreaAndBarPlots(data, items, tot, fill=TRUE, orderVars = "user")
+showAreaAndBarPlots(data, items, tot, fill = TRUE, orderVars = "user")
 ```
 
 ### By technology
@@ -185,6 +185,6 @@ items <- c(
   )
 
 showAreaAndBarPlots(data, items, tot, orderVars = "user")
-showAreaAndBarPlots(data, items, tot, fill=TRUE, orderVars = "user")
+showAreaAndBarPlots(data, items, tot, fill = TRUE, orderVars = "user")
 ```