Skip to content

Commit

Permalink
Merge pull request #88 from computational-psychology/dev_manuscript
Browse files Browse the repository at this point in the history 
docs: final touch-up on manuscript
  • Loading branch information
@JorisVincent
JorisVincent committed Jun 6, 2023
2 parents b4bb148 + b46fdf8 commit f756c54
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 76 deletions.
1 change: 1 addition & 0 deletions .github/workflows/draft-pdf.yml
View file
Expand Up @@ -3,6 +3,7 @@ name: Draft JOSS PDF
on:
push:
branches: [main, manuscript]
workflow_dispatch:

jobs:
paper:
Expand Down
137 changes: 62 additions & 75 deletions manuscript/bibliography.bib
View file
Expand Up @@ -7,9 +7,7 @@ @inproceedings{aguilar.maertens.ea2022
volume = {22},
pages = {3519},
address = {{St. Pete Beach, FL}},
doi = {10.1167/jov.22.14.3519},
urldate = {2023-03-24},
langid = {english}
doi = {10.1167/jov.22.14.3519}
}

@article{brainard1997,
Expand Down Expand Up @@ -56,35 +54,36 @@ @inproceedings{deng2009
organization = {{IEEE}}
}

@Article{harris2020,
title = {Array programming with {NumPy}},
author = {Charles R. Harris and K. Jarrod Millman and St{\'{e}}fan J.
van der Walt and Ralf Gommers and Pauli Virtanen and David
Cournapeau and Eric Wieser and Julian Taylor and Sebastian
Berg and Nathaniel J. Smith and Robert Kern and Matti Picus
and Stephan Hoyer and Marten H. van Kerkwijk and Matthew
Brett and Allan Haldane and Jaime Fern{\'{a}}ndez del
R{\'{i}}o and Mark Wiebe and Pearu Peterson and Pierre
G{\'{e}}rard-Marchant and Kevin Sheppard and Tyler Reddy and
Warren Weckesser and Hameer Abbasi and Christoph Gohlke and
Travis E. Oliphant},
year = {2020},
journal = {Nature},
volume = {585},
number = {7825},
pages = {357--362},
doi = {10.1038/s41586-020-2649-2},
publisher = {Springer Science and Business Media {LLC}},
}

@conference{kluyver2016,
title = {Jupyter Notebooks -- a publishing format for reproducible computational workflows},
author = {Thomas Kluyver and Benjamin Ragan-Kelley and Fernando P{\'e}rez and Brian Granger and Matthias Bussonnier and Jonathan Frederic and Kyle Kelley and Jessica Hamrick and Jason Grout and Sylvain Corlay and Paul Ivanov and Dami{\'a}n Avila and Safia Abdalla and Carol Willing},
booktitle = {Positioning and Power in Academic Publishing: Players, Agents and Agendas},
editor = {F. Loizides and B. Schmidt},
organization = {IOS Press},
pages = {87 -- 90},
year = {2016}
@article{harris2020,
title = {Array programming with {NumPy}},
author = {Charles R. Harris and K. Jarrod Millman and St{\'{e}}fan J.
van der Walt and Ralf Gommers and Pauli Virtanen and David
Cournapeau and Eric Wieser and Julian Taylor and Sebastian
Berg and Nathaniel J. Smith and Robert Kern and Matti Picus
and Stephan Hoyer and Marten H. van Kerkwijk and Matthew
Brett and Allan Haldane and Jaime Fern{\'{a}}ndez del
R{\'{i}}o and Mark Wiebe and Pearu Peterson and Pierre
G{\'{e}}rard-Marchant and Kevin Sheppard and Tyler Reddy and
Warren Weckesser and Hameer Abbasi and Christoph Gohlke and
Travis E. Oliphant},
year = {2020},
journal = {Nature},
volume = {585},
number = {7825},
pages = {357--362},
doi = {10.1038/s41586-020-2649-2},
publisher = {Springer Science and Business Media {LLC}}
}

@inproceedings{kluyver2016,
title = {Jupyter Notebooks -- a publishing format for reproducible computational workflows},
author = {Thomas Kluyver and Benjamin Ragan-Kelley and Fernando P{\'e}rez and Brian Granger and Matthias Bussonnier and Jonathan Frederic and Kyle Kelley and Jessica Hamrick and Jason Grout and Sylvain Corlay and Paul Ivanov and Dami{\'a}n Avila and Safia Abdalla and Carol Willing},
booktitle = {Positioning and Power in Academic Publishing: Players, Agents and Agendas},
editor = {F. Loizides and B. Schmidt},
publisher = {IOS Press},
pages = {87 -- 90},
year = {2016},
doi = {10.3233/978-1-61499-649-1-87}
}
@article{OCTA,
Expand Down Expand Up @@ -128,9 +127,7 @@ @article{murray2020
number = {7},
pages = {28},
issn = {1534-7362},
doi = {10/gh57gf},
urldate = {2021-03-01},
langid = {english}
doi = {10/gh57gf}
}

@article{murray2021,
Expand All @@ -155,21 +152,17 @@ @article{peirce2019
doi = {10.3758/s13428-018-01193-y}
}

@article{schmittwilken2022a,
type = {Talk},
title = {{{BRENCH}}: {{An}} Open-Source Framework for b(r)Enchmarking Brightness Models},
shorttitle = {Contributed {{Session III}}},
author = {Schmittwilken, L. and Matic, M. and Maertens, M. and Vincent, J.},
year = {2022},
month = feb,
journal = {Journal of Vision},
volume = {22},
pages = {36},
address = {{Online}},
doi = {10.1167/jov.22.3.36},
urldate = {2022-03-04},
copyright = {All rights reserved},
langid = {english}
@inproceedings{schmittwilken2022a,
type = {talk},
title = {{{BRENCH}}: {{An}} Open-Source Framework for b(r)Enchmarking Brightness Models},
author = {Schmittwilken, L. and Matic, M. and Maertens, M. and Vincent, J.},
year = {2022},
month = feb,
booktitle = {Journal of Vision},
volume = {22},
pages = {36},
address = {{Online}},
doi = {10.1167/jov.22.3.36}
}

@article{schmittwilken2022b,
Expand All @@ -180,31 +173,31 @@ @article{schmittwilken2022b
volume = {22},
number = {8},
pages = {1--12},
doi = {10.1167/jov.22.8.5},
langid = {english}
doi = {10.1167/jov.22.8.5}
}

@article{schmittwilken2022c,
type = {Poster},
@inproceedings{schmittwilken2022c,
type = {poster},
title = {Medium Spatial Frequencies Mask Edges Most Effectively},
author = {Schmittwilken, L. and Maertens, M.},
year = {2022},
month = dec,
journal = {Journal of Vision},
booktitle = {Journal of Vision},
volume = {22},
address = {{Online}},
doi = {10.1167/jov.22.14.4041},
copyright = {All rights reserved}
doi = {10.1167/jov.22.14.4041}
}

@misc{vincent.maertens.ea2021,
type = {Talk},
title = {Perceptual Brightness Scales in a {{White}}'s Effect Stimulus Are Not Captured by Multiscale Spatial Filtering Models of Brightness Perception},
author = {Vincent, Joris and Maertens, Marianne and Aguilar, Guillermo},
year = {2021},
month = oct,
address = {{Online}},
langid = {english}
@inproceedings{vincent.maertens.ea2021,
type = {poster},
title = {Perceptual Brightness Scales in a {{White}}'s Effect Stimulus Are Not Captured by Multiscale Spatial Filtering Models of Brightness Perception},
author = {Vincent, Joris and Maertens, Marianne and Aguilar, Guillermo},
year = {2022},
month = feb,
volume = {22},
pages = {20},
booktitle = {Journal of {{Vision}}},
doi = {10.1167/jov.22.3.20}
}

@inproceedings{vincent.maertens.ea2022,
Expand All @@ -216,21 +209,18 @@ @inproceedings{vincent.maertens.ea2022
volume = {22},
pages = {4160},
address = {{St. Pete Beach, FL}},
doi = {10.1167/jov.22.14.4160},
urldate = {2023-03-24},
langid = {english},
doi = {10.1167/jov.22.3.20},
doi = {10.1167/jov.22.14.4160}
}

@misc{vincent.maertens2021,
type = {Talk},
type = {talk},
title = {The Missing Linking Functions in Computational Models of Brightness Perception},
author = {Vincent, Joris and Maertens, Marianne},
year = {2021},
address = {{Online}},
langid = {english},
url = {osf.io/9bca7},
publisher = {OSF},
publisher = {OSF}
}

@inproceedings{vincent.maertens2021a,
Expand All @@ -241,11 +231,8 @@ @inproceedings{vincent.maertens2021a
month = may,
volume = {21},
pages = {2824},
publisher = {{Journal of Vision}},
address = {{Online}},
doi = {10.1167/jov.21.9.2824},
urldate = {2023-02-17},
langid = {english}
doi = {10.1167/jov.21.9.2824}
}

@article{wang2008,
Expand Down
2 changes: 1 addition & 1 deletion manuscript/paper.md
View file
Expand Up @@ -117,7 +117,7 @@ where many functions share the same —intuitive— parameters.
This makes it easier to explore parameters and to create novel stimuli.

OCTA is also a Python package to generate stimuli,
specifically grids of multiple elements that can be show regularity and variety
specifically grids of multiple elements that show regularity and variety
along various stimulus dimensions.
These stimuli are of particular use to studies on Gestalt vision,
aesthetics and complexity.
Expand Down

0 comments on commit f756c54

Please sign in to comment.