Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
03061a8
Increase subset support for arbitraty attributes; add attribute-relat…
Dvermetten Jul 1, 2021
625ba03
Add documentation files for newly added functions
Dvermetten Jul 1, 2021
5ac2310
Fix example of dataset subset
Dvermetten Jul 1, 2021
4d0a24b
Fix several issues in subset-handling
Dvermetten Jul 1, 2021
c718b5d
Fixes to subsetting on custom attributes
Dvermetten Jul 2, 2021
fb3c0ee
Re-add the enclosure environment for evaluation the conditions of subset
Dvermetten Jul 2, 2021
7372d55
Add functionality for adding unique identifier to DataSetLists
Dvermetten Jul 2, 2021
45969de
Fix examples of adding unique ids
Dvermetten Jul 2, 2021
06525d0
Fix subset again to allow string-based conditons for evaluation in co…
Dvermetten Jul 5, 2021
64de55c
Add unique id to RT summary
Dvermetten Jul 5, 2021
e796318
Change unique id to ID and initialize to algId by default
Dvermetten Jul 7, 2021
608042e
Update description file
Dvermetten Jul 20, 2021
6303fe0
Add ID to all relevant functions
Dvermetten Jul 21, 2021
2d5b983
change algid to ID attribute in server-functions for GUI
Dvermetten Jul 22, 2021
2895e57
Add option to change ID variables to settings page
Dvermetten Jul 22, 2021
0ef9f9e
Add ID to SOS-based data and fix its final-pos detection
Dvermetten Jul 23, 2021
036036a
Add filtering on AlgId if not used in ID
Dvermetten Jul 23, 2021
a6f4cca
Update mentions of ID in GUI; fix conditional algid selection
Dvermetten Jul 23, 2021
b5ef8fb
Add option to use funcname instead of funcid if available
Dvermetten Jul 26, 2021
020a7e8
Update data summary GUIs
Dvermetten Jul 26, 2021
4e93e33
more GUI updates regarding ID selection
Dvermetten Jul 26, 2021
e8ac02a
Change default multi-function ERT plot
Dvermetten Jul 26, 2021
bc48bdf
Remove some attributes from ID selection
Dvermetten Jul 27, 2021
409b120
Implement review feedback + fix funcname selection
Dvermetten Aug 12, 2021
e8ddc33
Add reading of json-based info files
Dvermetten Aug 17, 2021
1a3101c
Fix file extension detection
Dvermetten Aug 17, 2021
7f202da
Minor updates to json-processing
Dvermetten Aug 18, 2021
ee77413
Update datapath attribute when reading json file
Dvermetten Aug 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
^\.travis\.yml$
^.*\.Rproj$
^\.Rproj\.user$
^cran-comments\.md$
^NEWS\.md$
^\.vscode$
^\.vs*$
^_config\.yml$
^LICENSE\.md$
^misc*$
^\.github$
^\.travis\.yml$
^.*\.Rproj$
^\.Rproj\.user$
^cran-comments\.md$
^NEWS\.md$
^\.vscode$
^\.vs*$
^_config\.yml$
^LICENSE\.md$
^misc*$
^\.github$
182 changes: 91 additions & 91 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,91 +1,91 @@
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master

name: R-CMD-check

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

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

strategy:
fail-fast: false
matrix:
config:
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}

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

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}

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

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
shell: Rscript {0}

- name: Restore R package cache
uses: actions/cache@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install system dependencies
if: runner.os == 'Linux'
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')

- name: Install X11 dependencies on MacOS
if: runner.os == 'macOS'
run: |
brew install xquartz --cask

- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
remotes::install_bioc('ComplexHeatmap')
remotes::install_cran("rcmdcheck")
shell: Rscript {0}

- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: |
options(crayon.enabled = TRUE)
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master
name: R-CMD-check
jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
strategy:
fail-fast: false
matrix:
config:
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}
- uses: r-lib/actions/setup-pandoc@v1
- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
shell: Rscript {0}
- name: Restore R package cache
uses: actions/cache@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
- name: Install system dependencies
if: runner.os == 'Linux'
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
- name: Install X11 dependencies on MacOS
if: runner.os == 'macOS'
run: |
brew install xquartz --cask
- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
remotes::install_bioc('ComplexHeatmap')
remotes::install_cran("rcmdcheck")
shell: Rscript {0}
- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: |
options(crayon.enabled = TRUE)
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}
- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
52 changes: 26 additions & 26 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
*.csv
*.o
*.so
*.dll
*.log
*.RData
*.Rhistory
*.Rbuildignore
*.bk
*.pdf
*.html
.*

