Skip to content

Commit

Permalink
Merge pull request pik-piam#81 from fbenke-pik/convergence
Browse files Browse the repository at this point in the history
Remove Convergence Plot
  • Loading branch information
fbenke-pik authored Nov 6, 2023
2 parents 378ddef + be76900 commit 3344f78
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 391 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '28614768'
ValidationKey: '28713820'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: |
gamstransfer=?ignore
any::lucode2
any::covr
any::madrat
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exclude: '^tests/testthat/_snaps/.*$'
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-case-conflict
- id: check-json
Expand All @@ -15,7 +15,7 @@ repos:
- id: mixed-line-ending

- repo: https://github.com/lorenzwalthert/precommit
rev: v0.3.2.9021
rev: v0.3.2.9025
hooks:
- id: parsable-R
- id: deps-in-desc
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'mip: Comparison of multi-model runs'
version: 0.145.6
date-released: '2023-10-23'
version: 0.146.0
date-released: '2023-11-06'
abstract: Package contains generic functions to produce comparison plots of multi-model
runs.
authors:
Expand Down
5 changes: 2 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: mip
Title: Comparison of multi-model runs
Version: 0.145.6
Date: 2023-10-23
Version: 0.146.0
Date: 2023-11-06
Authors@R: c(
person("David", "Klein", , "[email protected]", role = c("aut", "cre")),
person("Jan Philipp", "Dietrich", , "[email protected]", role = "aut"),
Expand All @@ -27,7 +27,6 @@ Imports:
RColorBrewer,
data.table,
dplyr,
gdx,
ggplot2,
gridExtra,
htmltools,
Expand Down
7 changes: 0 additions & 7 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export(identifierModelScen)
export(longestCommonPrefix)
export(mipArea)
export(mipBarYearData)
export(mipConvergence)
export(mipIterations)
export(mipLineHistorical)
export(plotstyle)
Expand Down Expand Up @@ -53,7 +52,6 @@ importFrom(dplyr,summarise)
importFrom(dplyr,summarize)
importFrom(dplyr,sym)
importFrom(dplyr,ungroup)
importFrom(gdx,readGDX)
importFrom(ggplot2,"%+replace%")
importFrom(ggplot2,aes)
importFrom(ggplot2,aes_)
Expand All @@ -74,7 +72,6 @@ importFrom(ggplot2,geom_col)
importFrom(ggplot2,geom_hline)
importFrom(ggplot2,geom_line)
importFrom(ggplot2,geom_point)
importFrom(ggplot2,geom_rect)
importFrom(ggplot2,geom_text)
importFrom(ggplot2,geom_vline)
importFrom(ggplot2,ggplot)
Expand All @@ -95,7 +92,6 @@ importFrom(ggplot2,scale_fill_manual)
importFrom(ggplot2,scale_linetype_discrete)
importFrom(ggplot2,scale_shape_manual)
importFrom(ggplot2,scale_x_continuous)
importFrom(ggplot2,scale_y_discrete)
importFrom(ggplot2,scale_y_log10)
importFrom(ggplot2,stat_summary)
importFrom(ggplot2,theme)
Expand Down Expand Up @@ -131,9 +127,7 @@ importFrom(magclass,nregions)
importFrom(magclass,nyears)
importFrom(plotly,add_annotations)
importFrom(plotly,as.widget)
importFrom(plotly,config)
importFrom(plotly,ggplotly)
importFrom(plotly,hide_legend)
importFrom(plotly,layout)
importFrom(plotly,plotly)
importFrom(plotly,plotlyOutput)
Expand Down Expand Up @@ -193,7 +187,6 @@ importFrom(shiny,verbatimTextOutput)
importFrom(shiny,wellPanel)
importFrom(stats,as.formula)
importFrom(stats,complete.cases)
importFrom(stats,lag)
importFrom(stats,median)
importFrom(stats,na.omit)
importFrom(stats,reshape)
Expand Down
Loading

0 comments on commit 3344f78

Please sign in to comment.