Skip to content

Commit

Permalink
v0.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
gagolews committed Nov 29, 2023
1 parent 7c79539 commit 797bd97
Show file tree
Hide file tree
Showing 110 changed files with 145 additions and 92 deletions.
3 changes: 2 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
^.*\.Rproj$
^\.Rproj\.user$
^devel
^\.devel
^\.github
^src/.*\.o$
^README.md$
^\.gitignore$
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

library("testthat")
library("agop")
test_dir("devel/testthat/")
test_dir(".devel/testthat/")
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
60 changes: 60 additions & 0 deletions .github/workflows/r-check-default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: agop for R

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: '4.1'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
_R_CHECK_FORCE_SUGGESTS_: false
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- name: Install
run: |
install.packages(".", repos=NULL, type="source")
shell: Rscript {0}

- name: Test
run: |
install.packages("testthat")
source(".devel/testthat/run_package_test.R")
shell: Rscript {0}

- name: Check
env:
_R_CHECK_CRAN_INCOMING_: false
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "error", check_dir = "check")
shell: Rscript {0}
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: agop
Version: 0.2.4.9001
Date: 2022-02-09
Version: 0.2.4
Date: 2023-11-30
Title: Aggregation Operators and Preordered Sets
Description: Tools supporting multi-criteria and group decision making,
including variable number of criteria, by means of
Expand Down Expand Up @@ -29,5 +29,5 @@ Authors@R: c(
email = "[email protected]",
comment = c(ORCID = "0000-0001-8697-5383"))
)
RoxygenNote: 7.1.2
RoxygenNote: 7.2.3
Encoding: UTF-8
11 changes: 8 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2021-2022, Marek Gagolewski <https://www.gagolewski.com>
# Copyright (c) 2021-2023, Marek Gagolewski <https://www.gagolewski.com/>


.PHONY: r check build clean purge test
Expand Down Expand Up @@ -37,11 +37,16 @@ check-cran: stop-on-utf8 build
R CMD check `ls -t ${PKGNAME}*.tar.gz | head -1` --as-cran

clean:
rm -rf devel/sphinx/_build/
rm -rf devel/sphinx/rapi/
rm -rf .devel/sphinx/_build/
rm -rf .devel/sphinx/rapi/
rm -rf revdep/
rm -rf src/*.o src/*.so

testthat:
Rscript -e 'source(".devel/testthat/run_package_test.R")'

test: r testthat

purge: clean
# rm -f man/*.Rd
# rm -rf docs/
31 changes: 10 additions & 21 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
** agop package NEWS **
***************************************************************************
# agop package NEWS

0.2.4 /under development/
## 0.2.4 (2023-11-30)

* ...
* Fixed warnings emitted by R CMD check.


***************************************************************************


0.2-3 /2020-01-06/
## 0.2-3 (2020-01-06)

* [BUGFIX, #8] PROTECTing unprotected variables are reported by rchk.


***************************************************************************

0.2-2 /2019-03-05/
## 0.2-2 (2019-03-05)

* [IMPORTANT CHANGE] All functions dealing with binary relations now are
named like `rel_*`. Moreover, `de_transitive()` has been renamed
Expand Down Expand Up @@ -65,23 +59,18 @@

* [INFO] Most of the functions are now implemented in C++.

***************************************************************************

0.1-4 /2014-09-14/
## 0.1-4 (2014-09-14)

* Fixed NOTES on pkg check in R >= 3.1

***************************************************************************

0.1-3 /2013-06-27/
## 0.1-3 (2013-06-27)

* Compiler errors on Solaris Studio removed.
* Fix for compiler errors on Solaris Studio.

***************************************************************************

0.1-1 /2013-06-26/
## 0.1-1 (2013-06-26)

* initial release
* Initial release
[the package started as a lightweight fork of the CITAN package].

***************************************************************************
4 changes: 1 addition & 3 deletions R/agop-package.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand All @@ -20,13 +20,11 @@

#' @title Aggregation Operators and Preordered Sets Package for R
#'
#'
#' @author
#' Marek Gagolewski [aut,cre],\cr
#' Anna Cena [ctb]
#'
#' @description
#'
#' \bold{Keywords}: aggregation, bibliometrics, scientometrics, scientific impact,
#' webometrics, preorders, binary relations, means, OWA, OWMax, OWMin, Hirsch's h-index,
#' Egghe's g-index, variance, spread, decision making, fuzzy logic.
Expand Down
2 changes: 1 addition & 1 deletion R/agops-classical.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/agops-dispersion.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/agops-impact.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/check-comonotonicity.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/distrib-dpareto2-estimators.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/distrib-dpareto2.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/distrib-exp-adtest.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/distrib-pareto2-adtest.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/distrib-pareto2-estimators.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/distrib-pareto2-ftest.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/distrib-pareto2.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/fuzzylogic-implication.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/fuzzylogic-negation.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/fuzzylogic-tconorm.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/fuzzylogic-tnorm.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-antisymmetry.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-assymetry.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-cyclicity.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-examples.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-hasse.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-irreflexivity.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-other.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-reflexivity.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-symmetry.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
2 changes: 1 addition & 1 deletion R/rel-totality.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## This file is part of the 'agop' library.
##
## Copyleft (c) 2013-2021, Marek Gagolewski <https://www.gagolewski.com>
## Copyleft (c) 2013-2023, Marek Gagolewski <https://www.gagolewski.com/>
##
##
## 'agop' is free software: you can redistribute it and/or modify it under
Expand Down
Loading

0 comments on commit 797bd97

Please sign in to comment.