!/.Rbuildignore
!/.gitignore
__pycache__
rawdata/
test/
rsconnect/
tmp/
tmp2/
rawdata/
extract_data.R
.Rproj.user
*.Rproj
.Rhistory
*.csv
*.o
*.so
*.dll
*.log
*.RData
*.Rhistory
*.Rbuildignore
*.bk
*.pdf
*.html
.*
!/.Rbuildignore
!/.gitignore
__pycache__
rawdata/
test/
rsconnect/
tmp/
tmp2/
rawdata/
extract_data.R
.Rproj.user
*.Rproj
.Rhistory
116 changes: 59 additions & 57 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,57 +1,59 @@
Package: IOHanalyzer
Type: Package
Title: Data Analysis Part of 'IOHprofiler'
Version: 0.1.5.2
Author: Hao Wang [cre, aut], Diederick Vermetten [aut], Carola Doerr [aut], Thomas Bäck [aut]
Maintainer: Hao Wang <h.wang@liacs.leidenuniv.nl>
Authors@R: c(
person("Hao", "Wang", email = "h.wang@liacs.leidenuniv.nl", role = c("cre","aut")),
person("Diederick", "Vermetten", email="d.vermetten@gmail.com", role = "aut"),
person("Carola", "Doerr", email = "Carola.Doerr@mpi-inf.mpg.de", role = "aut"),
person("Thomas", "Bäck", email="t.h.w.baeck@liacs.leidenuniv.nl", role = "aut"))
Description: The data analysis module for the Iterative Optimization Heuristics
Profiler ('IOHprofiler'). This module provides statistical analysis methods for the
benchmark data generated by optimization heuristics, which can be visualized through a
web-based interface. The benchmark data is usually generated by the
experimentation module, called 'IOHexperimenter'. 'IOHanalyzer' also supports
the widely used 'COCO' (Comparing Continuous Optimisers) data format for benchmarking.
License: BSD_3_clause + file LICENSE
Encoding: UTF-8
LazyData: true
URL: http://iohprofiler.liacs.nl, https://github.com/IOHprofiler/IOHAnalyzer
BugReports: https://github.com/IOHprofiler/IOHAnalyzer/issues
Imports:
magrittr,
dplyr,
data.table,
ggplot2,
plotly,
colorspace,
colorRamps,
RColorBrewer,
shiny,
markdown,
reshape2,
shinyjs,
colourpicker,
bsplus,
DT,
kableExtra,
stringi,
httr,
knitr
LinkingTo: Rcpp
SystemRequirements: C++11
RoxygenNote: 7.0.0
Suggests:
Rcpp,
testthat,
withr,
shinydashboard,
ComplexHeatmap,
grid,
keyring,
PlayerRatings,
xtable,
igraph
Depends: R (>= 2.10)
Package: IOHanalyzer
Type: Package
Title: Data Analysis Part of 'IOHprofiler'
Version: 0.1.6.0
Author: Hao Wang [cre, aut], Diederick Vermetten [aut], Carola Doerr [aut], Thomas Bäck [aut]
Maintainer: Hao Wang <h.wang@liacs.leidenuniv.nl>
Authors@R: c(
person("Hao", "Wang", email = "h.wang@liacs.leidenuniv.nl", role = c("cre","aut")),
person("Diederick", "Vermetten", email="d.vermetten@gmail.com", role = "aut"),
person("Carola", "Doerr", email = "Carola.Doerr@mpi-inf.mpg.de", role = "aut"),
person("Thomas", "Bäck", email="t.h.w.baeck@liacs.leidenuniv.nl", role = "aut"))
Description: The data analysis module for the Iterative Optimization Heuristics
Profiler ('IOHprofiler'). This module provides statistical analysis methods for the
benchmark data generated by optimization heuristics, which can be visualized through a
web-based interface. The benchmark data is usually generated by the
experimentation module, called 'IOHexperimenter'. 'IOHanalyzer' also supports
the widely used 'COCO' (Comparing Continuous Optimisers) data format for benchmarking.
License: BSD_3_clause + file LICENSE
Encoding: UTF-8
LazyData: true
URL: http://iohprofiler.liacs.nl, https://github.com/IOHprofiler/IOHAnalyzer
BugReports: https://github.com/IOHprofiler/IOHAnalyzer/issues
Imports:
magrittr,
dplyr,
data.table,
ggplot2,
plotly,
colorspace,
colorRamps,
RColorBrewer,
shiny,
markdown,
reshape2,
shinyjs,
colourpicker,
bsplus,
DT,
kableExtra,
stringi,
httr,
knitr,
methods,
rjson
LinkingTo: Rcpp
SystemRequirements: C++11
RoxygenNote: 7.0.0
Suggests:
Rcpp,
testthat,
withr,
shinydashboard,
ComplexHeatmap,
grid,
keyring,
PlayerRatings,
xtable,
igraph
Depends: R (>= 2.10)
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
YEAR: 2019
COPYRIGHT HOLDER: Hao Wang
YEAR: 2019
COPYRIGHT HOLDER: Hao Wang
ORGANIZATION: Leiden University
Loading