From 44a303bc0c54f052605c0d7922ff21168a30b254 Mon Sep 17 00:00:00 2001 From: Joris Vincent Date: Thu, 21 Sep 2023 19:45:10 +0200 Subject: [PATCH 1/3] build: only trigger publishing workflow once per release --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e323c35..5fa95c95 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,7 @@ name: Release to PyPI on: release: + types: [released] workflow_dispatch: jobs: From 37bac3d708c8eb11f897ea09dfe94acabe5fdba1 Mon Sep 17 00:00:00 2001 From: Joris Vincent Date: Fri, 22 Sep 2023 15:20:54 +0200 Subject: [PATCH 2/3] build: configure `codespell` to fix misspellings Requires python^3.11.0 to use pyproject.toml Exclude everything in `docs/_build`, and the exact lines in `.codespell.ignore` Also add to pre-commit checks --- .codespell.ignore | 2 ++ .pre-commit-config.yaml | 7 ++++++- pyproject.toml | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .codespell.ignore diff --git a/.codespell.ignore b/.codespell.ignore new file mode 100644 index 00000000..dca8568e --- /dev/null +++ b/.codespell.ignore @@ -0,0 +1,2 @@ + **F**indable, **A**ccessible, **I**nteroperable, and **R**eusable + Pflügers Archiv für die gesamte Physiologie. 3: 13-15. diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4121c6d8..4cd1c554 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,4 +16,9 @@ repos: hooks: - id: flake8 # Ignore all format-related checks as Black takes care of those. - args: ["--ignore", "E203,E501,W503,F403", "--select", "E,W,F", '--per-file-ignores=__init__.py:F401,F405,E402', '--exclude','tests/*'] \ No newline at end of file + args: ["--ignore", "E203,E501,W503,F403", "--select", "E,W,F", '--per-file-ignores=__init__.py:F401,F405,E402', '--exclude','tests/*'] + + - repo: https://github.com/codespell-project/codespell + rev: v2.2.4 + hooks: + - id: codespell \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index c95416eb..01da14fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,3 +84,8 @@ type = "github" [tool.semantic_release.publish] upload_to_vcs_release = true # upload sdist, wheel to release-tag + + +[tool.codespell] +skip = "./docs/_build/*" +exclude-file = ".codespell.ignore" From de8efb4ece275f025713b69ccaff4e48c38539a6 Mon Sep 17 00:00:00 2001 From: Joris Vincent Date: Fri, 22 Sep 2023 15:35:08 +0200 Subject: [PATCH 3/3] style: use codespell to fix misspellings --- CHANGELOG.md | 250 +++++++++---------- README.md | 2 +- docs/contributing/dev_environ.md | 2 +- docs/contributing/sets.md | 2 +- docs/getting_started/composition.md | 2 +- docs/getting_started/first_stim.md | 2 +- docs/howtos/export.md | 2 +- docs/howtos/share.md | 2 +- docs/reference/demos/stimuli/sbcs.md | 4 +- docs/topic_guides/organization.md | 4 +- docs/topic_guides/waves.md | 4 +- stimupy/components/frames.py | 4 +- stimupy/components/lines.py | 2 +- stimupy/components/radials.py | 2 +- stimupy/components/shapes.py | 2 +- stimupy/components/waves.py | 10 +- stimupy/papers/domijan2015.py | 2 +- stimupy/papers/modelfest.py | 6 +- stimupy/stimuli/bullseyes.py | 6 +- stimupy/stimuli/checkerboards.py | 6 +- stimupy/stimuli/cornsweets.py | 2 +- stimupy/stimuli/gabors.py | 2 +- stimupy/stimuli/gratings.py | 6 +- stimupy/stimuli/rings.py | 2 +- stimupy/stimuli/sbcs.py | 6 +- stimupy/stimuli/waves.py | 26 +- stimupy/stimuli/whites.py | 8 +- stimupy/utils/contrast_conversions.py | 6 +- stimupy/utils/pad.py | 2 +- stimupy/utils/resolution.py | 28 +-- stimupy/utils/utils.py | 4 +- tests/test_resolve_resolutions.py | 14 +- tests/test_validate_resolution_components.py | 2 +- 33 files changed, 211 insertions(+), 213 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e343979d..c50be5a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,7 +40,7 @@ * docs(demos): rings.circular_generalized ([`a19a1c4`](https://github.com/computational-psychology/stimupy/commit/a19a1c45e4e40f78a40528f1ffd1386e3f483f88)) -* docs(demos): fix White's demo ([`37b70c3`](https://github.com/computational-psychology/stimupy/commit/37b70c327a360aa1d94655b8e786e80eac429f50)) +* docs(demos): fix White's demo ([`37b70c3`](https://github.com/computational-psychology/stimupy/commit/37b70c327a360aa1d94655b8e786e80eac429f50)) * docs(demos): text demo ([`ef686f3`](https://github.com/computational-psychology/stimupy/commit/ef686f3e8ae280905938538d8479127475c3e16d)) @@ -105,7 +105,7 @@ Now that indexing is 1-based. ([`92c9e1b`](https://github.com/computational-psyc * fix(pad_dict): should also update ppd, visual_size, if it can ([`dab5bf5`](https://github.com/computational-psychology/stimupy/commit/dab5bf5e93dc2ed6133b79e4ef69a50b4e43b5c5)) -* fix(RHS2007): correct targets in Todorovic' Benary 1_2, 3_4 +* fix(RHS2007): correct targets in Todorovic' Benary 1_2, 3_4 Closes #90 @@ -201,9 +201,9 @@ New features, refactoring, and fixes ([`3788170`](https://github.com/computation * Merge pull request #107 from computational-psychology/feat_sbcs_circular -Add more `sbcs.`. -`sbcs.square()` and `sbcs.circular()`, parameterized using `target_radius` and `surround_radius`, based on `bullseyes.square()` and `.circular()`. -Adds some `_two_sided()` versions as well, which are now used in some `papers`. +Add more `sbcs.`. +`sbcs.square()` and `sbcs.circular()`, parameterized using `target_radius` and `surround_radius`, based on `bullseyes.square()` and `.circular()`. +Adds some `_two_sided()` versions as well, which are now used in some `papers`. Also enable `rotation` arg in `sbcs.generalized()`. ([`d1510e9`](https://github.com/computational-psychology/stimupy/commit/d1510e9b45f629b8c4fa9fc64a8512016dd83780)) * docs(demos):`sbcs.circular`, `.square` demos ([`81b5528`](https://github.com/computational-psychology/stimupy/commit/81b552898c664522e0f6a28840822d12a17351ac)) @@ -212,7 +212,7 @@ Also enable `rotation` arg in `sbcs.generalized()`. ([`d1510e9`](https://github. Easier `_two_sided`-stimuli functions ([`7ba0bee`](https://github.com/computational-psychology/stimupy/commit/7ba0beeb618b82a3c9963dd1dc3cd308bd98f753)) -* Merge branch 'dev' into refactor_two_sided ([`db94838`](https://github.com/computational-psychology/stimupy/commit/db9483882c7265236045fd3a9e81fa0dec1ad788)) +* Merge branch `dev` into refactor_two_sided ([`db94838`](https://github.com/computational-psychology/stimupy/commit/db9483882c7265236045fd3a9e81fa0dec1ad788)) * Merge pull request #103 from computational-psychology/refactor_intensities @@ -224,14 +224,14 @@ Refactor ModelFest comparison to original images ([`4218dc3`](https://github.com * Merge pull request #101 from computational-psychology/refactor_targets -Refactor target placement in various stimuli. - -Add `mask_targets()` and `place_targets()` general-purpose functions which can be used to designate target "elements" (bars, rings, frames, etc.) from an existing `_mask`. - -Integrate new functions into `waves`, `pinwheels`, `rings` and `whites` - -Add `rings.circular_generalized()` and `bullseye.circular_generalized()` using new functions - +Refactor target placement in various stimuli. + +Add `mask_targets()` and `place_targets()` general-purpose functions which can be used to designate target "elements" (bars, rings, frames, etc.) from an existing `_mask`. + +Integrate new functions into `waves`, `pinwheels`, `rings` and `whites` + +Add `rings.circular_generalized()` and `bullseye.circular_generalized()` using new functions + This single-implementation of target placement has the advantage that it all works the same: first element is 1, target_indices can be negative (counting "backwards" from the last bar/ring/etc.). ([`885ec6c`](https://github.com/computational-psychology/stimupy/commit/885ec6c59af9fc1fcf9cf92333581e433746574f)) * Merge pull request #100 from computational-psychology/build_refresh @@ -490,14 +490,14 @@ Automatically generated by python-semantic-release ([`c394202`](https://github.c Review issues: documentation, exporting, bugfixes. ([`031189a`](https://github.com/computational-psychology/stimupy/commit/031189abc6d618adbbf75e367705fd46a2be1841)) -* Merge branch 'dev_docs' of https://github.com/computational-psychology/stimupy into dev_docs ([`d16e88f`](https://github.com/computational-psychology/stimupy/commit/d16e88fa5ad8e0b05109e6d3fb5c26d63bdac5ac)) +* Merge branch `dev_docs` of https://github.com/computational-psychology/stimupy into dev_docs ([`d16e88f`](https://github.com/computational-psychology/stimupy/commit/d16e88fa5ad8e0b05109e6d3fb5c26d63bdac5ac)) ## v0.100.0 (2023-04-10) ### Build -* build: GHA worfklow upload release assets to TestPyPI +* build: GHA workflow upload release assets to TestPyPI Downloads assets (sdist, wheel), from latest release-tag, and uploads to PyPI ([`dd37065`](https://github.com/computational-psychology/stimupy/commit/dd37065bd5ef9b7fb83b9edccb187f11ef5c1161)) @@ -512,7 +512,7 @@ And allow manual trigger ([`927f029`](https://github.com/computational-psycholog Use Setuptools build-backend. Tell PSR to build from `main`, using PyPAs Build ([`649b078`](https://github.com/computational-psychology/stimupy/commit/649b078e087eb14343d10b4b8ea7cc35434c4a68)) -* build(vesion): don't auto-bump to `v1.0.0` +* build(version): don't auto-bump to `v1.0.0` All BREAKING CHANGES will bump minor instead of major version ([`8889e56`](https://github.com/computational-psychology/stimupy/commit/8889e56cbdda3227392729f97267f53656071f7a)) @@ -530,7 +530,7 @@ and on manual trigger ([`85852e0`](https://github.com/computational-psychology/s * build: Create bump-commit as well -Otherwise the updated version numbers in pyproject.toml and __init__.py won't actually be commited ([`c084f69`](https://github.com/computational-psychology/stimupy/commit/c084f6908adc5acfa628f10458b5177434b87cde)) +Otherwise the updated version numbers in pyproject.toml and __init__.py won't actually be committed ([`c084f69`](https://github.com/computational-psychology/stimupy/commit/c084f6908adc5acfa628f10458b5177434b87cde)) * build: Use PSR to manage version number ([`a1d5e18`](https://github.com/computational-psychology/stimupy/commit/a1d5e18f65f5be2ec93f747234b142399816f8fb)) @@ -620,7 +620,7 @@ Both for consistency, and to make rectilinear distances rotatable. ([`4d62316`]( * refactor(image_base): `rotation` consistent, extra `oblique_y` -`rotation` argument now consistently rotations counterclockwise from 3 o'clock position (in line with mathematical convention, i.e., unit circle) +`rotation` argument now consistently rotations counterclockwise from 3 o'clock position (in line with mathematical convention, i.e., unit circle) Also added an `oblique_y` metric, orthogonal to `oblique` (which is implicit `oblique_x`) ([`8e17857`](https://github.com/computational-psychology/stimupy/commit/8e17857975077f0eaf70edcd4d119c5dcfe5aab4)) @@ -640,11 +640,11 @@ Automatically generated by python-semantic-release ([`3d89415`](https://github.c Dev: refactor, documentation, improve build ([`bc1289c`](https://github.com/computational-psychology/stimupy/commit/bc1289cb5c53d7476aa3f3581a84101e7bc887e3)) -* Merge branch 'build_release' into dev ([`3acc86f`](https://github.com/computational-psychology/stimupy/commit/3acc86f14de4beb4b2d3673a399bbad42d6a898f)) +* Merge branch `build_release` into dev ([`3acc86f`](https://github.com/computational-psychology/stimupy/commit/3acc86f14de4beb4b2d3673a399bbad42d6a898f)) -* Merge branch 'docs' into dev ([`6c62384`](https://github.com/computational-psychology/stimupy/commit/6c623840e5ed3f55cda81791559336a518c2792a)) +* Merge branch `docs` into dev ([`6c62384`](https://github.com/computational-psychology/stimupy/commit/6c623840e5ed3f55cda81791559336a518c2792a)) -* Merge branch 'refactor' into dev ([`5992727`](https://github.com/computational-psychology/stimupy/commit/599272740c0651ae9853af4ede480cb04d50fb66)) +* Merge branch `refactor` into dev ([`5992727`](https://github.com/computational-psychology/stimupy/commit/599272740c0651ae9853af4ede480cb04d50fb66)) * Merge pull request #68 from computational-psychology/dev_version @@ -656,8 +656,8 @@ Automatically generated by python-semantic-release ([`ebda6b3`](https://github.c * Merge pull request #62 from computational-psychology/feat_consistent_todorovics -fix(todorovics): Consistent behavior for `todorovics.rectangle` and `.cross` - +fix(todorovics): Consistent behavior for `todorovics.rectangle` and `.cross` + Closes #61 ([`616e96d`](https://github.com/computational-psychology/stimupy/commit/616e96d74c16de9bba3b115d6a94b4828f59117d)) * closes #61; consistent todorovic rectangle and cross behavior ([`ff9b47f`](https://github.com/computational-psychology/stimupy/commit/ff9b47f5604f77130c305ef7fc8eb5343396cd9b)) @@ -765,7 +765,7 @@ Update JOSS manuscript ([`bad3d76`](https://github.com/computational-psychology/ Docs: add remaining demos (still a few demos missing for stimuli.gratings) ([`90a29a2`](https://github.com/computational-psychology/stimupy/commit/90a29a29e0318619d9fa73fc37098a47468f27ba)) -* Merge branch 'main' into docs_demos ([`b63e43d`](https://github.com/computational-psychology/stimupy/commit/b63e43d8b9569e7634bcac90f09a9710477bc2a0)) +* Merge branch `main` into docs_demos ([`b63e43d`](https://github.com/computational-psychology/stimupy/commit/b63e43d8b9569e7634bcac90f09a9710477bc2a0)) * Merge pull request #50 from computational-psychology/feat_whites @@ -821,7 +821,7 @@ Bugfix: Todorovics ([`37d8535`](https://github.com/computational-psychology/stim Bugfix: angular frequency in cycles per image ([`acef103`](https://github.com/computational-psychology/stimupy/commit/acef103722ae2c94c555a1deddd51b026e1a06fc)) -* Merge branch 'docs_demos' of github.com:computational-psychology/stimupy into docs_demos ([`35524d8`](https://github.com/computational-psychology/stimupy/commit/35524d82c5bea9925a2c8bb7dd3bbab5b631c56f)) +* Merge branch `docs_demos` of github.com:computational-psychology/stimupy into docs_demos ([`35524d8`](https://github.com/computational-psychology/stimupy/commit/35524d82c5bea9925a2c8bb7dd3bbab5b631c56f)) * added todorovics-demos ([`64925d4`](https://github.com/computational-psychology/stimupy/commit/64925d4c6397aa304895cd19e103907602f42250)) @@ -835,7 +835,7 @@ Bugfix: angular frequency in cycles per image ([`acef103`](https://github.com/co Moving noise-utils to noise-init ([`fcf4717`](https://github.com/computational-psychology/stimupy/commit/fcf4717d66a62fc96f4d7042d8ba58a2951ee685)) -* Merge branch 'main' into feat_noise_utils ([`3b78791`](https://github.com/computational-psychology/stimupy/commit/3b78791c20c1c5f4dd8da646666ff80574f82784)) +* Merge branch `main` into feat_noise_utils ([`3b78791`](https://github.com/computational-psychology/stimupy/commit/3b78791c20c1c5f4dd8da646666ff80574f82784)) * Demo: stimuli/SBCs ([`2ac4162`](https://github.com/computational-psychology/stimupy/commit/2ac4162e25256cdec097c77f894237f1ba9fbe25)) @@ -847,7 +847,7 @@ Waves, primarily angular ([`f42bb0e`](https://github.com/computational-psycholog * Bugfix overview `wedge` ([`f1e5a9d`](https://github.com/computational-psychology/stimupy/commit/f1e5a9dacad30637e0182469ff01b99beb848fd8)) -* Merge branch 'main' into feat_waves ([`799fb5b`](https://github.com/computational-psychology/stimupy/commit/799fb5b6613bb64a5abc696d95e191b7b93d9922)) +* Merge branch `main` into feat_waves ([`799fb5b`](https://github.com/computational-psychology/stimupy/commit/799fb5b6613bb64a5abc696d95e191b7b93d9922)) * added gabors to __all__ in plaids ([`21b4d8d`](https://github.com/computational-psychology/stimupy/commit/21b4d8d750916c526cc80638fc716f461ed3ed68)) @@ -868,7 +868,7 @@ Replaces `extent_key`, but serves the same purpose. Can put in either: Closes #9 ([`550a22e`](https://github.com/computational-psychology/stimupy/commit/550a22ec280e37346a974a98de0978599aa05d92)) -* Merge branch 'main' into dev ([`1db171a`](https://github.com/computational-psychology/stimupy/commit/1db171a6830e676d5950686ce14f593862506ead)) +* Merge branch `main` into dev ([`1db171a`](https://github.com/computational-psychology/stimupy/commit/1db171a6830e676d5950686ce14f593862506ead)) * Docs: bugfix tutorial - update references to `stimuli` (from `illusions`) (#36) @@ -1023,7 +1023,7 @@ Reorganized (and updated) existing demos to fit new organization ([`cd8f644`](ht * Move `illusions.angulars` -> `pinwheels` ([`26bba52`](https://github.com/computational-psychology/stimupy/commit/26bba52ff51f5b1e532b053f495fb659a2817ef5)) -* Merge branch 'feat_cityblock' into dev_reorganize ([`2969f95`](https://github.com/computational-psychology/stimupy/commit/2969f95f77b623363ee3879a485de1dc6be5d726)) +* Merge branch `feat_cityblock` into dev_reorganize ([`2969f95`](https://github.com/computational-psychology/stimupy/commit/2969f95f77b623363ee3879a485de1dc6be5d726)) * Remove obsolete `illusions.frames` ([`59d1920`](https://github.com/computational-psychology/stimupy/commit/59d192045439641e887107a896ece2c7032c7a11)) @@ -1043,7 +1043,7 @@ Reorganized (and updated) existing demos to fit new organization ([`cd8f644`](ht * Add Cityblock waves ([`1fec019`](https://github.com/computational-psychology/stimupy/commit/1fec019c204a40a3f46b082bb0c74aee3193e4b9)) -* Merge branch 'feat_radial' into dev_reorganize ([`b316b5b`](https://github.com/computational-psychology/stimupy/commit/b316b5b05aea092b8f417cdc1976538ed8df1efe)) +* Merge branch `feat_radial` into dev_reorganize ([`b316b5b`](https://github.com/computational-psychology/stimupy/commit/b316b5b05aea092b8f417cdc1976538ed8df1efe)) * Rename `components.circulars` -> `components.radials` ([`3c3d434`](https://github.com/computational-psychology/stimupy/commit/3c3d43402a24eaf58ccd6ae9f20d2d8eeb6993ac)) @@ -1053,7 +1053,7 @@ Reorganized (and updated) existing demos to fit new organization ([`cd8f644`](ht * Replace `circular.rings` by `waves.square_radial` ([`c30c9e1`](https://github.com/computational-psychology/stimupy/commit/c30c9e191aac89b8cc30e8b690804e16aae0fc82)) -* Circular White's uses (is) `waves.square_radial` ([`2aa7623`](https://github.com/computational-psychology/stimupy/commit/2aa762378d87fa9c4cc3964546280b70c924694f)) +* Circular White's uses (is) `waves.square_radial` ([`2aa7623`](https://github.com/computational-psychology/stimupy/commit/2aa762378d87fa9c4cc3964546280b70c924694f)) * Add `clip`ping to `waves._radial` ([`2dd9297`](https://github.com/computational-psychology/stimupy/commit/2dd9297256c19c5bab2912360b6a18b4b444d422)) @@ -1071,7 +1071,7 @@ Reorganized (and updated) existing demos to fit new organization ([`cd8f644`](ht * Absorb `components.checkerboards` into `stimupy.checkerboard` ([`8b3db94`](https://github.com/computational-psychology/stimupy/commit/8b3db94e72ed88fde6eb5b9ff89b28c28acc280f)) -* Merge branch 'feat_waves_gratings' into dev_reorganize ([`05c1db1`](https://github.com/computational-psychology/stimupy/commit/05c1db104c7377d7ebbf58c482e7a3605f78d763)) +* Merge branch `feat_waves_gratings` into dev_reorganize ([`05c1db1`](https://github.com/computational-psychology/stimupy/commit/05c1db104c7377d7ebbf58c482e7a3605f78d763)) * Remove deprecated `components.gratings` ([`d73500c`](https://github.com/computational-psychology/stimupy/commit/d73500ce7e11800db8d08cc6643beb3280445a42)) @@ -1172,7 +1172,7 @@ Closes #11 ([`54584f9`](https://github.com/computational-psychology/stimupy/comm * Wedding Cake as toplevel stimulus module ([`01b4451`](https://github.com/computational-psychology/stimupy/commit/01b4451299cf86500b90a67c90ec248e9bc8baf7)) -* White's as toplevel stimulus module ([`a59b28d`](https://github.com/computational-psychology/stimupy/commit/a59b28d1c855029a3d267465a32f9655854afbc6)) +* White's as toplevel stimulus module ([`a59b28d`](https://github.com/computational-psychology/stimupy/commit/a59b28d1c855029a3d267465a32f9655854afbc6)) * Mondrians as toplevel stimulus @@ -1190,7 +1190,7 @@ Added majority of demos and related bug-fixes ([`52108e5`](https://github.com/co These should all point to the current `HEAD` (rather than `dev_docs` ([`65d8533`](https://github.com/computational-psychology/stimupy/commit/65d85334aec5af21fc96a19c0e998728d5dafa7a)) -* Merge branch 'main' into lynn_issues ([`258bd0c`](https://github.com/computational-psychology/stimupy/commit/258bd0c81da17ceb175c1da51ac111f8b82666ff)) +* Merge branch `main` into lynn_issues ([`258bd0c`](https://github.com/computational-psychology/stimupy/commit/258bd0c81da17ceb175c1da51ac111f8b82666ff)) * fixed bugs in part of illusions gratings; and started gratings-demo ([`5b9d48d`](https://github.com/computational-psychology/stimupy/commit/5b9d48dae1f40df2c5c385e62b81313a12483196)) @@ -1238,7 +1238,7 @@ Dev: simplify installing dev environments ([`402e5e3`](https://github.com/comput * Bugfix: __all__ in stimupy.components should be list of str ([`b253954`](https://github.com/computational-psychology/stimupy/commit/b25395410a335902e1bb38bcf14cd7a770893696)) -* Merge remote-tracking branch 'github-public/main' into dev_docs ([`ffea283`](https://github.com/computational-psychology/stimupy/commit/ffea283d3298a55426b7a6bbc4de087a2b3c3e6d)) +* Merge remote-tracking branch `github-public/main` into dev_docs ([`ffea283`](https://github.com/computational-psychology/stimupy/commit/ffea283d3298a55426b7a6bbc4de087a2b3c3e6d)) * Docs: define public API for components @@ -1254,7 +1254,7 @@ Export only the entries in __all__ ([`fbf19b4`](https://github.com/computational * Docs: Fix references in docstrings ([`312ddec`](https://github.com/computational-psychology/stimupy/commit/312ddeccbff554b76a8cb84b5ac559032c9e466e)) -* Update requirements.txt's ([`3d3a457`](https://github.com/computational-psychology/stimupy/commit/3d3a4578c95c114f0ef1b8521d11fbf48d811369)) +* Update requirements.txt's ([`3d3a457`](https://github.com/computational-psychology/stimupy/commit/3d3a4578c95c114f0ef1b8521d11fbf48d811369)) * Docs-dependencies specified in pyproject.toml @@ -1340,17 +1340,17 @@ Enable Continuous Integration (CI) ([`a5203fe`](https://github.com/computational Fixes some flake8 warnings ([`5f437bb`](https://github.com/computational-psychology/stimupy/commit/5f437bb20bdd05f570c677d88d3371512e5ad62e)) -* Pyupgrades: remove 'r' from open(json) ([`c2bfe08`](https://github.com/computational-psychology/stimupy/commit/c2bfe0886ad9e77b3201b5e2b0d5a6234622ba69)) +* Pyupgrades: remove 'r' from open(json) ([`c2bfe08`](https://github.com/computational-psychology/stimupy/commit/c2bfe0886ad9e77b3201b5e2b0d5a6234622ba69)) * Pyupgrade as pre-commit hook Upgrades syntax to newer forms ([`34cecaf`](https://github.com/computational-psychology/stimupy/commit/34cecaf3af2985245b56962cf98f96f4796284b8)) -* Black'en ([`2af2109`](https://github.com/computational-psychology/stimupy/commit/2af21096051a339f649e6e5410988086e3707907)) +* Black'en ([`2af2109`](https://github.com/computational-psychology/stimupy/commit/2af21096051a339f649e6e5410988086e3707907)) * Black: also format Jupyter Notebooks ([`f97700b`](https://github.com/computational-psychology/stimupy/commit/f97700bf84310fab12b8dbc5365d7d22552652a3)) -* flake8: don't check for naming, tests, ignore some (import) errors in inits ([`2727279`](https://github.com/computational-psychology/stimupy/commit/272727919644a49df29663222adfaea76659a9b0)) +* flake8: don't check for naming, tests, ignore some (import) errors in inits ([`2727279`](https://github.com/computational-psychology/stimupy/commit/272727919644a49df29663222adfaea76659a9b0)) * Add GHA workflow for linting + formatting ([`16ccb5d`](https://github.com/computational-psychology/stimupy/commit/16ccb5d6c3e12c9a929ed9afde35fa412efd6077)) @@ -1366,7 +1366,7 @@ Upgrades syntax to newer forms ([`34cecaf`](https://github.com/computational-psy Was failing on masks (but not images) of paper stimuli ([`e571c58`](https://github.com/computational-psychology/stimupy/commit/e571c58ebd2b4eed7d0ad9c342bc9b3bf1452488)) -* Don't "fail fast", i.e., complete all platforms, even if earlier fails ([`573cdc3`](https://github.com/computational-psychology/stimupy/commit/573cdc321b7fabb0ba2b743e2a8e32061c7b1a7c)) +* Don't "fail fast", i.e., complete all platforms, even if earlier fails ([`573cdc3`](https://github.com/computational-psychology/stimupy/commit/573cdc321b7fabb0ba2b743e2a8e32061c7b1a7c)) * Run tests on multiple platforms ([`272bcab`](https://github.com/computational-psychology/stimupy/commit/272bcab1820f5ec26dca8bd36b929400e494008a)) @@ -1393,13 +1393,13 @@ Was failing on masks (but not images) of paper stimuli ([`e571c58`](https://gith * added new frames and circular components to overview ([`d15d172`](https://github.com/computational-psychology/stimupy/commit/d15d1724bdf8b8187aeea7962e100f9616d9ccd3)) -* made draw_sine_wave seperate; added frames and circulars sine-wave and square-wave; corrected bug in circular gratings ([`9d7fb21`](https://github.com/computational-psychology/stimupy/commit/9d7fb218a4dae958ed7a86a2f146ed4856288646)) +* made draw_sine_wave separate; added frames and circulars sine-wave and square-wave; corrected bug in circular gratings ([`9d7fb21`](https://github.com/computational-psychology/stimupy/commit/9d7fb218a4dae958ed7a86a2f146ed4856288646)) * GitHub Actions configuration ([`24dcd15`](https://github.com/computational-psychology/stimupy/commit/24dcd15b0809fbf684eabe889b6fa6f9350f15fa)) * Requirements for installing pytest ([`2de2a32`](https://github.com/computational-psychology/stimupy/commit/2de2a32b955ca4d7d1fa2a30e45278f1e44a25ca)) -* Merge branch 'feat_demos' into dev_docs ([`09cc5b7`](https://github.com/computational-psychology/stimupy/commit/09cc5b7eac9ae7b3013c9812201cffc52748d00f)) +* Merge branch `feat_demos` into dev_docs ([`09cc5b7`](https://github.com/computational-psychology/stimupy/commit/09cc5b7eac9ae7b3013c9812201cffc52748d00f)) * Add demo basic shapes ([`a1e6234`](https://github.com/computational-psychology/stimupy/commit/a1e6234ca0d9980a743cf8146a1e59b460b00256)) @@ -1407,11 +1407,11 @@ Was failing on masks (but not images) of paper stimuli ([`e571c58`](https://gith Components, illusions have demos -- utils & papers do not ([`44b7814`](https://github.com/computational-psychology/stimupy/commit/44b781400cc1f45405a482fe8a1534a18e9e63e5)) -* Merge branch 'feat_API' into dev_docs ([`27faa20`](https://github.com/computational-psychology/stimupy/commit/27faa209aee55e79492d61bb1dd451031fbe0f2d)) +* Merge branch `feat_API` into dev_docs ([`27faa20`](https://github.com/computational-psychology/stimupy/commit/27faa209aee55e79492d61bb1dd451031fbe0f2d)) * Use custom template for API reference -This requires the config `templates_path` to be set, in order to find the template(s). Unforunately, this seems to overwrite where the theme cannot find its templates anymore. We can get around this for now by fixing some older versions of sphinx-book-theme and pydata-sphinx-theme ([`63bdb5b`](https://github.com/computational-psychology/stimupy/commit/63bdb5b3a3d2e9cf4bc40e3bfc0149bc673c4565)) +This requires the config `templates_path` to be set, in order to find the template(s). Unfortunately, this seems to overwrite where the theme cannot find its templates anymore. We can get around this for now by fixing some older versions of sphinx-book-theme and pydata-sphinx-theme ([`63bdb5b`](https://github.com/computational-psychology/stimupy/commit/63bdb5b3a3d2e9cf4bc40e3bfc0149bc673c4565)) * Autoinclude source-code in build HTMLs (and link from API reference) ([`aa59fbd`](https://github.com/computational-psychology/stimupy/commit/aa59fbd47da3883c3c8e5d5b44e6254ce2862de6)) @@ -1443,7 +1443,7 @@ As well as "summary" tables of members ([`1285041`](https://github.com/c Link to API ref from index ([`5f2b51a`](https://github.com/computational-psychology/stimupy/commit/5f2b51ab50a5920d95446d7583bf7eeb526bb19d)) -* Suppress warning about 'toctree directive not expected when using etoc' ([`5a31ec6`](https://github.com/computational-psychology/stimupy/commit/5a31ec6a013c9ef0fb9314cbb8c99a4d2db80807)) +* Suppress warning about 'toctree directive not expected when using etoc' ([`5a31ec6`](https://github.com/computational-psychology/stimupy/commit/5a31ec6a013c9ef0fb9314cbb8c99a4d2db80807)) * Build RTD docs using python3.11 ([`6cd9b62`](https://github.com/computational-psychology/stimupy/commit/6cd9b62b2263a01d76abf45b50738e9c3affc30f)) @@ -1451,7 +1451,7 @@ Link to API ref from index ([`5f2b51a`](https://github.com/computational-psychol * Update installation pip from GitHub -Use the "zipball" method, to avoid problems if a user doesn't have git installed ([`ad85f81`](https://github.com/computational-psychology/stimupy/commit/ad85f814839d285ada06aabdd8dc90f6844d53bf)) +Use the "zipball" method, to avoid problems if a user doesn't have git installed ([`ad85f81`](https://github.com/computational-psychology/stimupy/commit/ad85f814839d285ada06aabdd8dc90f6844d53bf)) * Configure intersphinx ([`d687715`](https://github.com/computational-psychology/stimupy/commit/d687715336427d82030dbe6fd4190c3b47d36803)) @@ -1465,7 +1465,7 @@ Use the "zipball" method, to avoid problems if a user doesn't have g * separated and added contrast conversion functions for arrays and dicts ([`770bcfd`](https://github.com/computational-psychology/stimupy/commit/770bcfdc8cb7b15f0f07c1306693f4acfbe7c327)) -* Merge branch 'feat_Binder' into dev_docs ([`21341e2`](https://github.com/computational-psychology/stimupy/commit/21341e22d30342a52cb7cafb0d57b22ec681847f)) +* Merge branch `feat_Binder` into dev_docs ([`21341e2`](https://github.com/computational-psychology/stimupy/commit/21341e22d30342a52cb7cafb0d57b22ec681847f)) * Add a binder `postBuild` file @@ -1531,13 +1531,13 @@ Publish (draft) documentation ([`9e37617`](https://github.com/computational-psyc * Some style updates to docs ([`18ddcea`](https://github.com/computational-psychology/stimupy/commit/18ddcea69282befa071d2b511439ef0968effc51)) -* Merge branch 'feat_tutorial' into dev_docs ([`81cb64d`](https://github.com/computational-psychology/stimupy/commit/81cb64dc057227f8e0a54a687f9689f3cacc5f46)) +* Merge branch `feat_tutorial` into dev_docs ([`81cb64d`](https://github.com/computational-psychology/stimupy/commit/81cb64dc057227f8e0a54a687f9689f3cacc5f46)) -* Merge branch 'feat_installing' into dev_docs ([`6d1cbab`](https://github.com/computational-psychology/stimupy/commit/6d1cbaba0804dee105b6dff0ae2e8946a44b1dd4)) +* Merge branch `feat_installing` into dev_docs ([`6d1cbab`](https://github.com/computational-psychology/stimupy/commit/6d1cbaba0804dee105b6dff0ae2e8946a44b1dd4)) * Update dependencies ([`78830db`](https://github.com/computational-psychology/stimupy/commit/78830db3edd6a8da5a5658eb7e2770b04828c31a)) -* Merge branch 'feat_JB' into dev_docs ([`2fa81ea`](https://github.com/computational-psychology/stimupy/commit/2fa81ea9607fa2dc92648b4b330194ac945c3626)) +* Merge branch `feat_JB` into dev_docs ([`2fa81ea`](https://github.com/computational-psychology/stimupy/commit/2fa81ea9607fa2dc92648b4b330194ac945c3626)) * Basic installation instructions ([`84f6b75`](https://github.com/computational-psychology/stimupy/commit/84f6b75faa93d4b6ba4ff2ecc9a052181a70e71b)) @@ -1551,9 +1551,9 @@ Publish (draft) documentation ([`9e37617`](https://github.com/computational-psyc * Basic skeleton for documentation ([`e699511`](https://github.com/computational-psychology/stimupy/commit/e69951145cb10e7c92d69568622cecb9bf5a84a5)) -* Merge branch 'dev' into main ([`cfd6047`](https://github.com/computational-psychology/stimupy/commit/cfd604767d636ac52be8aa74d7adadfe0f0a3b94)) +* Merge branch `dev` into main ([`cfd6047`](https://github.com/computational-psychology/stimupy/commit/cfd604767d636ac52be8aa74d7adadfe0f0a3b94)) -* Merge branch 'feat_packaging' into dev ([`8e36371`](https://github.com/computational-psychology/stimupy/commit/8e3637138a7192d3f9a6bb02e10796ccdc0b2533)) +* Merge branch `feat_packaging` into dev ([`8e36371`](https://github.com/computational-psychology/stimupy/commit/8e3637138a7192d3f9a6bb02e10796ccdc0b2533)) * Modern packaging setup @@ -1561,7 +1561,7 @@ Use only pyproject.toml Mark version in stimupy.__version__ ([`23b75ba`](https://github.com/computational-psychology/stimupy/commit/23b75ba446c8867036aae97047abd053aa9952fc)) -* Merge branch 'dev_rebrand' into dev ([`e124d3d`](https://github.com/computational-psychology/stimupy/commit/e124d3d99bc22ffa8f5a89d0ee2748234efc43a9)) +* Merge branch `dev_rebrand` into dev ([`e124d3d`](https://github.com/computational-psychology/stimupy/commit/e124d3d99bc22ffa8f5a89d0ee2748234efc43a9)) * Cleanup imports ([`ffa8dd3`](https://github.com/computational-psychology/stimupy/commit/ffa8dd3927376394b7490a2dbea606bda7b151a8)) @@ -1647,7 +1647,7 @@ Closes #109 ([`223777a`](https://github.com/computational-psychology/stimupy/com * updated masked grating use in overview ([`7dc712b`](https://github.com/computational-psychology/stimupy/commit/7dc712b0cfa7816a46f457db652fb20ba2e6814e)) -* closes #99; made all shapes rotateable, updated scripts and rhs2007 and white1981 for slight changes in parallelograms ([`6590b96`](https://github.com/computational-psychology/stimupy/commit/6590b96e81bbd0e6c73de0a2f160f81d95814cd8)) +* closes #99; made all shapes rotatable, updated scripts and rhs2007 and white1981 for slight changes in parallelograms ([`6590b96`](https://github.com/computational-psychology/stimupy/commit/6590b96e81bbd0e6c73de0a2f160f81d95814cd8)) * removed old backup grating file ([`33350e3`](https://github.com/computational-psychology/stimupy/commit/33350e306e3cdb01288356f99d52d5ea539ba3b5)) @@ -1765,11 +1765,11 @@ Closes #109 ([`223777a`](https://github.com/computational-psychology/stimupy/com * simplified code for calculating new shape - however, not working yet ([`b3a072d`](https://github.com/computational-psychology/stimupy/commit/b3a072d83c4998134b07566c6096139f855fba0e)) -* closes #76, closes #79; created utils-contrat-conversions and added contrast changing functions including transparancy ([`f180879`](https://github.com/computational-psychology/stimupy/commit/f1808793cef59be185504c05bd4a5762d63a2998)) +* closes #76, closes #79; created utils-contrat-conversions and added contrast changing functions including transparency ([`f180879`](https://github.com/computational-psychology/stimupy/commit/f1808793cef59be185504c05bd4a5762d63a2998)) * deleted old components backup ([`1e4f631`](https://github.com/computational-psychology/stimupy/commit/1e4f631a9748caf0f164fbf1f624b482f26306cd)) -* Merge branch 'rotated_gratings' into 'main' +* Merge branch `rotated_gratings` into `main` Rotated gratings, sinewaves, gabors @@ -1779,7 +1779,7 @@ See merge request computational-psychology/stimuli!26 ([`02e4f0d`](https://githu * Calculate 2D size/shape from 1D, for rotated gratings ([`438e361`](https://github.com/computational-psychology/stimupy/commit/438e3617c39ebc088cac790cc2fa1f06fd8d341d)) -* Merge branch 'feat_unify_gratings' into 'main' +* Merge branch `feat_unify_gratings` into `main` Rounding grating parameters @@ -1787,7 +1787,7 @@ See merge request computational-psychology/stimuli!25 ([`00b8949`](https://githu * Add round_phase_width flag -rounds phase_width to integer number of pixels. By default that's good behavior, but for angular gratings it isn't, so flag. ([`0095847`](https://github.com/computational-psychology/stimupy/commit/0095847348d7da2290a8047fac1ba912238dfde7)) +rounds phase_width to integer number of pixels. By default that's good behavior, but for angular gratings it isn't, so flag. ([`0095847`](https://github.com/computational-psychology/stimupy/commit/0095847348d7da2290a8047fac1ba912238dfde7)) * Update tests and paper stims ([`dc8d708`](https://github.com/computational-psychology/stimupy/commit/dc8d708cd1c305547906532f673e77b24a638b83)) @@ -1803,7 +1803,7 @@ rounds phase_width to integer number of pixels. By default that's good behav * first draft of rotatable gratings and sine-wave ([`34be9f8`](https://github.com/computational-psychology/stimupy/commit/34be9f86880b4ca94393a7c98662b2325655b61d)) -* Merge branch 'feat_shapes' into 'main' +* Merge branch `feat_shapes` into `main` Move basic shapes to stimuli.components.shapes module @@ -1866,7 +1866,7 @@ Closes #68 ([`b48467f`](https://github.com/computational-psychology/stimupy/comm ... all ints ([`1b70e79`](https://github.com/computational-psychology/stimupy/commit/1b70e796950d8914bad90c4d58a8cf184728d142)) -* Merge branch 'feat_unify_gratings' into 'main' +* Merge branch `feat_unify_gratings` into `main` Unify some of the grating resolving @@ -2026,11 +2026,11 @@ defaults for square-waves (1.0, 0.0): first phase is up, in line with sinewave ( * added all .ipynb_checkpoints to gitignore ([`3056654`](https://github.com/computational-psychology/stimupy/commit/3056654239119d925e523991c8918ee3df035865)) -* closes #58, added __all__ to all scipts, re-structured pink noise into one_over_frequency noise ([`289a3c8`](https://github.com/computational-psychology/stimupy/commit/289a3c857e3a771bfa6e634be728cd25c4d215fa)) +* closes #58, added __all__ to all scripts, re-structured pink noise into one_over_frequency noise ([`289a3c8`](https://github.com/computational-psychology/stimupy/commit/289a3c857e3a771bfa6e634be728cd25c4d215fa)) * removed contrast_metric, transparency, texture from init ([`9391e5d`](https://github.com/computational-psychology/stimupy/commit/9391e5d93d518584c817d5786c8666d8091fc039)) -* closes #7, closes #57; removed contrast_metric, transparancy and texture from main branch ([`324b08f`](https://github.com/computational-psychology/stimupy/commit/324b08fccfd8ad6a82760e825b71f0b6f45e2e25)) +* closes #7, closes #57; removed contrast_metric, transparency and texture from main branch ([`324b08f`](https://github.com/computational-psychology/stimupy/commit/324b08fccfd8ad6a82760e825b71f0b6f45e2e25)) * added scripts for white1981 and 1985 ([`293c16d`](https://github.com/computational-psychology/stimupy/commit/293c16d16ac183608494c9687c9355f80ea0a7a5)) @@ -2045,7 +2045,7 @@ Closes #14 ([`dd6d526`](https://github.com/computational-psychology/stimupy/comm * corrected bug - removed rings from init ([`6a0ed3e`](https://github.com/computational-psychology/stimupy/commit/6a0ed3eac234caed25d8c4d47821237ca1f07eab)) -* Merge branch 'feat_frames' into 'main' +* Merge branch `feat_frames` into `main` Frame-like stimuli @@ -2053,7 +2053,7 @@ Closes #41, #39, #40, and #47 See merge request computational-psychology/stimuli!22 ([`9b9d32e`](https://github.com/computational-psychology/stimupy/commit/9b9d32eeb5b9ea5a2b126bcf498dc1d7feeb44a8)) -* Merge branch 'feat_gratings' into 'main' +* Merge branch `feat_gratings` into `main` Gratings (square-wave) @@ -2101,9 +2101,9 @@ Closes #39, #40 ([`e00eee5`](https://github.com/computational-psychology/stimupy * Update grating_uniform ([`0f8cbc2`](https://github.com/computational-psychology/stimupy/commit/0f8cbc26e6a306188105491c9ec6d1015d7f019d)) -* Demo for square_wave 'illusion' ([`8646629`](https://github.com/computational-psychology/stimupy/commit/8646629cf860e833da7cc9adbc1a64b6277b0b04)) +* Demo for square_wave `illusion` ([`8646629`](https://github.com/computational-psychology/stimupy/commit/8646629cf860e833da7cc9adbc1a64b6277b0b04)) -* Rename and update square_wave 'illusion' to use square_wave component ([`2b57463`](https://github.com/computational-psychology/stimupy/commit/2b574635d63c6d11c940f9d2428ece4846e044a3)) +* Rename and update square_wave `illusion` to use square_wave component ([`2b57463`](https://github.com/computational-psychology/stimupy/commit/2b574635d63c6d11c940f9d2428ece4846e044a3)) * Update docstrings ([`18431b1`](https://github.com/computational-psychology/stimupy/commit/18431b10ecd4283b726e2eface816f56b25efc79)) @@ -2147,7 +2147,7 @@ Closes #47 ([`ebd02e5`](https://github.com/computational-psychology/stimupy/comm * fixed problem in todorovic that precision affected target placement ([`ee9d0f7`](https://github.com/computational-psychology/stimupy/commit/ee9d0f7c71c70b10616bc49451fb88e2120e6b65)) -* Merge branch 'feat_circular' into 'main' +* Merge branch `feat_circular` into `main` Circular and angular stimuli @@ -2155,13 +2155,13 @@ Closes #36 and #37 See merge request computational-psychology/stimuli!19 ([`944629d`](https://github.com/computational-psychology/stimupy/commit/944629dcf5d5c6717fe9d63a3a9c093e72952de0)) -* Merge branch 'feat_utils' into 'main' +* Merge branch `feat_utils` into `main` Utils for getting masked values, averages, etc. See merge request computational-psychology/stimuli!20 ([`b04feb6`](https://github.com/computational-psychology/stimupy/commit/b04feb604f1c1993c4abcf946e7916dc767e5174)) -* Merge branch 'feat_domijan' into 'main' +* Merge branch `feat_domijan` into `main` Solve resolution for Domijan2015 @@ -2195,7 +2195,7 @@ These originally come from BRENCH.postprocessing.utils ([`b319349`](https://gith * Move radial_white to illusions.angular ([`0ce2a6d`](https://github.com/computational-psychology/stimupy/commit/0ce2a6d8176132f9671644f094ce5ffd257d54b4)) -* Merge branch 'feat_angular' into feat_circular ([`ba48d57`](https://github.com/computational-psychology/stimupy/commit/ba48d57ea61289a4cd879578ad21dce6c58adf08)) +* Merge branch `feat_angular` into feat_circular ([`ba48d57`](https://github.com/computational-psychology/stimupy/commit/ba48d57ea61289a4cd879578ad21dce6c58adf08)) * Update and expand Demos ([`1e3d912`](https://github.com/computational-psychology/stimupy/commit/1e3d91287deaceda480558fc258d5d6b878acba3)) @@ -2299,7 +2299,7 @@ Closes #37 ([`16ebcbf`](https://github.com/computational-psychology/stimupy/comm * Extract disc, rings, to separate components.circular ([`97aaeef`](https://github.com/computational-psychology/stimupy/commit/97aaeefc90598d7bc5fca5bea0199949f19e5ff1)) -* Bugfix: don't auto-import utils.utils ([`d70b13f`](https://github.com/computational-psychology/stimupy/commit/d70b13f4cd92cd16f7f7504e382f5df001ee9168)) +* Bugfix: don't auto-import utils.utils ([`d70b13f`](https://github.com/computational-psychology/stimupy/commit/d70b13f4cd92cd16f7f7504e382f5df001ee9168)) * Update docstrings ([`4ccae85`](https://github.com/computational-psychology/stimupy/commit/4ccae85a8815ea2afbd9bb29edaf65f5ef7fc410)) @@ -2321,7 +2321,7 @@ not just resolution.resolve ([`449fc8f`](https://github.com/computational-psycho with padding is (100,200), not (100,180) ([`4e6dfa5`](https://github.com/computational-psychology/stimupy/commit/4e6dfa538bf7391bdda8cd9db50f79d38f6cb11a)) -* Merge branch 'feat_utils' into main ([`2482da3`](https://github.com/computational-psychology/stimupy/commit/2482da30b6ccb9e31734c5ed48b0a4022fe47d4d)) +* Merge branch `feat_utils` into main ([`2482da3`](https://github.com/computational-psychology/stimupy/commit/2482da30b6ccb9e31734c5ed48b0a4022fe47d4d)) * Fix imports now that utils have been split up @@ -2403,7 +2403,7 @@ in favor of resolution.visual_size_from_shape_ppd ([`39e22ca`](https://github.co * updated or added scipt-docstrings, and set domijan-default shape and visual_size to None ([`d52e8be`](https://github.com/computational-psychology/stimupy/commit/d52e8be9f32430b1c84e945558a732ce2fd6f5e0)) -* Merge branch 'dev_refactor' into main ([`6817eb5`](https://github.com/computational-psychology/stimupy/commit/6817eb5cf8643552d0845b5a77a02e7d2d418526)) +* Merge branch `dev_refactor` into main ([`6817eb5`](https://github.com/computational-psychology/stimupy/commit/6817eb5cf8643552d0845b5a77a02e7d2d418526)) * consistently use intensity now ([`7fe1884`](https://github.com/computational-psychology/stimupy/commit/7fe18840ed43e42c2ae684926af9a2c42b4bda8e)) @@ -2415,7 +2415,7 @@ in favor of resolution.visual_size_from_shape_ppd ([`39e22ca`](https://github.co * Plot_stim in range (0,1) ([`0eff732`](https://github.com/computational-psychology/stimupy/commit/0eff73292b267affcb8cb5b8e910ff1233d4410d)) -* Merge branch 'feat_checkerboard' into 'dev_refactor' +* Merge branch `feat_checkerboard` into `dev_refactor` Checkerboard component and stimuli @@ -2477,11 +2477,11 @@ See merge request computational-psychology/stimuli!17 ([`b159e70`](https://githu * moved targets in todorovic by one pixel ([`a88af96`](https://github.com/computational-psychology/stimupy/commit/a88af96b25437e6306dd15b4fb61a7c048e6f403)) -* Merge branch 'dev_refactor' of git.tu-berlin.de:computational-psychology/stimuli into dev_refactor ([`d43d5e8`](https://github.com/computational-psychology/stimupy/commit/d43d5e8d8e80477558aa1e6f01b61a42bc1c8ab9)) +* Merge branch `dev_refactor` of git.tu-berlin.de:computational-psychology/stimuli into dev_refactor ([`d43d5e8`](https://github.com/computational-psychology/stimupy/commit/d43d5e8d8e80477558aa1e6f01b61a42bc1c8ab9)) * updated benarys cross ([`479896d`](https://github.com/computational-psychology/stimupy/commit/479896dc39660147fa76f9632be9cff91c171029)) -* Merge branch 'feat_resolve_resolutions' into 'dev_refactor' +* Merge branch `feat_resolve_resolutions` into `dev_refactor` Resolve & validate shape, visual_size, ppd @@ -2491,13 +2491,13 @@ See merge request computational-psychology/stimuli!16 ([`c9141c0`](https://githu * updated sbc variables. added sbc function which automatically centers the target ([`f213016`](https://github.com/computational-psychology/stimupy/commit/f213016ed69b1f0c0a90deb6907377daae55686b)) -* updated some variabe naming and doc ([`2d13114`](https://github.com/computational-psychology/stimupy/commit/2d13114ddad1b535a82c01de962e870d35cd0e89)) +* updated some variable naming and doc ([`2d13114`](https://github.com/computational-psychology/stimupy/commit/2d13114ddad1b535a82c01de962e870d35cd0e89)) * Bugfix resolve to deal with scalar inputs ([`b181119`](https://github.com/computational-psychology/stimupy/commit/b1811197f33831892eb45e249126fdc410fdfdd0)) * Docstrings ([`19d7056`](https://github.com/computational-psychology/stimupy/commit/19d7056f91b5e21b645b7a16a18261c72f86143f)) -* Resolving 2D now resolves each dimension seperately ([`2646ed0`](https://github.com/computational-psychology/stimupy/commit/2646ed0a96adc24dd46a071c59f4e98ba4b6fcec)) +* Resolving 2D now resolves each dimension separately ([`2646ed0`](https://github.com/computational-psychology/stimupy/commit/2646ed0a96adc24dd46a071c59f4e98ba4b6fcec)) * Extract 1D resolvers ([`7d13041`](https://github.com/computational-psychology/stimupy/commit/7d1304154a171881cd0a4c06a17b151a23df2152)) @@ -2541,7 +2541,7 @@ And mostly use the same tests for all resolvings ([`373752e`](https://github.com * All Murray2020 masks should be of dtype int ([`740f12f`](https://github.com/computational-psychology/stimupy/commit/740f12f894d6f0415187dc0503d10bb0269203d5)) -* Merge branch 'dev_refactor' of git.tu-berlin.de:computational-psychology/stimuli into dev_refactor ([`247b2b2`](https://github.com/computational-psychology/stimupy/commit/247b2b2b14391cb7fb472242befc6604fd8f71ca)) +* Merge branch `dev_refactor` of git.tu-berlin.de:computational-psychology/stimuli into dev_refactor ([`247b2b2`](https://github.com/computational-psychology/stimupy/commit/247b2b2b14391cb7fb472242befc6604fd8f71ca)) * adapted paper scripts and updated rhs.json because most stims changed by a tiny amount (1 row/col of pixels) ([`f7e7ea1`](https://github.com/computational-psychology/stimupy/commit/f7e7ea1de4411fee7c8d04d0c900a034e1cb53da)) @@ -2598,15 +2598,15 @@ Closes #28 ([`8014e7b`](https://github.com/computational-psychology/stimupy/comm * removed padding from bullseyes ([`22e28ea`](https://github.com/computational-psychology/stimupy/commit/22e28ea70db35d808c828f07f4e3c8da615e8db7)) -* fixed problem that padding wasnt removed in RHS2007-todorovic_in_small ([`ad1f88c`](https://github.com/computational-psychology/stimupy/commit/ad1f88cc9a9958fb8f8bd0d17162aa47ffccbcc8)) +* fixed problem that padding wasn't removed in RHS2007-todorovic_in_small ([`ad1f88c`](https://github.com/computational-psychology/stimupy/commit/ad1f88cc9a9958fb8f8bd0d17162aa47ffccbcc8)) -* Merge branch 'dev_refactor' of git.tu-berlin.de:computational-psychology/stimuli into dev_refactor ([`ba1f0a2`](https://github.com/computational-psychology/stimupy/commit/ba1f0a23ba37037dfc11bc9d34b3818340b24b61)) +* Merge branch `dev_refactor` of git.tu-berlin.de:computational-psychology/stimuli into dev_refactor ([`ba1f0a2`](https://github.com/computational-psychology/stimupy/commit/ba1f0a23ba37037dfc11bc9d34b3818340b24b61)) * made padding optional and added height_px and height_deg as input options ([`8832be7`](https://github.com/computational-psychology/stimupy/commit/8832be7e03470531acd52cc182e41d249e4b9291)) * RHS2007 padding optional ([`fabf701`](https://github.com/computational-psychology/stimupy/commit/fabf701a4bbceccebb62b75dc158491b0d9a15aa)) -* Merge branch 'lynn_dev' into dev_refactor +* Merge branch `lynn_dev` into dev_refactor Closes #4 Closes #20 @@ -2649,7 +2649,7 @@ Closes #18 ([`c465f3b`](https://github.com/computational-psychology/stimupy/comm * Remove defunct demo scripts ([`1dad027`](https://github.com/computational-psychology/stimupy/commit/1dad027d3bb9bfebc4e0839378993aa2737ada46)) -* Merge branch 'feat_murray2020' into dev_refactor ([`7da2907`](https://github.com/computational-psychology/stimupy/commit/7da29074a55a877a3a887048996f4c1ec33695a6)) +* Merge branch `feat_murray2020` into dev_refactor ([`7da2907`](https://github.com/computational-psychology/stimupy/commit/7da29074a55a877a3a887048996f4c1ec33695a6)) * Remove other implementations of Koffka Ring ([`2c9af41`](https://github.com/computational-psychology/stimupy/commit/2c9af41536cc13217914b3e0e7c266865dfd6a2e)) @@ -2664,17 +2664,17 @@ Closes #18 ([`c465f3b`](https://github.com/computational-psychology/stimupy/comm Original PPD = 16 pix / 8 deg new argument scales this, so only works for even numbers ([`689ee84`](https://github.com/computational-psychology/stimupy/commit/689ee84591a557b6f1afa5d9e8cd59d633bb07d0)) -* Merge remote-tracking branch 'tubgitlab/noise' into dev_refactor ([`008860d`](https://github.com/computational-psychology/stimupy/commit/008860d06fb29fd647c3bbd7d814443fd0f7774c)) +* Merge remote-tracking branch `tubgitlab/noise` into dev_refactor ([`008860d`](https://github.com/computational-psychology/stimupy/commit/008860d06fb29fd647c3bbd7d814443fd0f7774c)) * Dungeon illusion no longer does doubling+padding ([`31a0fc4`](https://github.com/computational-psychology/stimupy/commit/31a0fc457395250041961d141974ef2e07a4a4f8)) * Update checksums for new, and for improved, stimuli ([`e4e6f26`](https://github.com/computational-psychology/stimupy/commit/e4e6f265b7ad09e07bf1e52b9dc2c25bd24d948f)) -* Merge remote-tracking branch 'tubgitlab/lynn_illusions' into dev_refactor ([`d518f6e`](https://github.com/computational-psychology/stimupy/commit/d518f6ebad0ca9ad98fc819821f86efc8d0c1873)) +* Merge remote-tracking branch `tubgitlab/lynn_illusions` into dev_refactor ([`d518f6e`](https://github.com/computational-psychology/stimupy/commit/d518f6ebad0ca9ad98fc819821f86efc8d0c1873)) -* Merge branch 'feat_testing' into dev_refactor ([`72278d4`](https://github.com/computational-psychology/stimupy/commit/72278d42e91a3e492222d05f0ddfb88b89e7925d)) +* Merge branch `feat_testing` into dev_refactor ([`72278d4`](https://github.com/computational-psychology/stimupy/commit/72278d42e91a3e492222d05f0ddfb88b89e7925d)) -* Merge branch 'feat_plotting' into dev_refactor ([`975c8bf`](https://github.com/computational-psychology/stimupy/commit/975c8bf1ae959277c3f2e70a944d18508233162a)) +* Merge branch `feat_plotting` into dev_refactor ([`975c8bf`](https://github.com/computational-psychology/stimupy/commit/975c8bf1ae959277c3f2e70a944d18508233162a)) * gen_ground_truth uses .gen_all() functions ([`653b36a`](https://github.com/computational-psychology/stimupy/commit/653b36a83d25c53e482246c0b1a058f38e65da6c)) @@ -2757,13 +2757,13 @@ Can also access this list as stimuli.papers.__all__, which can be used for testi * Unify plot_stim usage ([`231c9ba`](https://github.com/computational-psychology/stimupy/commit/231c9ba47723e2170257d1b2d8d3d291f198686c)) -* Merge remote-tracking branch 'tubgitlab/lynn_illusions' into dev_refactor +* Merge remote-tracking branch `tubgitlab/lynn_illusions` into dev_refactor Mainly auto-formatting, but also use utils.plot_stim ([`f1c716a`](https://github.com/computational-psychology/stimupy/commit/f1c716a9953568e473158413b740540919408a1c)) * Padding mostly done by paper functions -For some "double" stimuli, it's still done inside the stimulus function itself... ([`874a014`](https://github.com/computational-psychology/stimupy/commit/874a0146c05a86a31b5ce7e7d4492a12da83f2ef)) +For some "double" stimuli, it's still done inside the stimulus function itself... ([`874a014`](https://github.com/computational-psychology/stimupy/commit/874a0146c05a86a31b5ce7e7d4492a12da83f2ef)) * Autoformat utils ([`b739247`](https://github.com/computational-psychology/stimupy/commit/b7392476eab9b2ce358675bc615b5deafb5d2684)) @@ -2797,7 +2797,7 @@ For some "double" stimuli, it's still done inside the stimulus funct * Export all RHS2007 stimuli explicitly ([`36b787b`](https://github.com/computational-psychology/stimupy/commit/36b787b0834c0460cca3af38419436c6ccffea59)) -* Merge branch 'murray2020' into 'main' +* Merge branch `murray2020` into `main` Murray (2020) stimuli @@ -2821,7 +2821,7 @@ See merge request computational-psychology/stimuli!14 ([`1387f2c`](https://githu * Set up tests for murray2020 stimuli ([`a810784`](https://github.com/computational-psychology/stimupy/commit/a810784a3029bd214e4dfaf2529cda3a26a063d6)) -* Don't print matfile filename ([`d9f81bb`](https://github.com/computational-psychology/stimupy/commit/d9f81bb822d365810532ab43d4e3e8f26fe562a9)) +* Don't print matfile filename ([`d9f81bb`](https://github.com/computational-psychology/stimupy/commit/d9f81bb822d365810532ab43d4e3e8f26fe562a9)) * Cleaner masks ([`8c608fa`](https://github.com/computational-psychology/stimupy/commit/8c608fab8486a4699dbd09360f28160abd6c6eef)) @@ -2859,7 +2859,7 @@ Use np.zeros instead ([`a83b8f4`](https://github.com/computational-psychology/st This reverts commit 7a1d86437871fb893c9d10534675bef45b08e64d. ([`f753712`](https://github.com/computational-psychology/stimupy/commit/f753712514b0c3f56c4ac6ab45184cd924f880bd)) -* Parameterized Adelson's Koffka ring ([`26f2672`](https://github.com/computational-psychology/stimupy/commit/26f2672a263c93794cdf1545103b3f243cdda49e)) +* Parameterized Adelson's Koffka ring ([`26f2672`](https://github.com/computational-psychology/stimupy/commit/26f2672a263c93794cdf1545103b3f243cdda49e)) * Add new file ([`7a1d864`](https://github.com/computational-psychology/stimupy/commit/7a1d86437871fb893c9d10534675bef45b08e64d)) @@ -2887,11 +2887,11 @@ This reverts commit 7a1d86437871fb893c9d10534675bef45b08e64d. ([`f753712`](https * changed output format from object to a dictionary ([`43bdd90`](https://github.com/computational-psychology/stimupy/commit/43bdd904fd782666fbec06becdd4328b0ce9b315)) -* Bugfix: circular White's illusion would have gap between rings ([`0c6c2d1`](https://github.com/computational-psychology/stimupy/commit/0c6c2d1945c87e5e86385fcf9909b6a0f7d17a09)) +* Bugfix: circular White's illusion would have gap between rings ([`0c6c2d1`](https://github.com/computational-psychology/stimupy/commit/0c6c2d1945c87e5e86385fcf9909b6a0f7d17a09)) * Bugfix: circle mask would miss pixels ([`5eada03`](https://github.com/computational-psychology/stimupy/commit/5eada03229c9c3596d7772a92dc8e99d061592de)) -* Merge branch 'main' of git.tu-berlin.de:computational-psychology/stimuli into main ([`ae92d9c`](https://github.com/computational-psychology/stimupy/commit/ae92d9cefe7705f2113b200d5666b9938a4db4b0)) +* Merge branch `main` of git.tu-berlin.de:computational-psychology/stimuli into main ([`ae92d9c`](https://github.com/computational-psychology/stimupy/commit/ae92d9cefe7705f2113b200d5666b9938a4db4b0)) * corrected weird target placing behavior for uneven SF-resolution combinations ([`d070464`](https://github.com/computational-psychology/stimupy/commit/d07046452c1847614cf80eaaa0dde112f0521c87)) @@ -2907,7 +2907,7 @@ This reverts commit 7a1d86437871fb893c9d10534675bef45b08e64d. ([`f753712`](https * Bugfix from merge conflict ([`a527c7d`](https://github.com/computational-psychology/stimupy/commit/a527c7d3dacb4fc5a2a54ac415d23426f017a4c1)) -* Merge branch 'main' of git.tu-berlin.de:computational-psychology/stimuli ([`4ce80b6`](https://github.com/computational-psychology/stimupy/commit/4ce80b687e0c3078f4b985c17e48a70917aeef19)) +* Merge branch `main` of git.tu-berlin.de:computational-psychology/stimuli ([`4ce80b6`](https://github.com/computational-psychology/stimupy/commit/4ce80b687e0c3078f4b985c17e48a70917aeef19)) * added support for multiple targets ([`8f4dcd9`](https://github.com/computational-psychology/stimupy/commit/8f4dcd901549a63fd5386a00482047ff64cba571)) @@ -2933,23 +2933,23 @@ Mainly fixing circular imports, and dividing by floats instead of ints ([`052828 * minor changes in the overview.py ([`7e61cfc`](https://github.com/computational-psychology/stimupy/commit/7e61cfc2de7557155bbf4bd2985e85b2880acce9)) -* all functions now call other functions with illusion.* even if they're inside the same file ([`f3c4cda`](https://github.com/computational-psychology/stimupy/commit/f3c4cda4cbc01023b62eece0b57ed8c9fd80d97a)) +* all functions now call other functions with illusion.* even if they're inside the same file ([`f3c4cda`](https://github.com/computational-psychology/stimupy/commit/f3c4cda4cbc01023b62eece0b57ed8c9fd80d97a)) * deleted lightness dir ([`34e505c`](https://github.com/computational-psychology/stimupy/commit/34e505c72abbce50efa969bfd0d550c3710c51f9)) -* Merge branch 'stimuli_masks' ([`efd85ac`](https://github.com/computational-psychology/stimupy/commit/efd85acb27ef71012399ed11209344f67cfb1ecc)) +* Merge branch `stimuli_masks` ([`efd85ac`](https://github.com/computational-psychology/stimupy/commit/efd85acb27ef71012399ed11209344f67cfb1ecc)) * corrected stimulus implementations for domijan2015 and RHS2007 ([`a6d1bcf`](https://github.com/computational-psychology/stimupy/commit/a6d1bcf3aec831806496eb578f4b05f538814cbf)) * added test for checkerboard_contrast_contrast ([`ba96fb5`](https://github.com/computational-psychology/stimupy/commit/ba96fb5774d23fa671b97678593d5dd579e785fb)) -* Merge branch 'master' of git.tu-berlin.de:computational-psychology/stimuli ([`c3cc62c`](https://github.com/computational-psychology/stimupy/commit/c3cc62c3cdc0c53594be768439d90f13d33600f6)) +* Merge branch `master` of git.tu-berlin.de:computational-psychology/stimuli ([`c3cc62c`](https://github.com/computational-psychology/stimupy/commit/c3cc62c3cdc0c53594be768439d90f13d33600f6)) * added overview.png creation in the papers plots ([`d176d5a`](https://github.com/computational-psychology/stimupy/commit/d176d5afec6e7e71cc85da660405265d247a6414)) * changed padding in some functions so they match the shape in the paper ([`f58e1bd`](https://github.com/computational-psychology/stimupy/commit/f58e1bd7e275854163be52c593020802ceaaf5c5)) -* Merge branch 'replicating_RHS2007_stimuli' ([`9a0e3c5`](https://github.com/computational-psychology/stimupy/commit/9a0e3c5b3fca9db1980738144e60353af0866968)) +* Merge branch `replicating_RHS2007_stimuli` ([`9a0e3c5`](https://github.com/computational-psychology/stimupy/commit/9a0e3c5b3fca9db1980738144e60353af0866968)) * changed starting phase of RHS2007_white_thin_wide ([`e94013e`](https://github.com/computational-psychology/stimupy/commit/e94013e60da9705cf395b0266ac9459f0db76ab1)) @@ -2961,19 +2961,19 @@ Mainly fixing circular imports, and dividing by floats instead of ints ([`052828 * Fixed binary masks for todorovic, circular and sbc ([`1890dfc`](https://github.com/computational-psychology/stimupy/commit/1890dfcc65c4cffc3d3a660a2b011e5ffcd234c9)) -* Merge branch 'master' into stimuli_masks ([`4d9aa41`](https://github.com/computational-psychology/stimupy/commit/4d9aa4190bd797ea3f887c2016a6ced2bdbcee28)) +* Merge branch `master` into stimuli_masks ([`4d9aa41`](https://github.com/computational-psychology/stimupy/commit/4d9aa4190bd797ea3f887c2016a6ced2bdbcee28)) -* Merge branch 'replicating_RHS2007_stimuli' into 'master' +* Merge branch `replicating_RHS2007_stimuli` into `master` Replicating rhs2007 stimuli See merge request computational-psychology/stimuli!12 ([`ad11f9d`](https://github.com/computational-psychology/stimupy/commit/ad11f9d6a51ce71360df3041826fe23bac284bf7)) -* Merge branch 'master' into replicating_RHS2007_stimuli ([`70a8afa`](https://github.com/computational-psychology/stimupy/commit/70a8afa421be1741d971ed132164fffd1a5c16c8)) +* Merge branch `master` into replicating_RHS2007_stimuli ([`70a8afa`](https://github.com/computational-psychology/stimupy/commit/70a8afa421be1741d971ed132164fffd1a5c16c8)) * added checkerboards in RHS2007 file ([`ae22229`](https://github.com/computational-psychology/stimupy/commit/ae2222987a5389c37e73aad3204220cc95c5d112)) -* Merge branch 'master' into stimuli_masks ([`5c835c1`](https://github.com/computational-psychology/stimupy/commit/5c835c101902031a0c7e01385d32582bfacdba3b)) +* Merge branch `master` into stimuli_masks ([`5c835c1`](https://github.com/computational-psychology/stimupy/commit/5c835c101902031a0c7e01385d32582bfacdba3b)) * fixed binary masks for todorovic, sbc an white_circular ([`b09354a`](https://github.com/computational-psychology/stimupy/commit/b09354a79177193550fe67406da2bf5e96a359fd)) @@ -2981,11 +2981,11 @@ See merge request computational-psychology/stimuli!12 ([`ad11f9d`](https://githu * added checkerboards ([`8ee27fe`](https://github.com/computational-psychology/stimupy/commit/8ee27fe737bd19588f56ebca00ecee19fb99b283)) -* Merge branch 'master' into replicating_RHS2007_stimuli ([`1823e05`](https://github.com/computational-psychology/stimupy/commit/1823e0599da8aa51cd34bece7db92a7a4d2f075f)) +* Merge branch `master` into replicating_RHS2007_stimuli ([`1823e05`](https://github.com/computational-psychology/stimupy/commit/1823e0599da8aa51cd34bece7db92a7a4d2f075f)) * added checkerboards ([`c0e417d`](https://github.com/computational-psychology/stimupy/commit/c0e417d7530ff42bf8c5b351eb22671bd4386eb5)) -* Merge branch 'stimuli_masks' into 'master' +* Merge branch `stimuli_masks` into `master` implemented binary masks @@ -2999,25 +2999,25 @@ Borrowed from `lightness` demo script ([`28b060b`](https://github.com/computatio * Bugfix: disc and ring -Didn't produce output, and wasn't imported in `illusions` ([`dd749e2`](https://github.com/computational-psychology/stimupy/commit/dd749e2f45b7b1d429991cec5832fabaed3e60ba)) +Didn't produce output, and wasn't imported in `illusions` ([`dd749e2`](https://github.com/computational-psychology/stimupy/commit/dd749e2f45b7b1d429991cec5832fabaed3e60ba)) * Clean-up tests -Rename scripts that just plot (and don't assert anything) to `demo_`, to avoid being run automatically by pytest. +Rename scripts that just plot (and don't assert anything) to `demo_`, to avoid being run automatically by pytest. Include an empty __init__.py in tests to help with pytest discovering tests in `tests/papers/domijna2015/` ([`fa78d16`](https://github.com/computational-psychology/stimupy/commit/fa78d16ac8455a140f5ca06d3a7a7457ab643357)) -* Merge branch 'replicating_RHS2007_stimuli' into 'master' +* Merge branch `replicating_RHS2007_stimuli` into `master` changed some parameters in circular_whiteRHS2007 See merge request computational-psychology/stimuli!9 ([`24a47c2`](https://github.com/computational-psychology/stimupy/commit/24a47c239b750ab2d6673df5fbc158bbf0e79d0f)) -* Merge branch 'master' into replicating_RHS2007_stimuli ([`4aa69e6`](https://github.com/computational-psychology/stimupy/commit/4aa69e6b6a9e65215d84c53c23e1b529a64842c1)) +* Merge branch `master` into replicating_RHS2007_stimuli ([`4aa69e6`](https://github.com/computational-psychology/stimupy/commit/4aa69e6b6a9e65215d84c53c23e1b529a64842c1)) * changed some parameters in circular_whiteRHS2007 ([`989e0c7`](https://github.com/computational-psychology/stimupy/commit/989e0c75fbaac4e66cfaf6b595a5d70dc5ded22b)) -* Merge branch 'replicating_domijan_stimuli' into 'master' +* Merge branch `replicating_domijan_stimuli` into `master` added tests to compare with hardcoded domijan stimuli @@ -3025,7 +3025,7 @@ See merge request computational-psychology/stimuli!8 ([`faafff7`](https://github * added tests to compare with hardcoded domijan stimuli ([`7bcb5ed`](https://github.com/computational-psychology/stimupy/commit/7bcb5edb8e7dec5f71e8bdb23558501d1a5474be)) -* Merge branch 'restructuring' into 'master' +* Merge branch `restructuring` into `master` stimuli are specified in degrees visual angle @@ -3033,7 +3033,7 @@ See merge request computational-psychology/stimuli!7 ([`34e5ca2`](https://github * added Stimulus class and made all functions return a stimulus object ([`72a9983`](https://github.com/computational-psychology/stimupy/commit/72a998322aa07968046bb4fe8db5a12c29f21b60)) -* Merge branch 'replicating_RHS2007_stimuli' into 'master' +* Merge branch `replicating_RHS2007_stimuli` into `master` Replicating rhs2007 stimuli @@ -3045,7 +3045,7 @@ See merge request computational-psychology/stimuli!6 ([`8c36bef`](https://github * the stimuli for which we already have the functions are correctly parametrized ([`a7d6dd6`](https://github.com/computational-psychology/stimupy/commit/a7d6dd68ef290badd8ce16b276bf5ef1801c7ce3)) -* Merge branch 'replicating_domijan_stimuli' into 'master' +* Merge branch `replicating_domijan_stimuli` into `master` added last three domijan stimuli, all of them are done (for real this time) @@ -3053,17 +3053,17 @@ See merge request computational-psychology/stimuli!5 ([`8ed3f0d`](https://github * added last three domijan stimuli, all of them are done (for real this time) ([`76ca93f`](https://github.com/computational-psychology/stimupy/commit/76ca93f8acdc07a379fbf34675c298f9577952fb)) -* Merge branch 'replicating_domijan_stimuli' into 'master' +* Merge branch `replicating_domijan_stimuli` into `master` domijan stimuli are all perfectly reproduced See merge request computational-psychology/stimuli!4 ([`c6b5ed2`](https://github.com/computational-psychology/stimupy/commit/c6b5ed211b48d7e566f6b4fa7f8a206ed7e721dd)) -* Merge branch 'master' into replicating_domijan_stimuli ([`d6b070d`](https://github.com/computational-psychology/stimupy/commit/d6b070dd692405a651dca7cc5e4deb7a811d267a)) +* Merge branch `master` into replicating_domijan_stimuli ([`d6b070d`](https://github.com/computational-psychology/stimupy/commit/d6b070dd692405a651dca7cc5e4deb7a811d267a)) * domijan stimuli are all perfectly reproduced ([`39ff3cd`](https://github.com/computational-psychology/stimupy/commit/39ff3cddbf120703178e8411cd68f0b132fa988b)) -* Merge branch 'matko' into 'master' +* Merge branch `matko` into `master` Recent refactorings @@ -3077,7 +3077,7 @@ See merge request computational-psychology/stimuli!3 ([`c85afc4`](https://github * Added overview generating scripts in illusions and lightness ([`7e4a8bc`](https://github.com/computational-psychology/stimupy/commit/7e4a8bcd43d9fbc6c3061a6113bf1558c6f97343)) -* Merge branch 'master' into matko ([`74c69fd`](https://github.com/computational-psychology/stimupy/commit/74c69fd5e74a668975819159bed6c135b67ab19c)) +* Merge branch `master` into matko ([`74c69fd`](https://github.com/computational-psychology/stimupy/commit/74c69fd5e74a668975819159bed6c135b67ab19c)) * added domijan2015 functions in stimuli ([`88237e6`](https://github.com/computational-psychology/stimupy/commit/88237e6ee7b3a89b24b7fd929d4ccf189ae1cb57)) @@ -3087,11 +3087,11 @@ Not sure which params are descriptive ([`04aa624`](https://github.com/computatio * Add params checkerboards ([`a8c12a9`](https://github.com/computational-psychology/stimupy/commit/a8c12a9fbfe5856f7e04ad47327da0841db04d31)) -* Parametes for RHS 2007 now python script, more fleshed out ([`d45778a`](https://github.com/computational-psychology/stimupy/commit/d45778ae339b0af58fadecb271d5d575596007b6)) +* Parameters for RHS 2007 now python script, more fleshed out ([`d45778a`](https://github.com/computational-psychology/stimupy/commit/d45778ae339b0af58fadecb271d5d575596007b6)) * Add draft config JSON for RHS 2007 stimuli ([`dbe07d3`](https://github.com/computational-psychology/stimupy/commit/dbe07d3729c04762f02141a34d5e3726a3e905d6)) -* Merge branch 'matko' into 'master' +* Merge branch `matko` into `master` Make package pip installable @@ -3125,7 +3125,7 @@ Updated README ([`9410df2`](https://github.com/computational-psychology/stimupy/ * Merge pull request #1 from computational-psychology/dev_metrics -Adds Moulden's 1990 definition of SAMLG and SAWLG contrast metrics, fixes bug in checkerboard factory ([`2d135d1`](https://github.com/computational-psychology/stimupy/commit/2d135d10f3f4a48033bded5a9ff2fcc682cf39c9)) +Adds Moulden's 1990 definition of SAMLG and SAWLG contrast metrics, fixes bug in checkerboard factory ([`2d135d1`](https://github.com/computational-psychology/stimupy/commit/2d135d10f3f4a48033bded5a9ff2fcc682cf39c9)) * corrects bug with sample_repeat not being an integer, checkerboard factory ([`239e114`](https://github.com/computational-psychology/stimupy/commit/239e1149295816a43cd6ca083577cdba57cf0f78)) @@ -3185,7 +3185,7 @@ Adds Moulden's 1990 definition of SAMLG and SAWLG contrast metrics, fixes bu * added image generation factories for transparency experiments ([`203bec4`](https://github.com/computational-psychology/stimupy/commit/203bec420021f38a9af618fd37f57254a8db8df3)) -* Merge branch 'master' of github.com:TUBvision/stimuli ([`10181b9`](https://github.com/computational-psychology/stimupy/commit/10181b9a5fb76045d8f49063bcbeb5936236bbd6)) +* Merge branch `master` of github.com:TUBvision/stimuli ([`10181b9`](https://github.com/computational-psychology/stimupy/commit/10181b9a5fb76045d8f49063bcbeb5936236bbd6)) * Changes way of importing the module. ([`f997054`](https://github.com/computational-psychology/stimupy/commit/f997054f4e97a0964cd6585e8ab9f66c8abac4ef)) @@ -3195,9 +3195,9 @@ Adds Moulden's 1990 definition of SAMLG and SAWLG contrast metrics, fixes bu * fixing imports ([`00bdc30`](https://github.com/computational-psychology/stimupy/commit/00bdc30c54212672fbc3c319df3f3661b00f38cf)) -* Merge branch 'master' of https://github.com/TUBvision/stimuli ([`f218f05`](https://github.com/computational-psychology/stimupy/commit/f218f053aebd87346882680495760d5fdae17a2c)) +* Merge branch `master` of https://github.com/TUBvision/stimuli ([`f218f05`](https://github.com/computational-psychology/stimupy/commit/f218f053aebd87346882680495760d5fdae17a2c)) -* Added texture synthesis code for 'polka dots' and 'bricks' stimulus. ([`8379812`](https://github.com/computational-psychology/stimupy/commit/83798125c442b19f6d1afc93c96e99a634cd2b83)) +* Added texture synthesis code for `polka dots` and `bricks` stimulus. ([`8379812`](https://github.com/computational-psychology/stimupy/commit/83798125c442b19f6d1afc93c96e99a634cd2b83)) * edited README files ([`57da8d2`](https://github.com/computational-psychology/stimupy/commit/57da8d29fc979c0c1977a0b729d0ec59199800ff)) @@ -3205,7 +3205,7 @@ Adds Moulden's 1990 definition of SAMLG and SAWLG contrast metrics, fixes bu * added documentation ([`e8ed5bf`](https://github.com/computational-psychology/stimupy/commit/e8ed5bfbd65ede7d1b39f2f5fc16c19a5574efe2)) -* Merge branch 'master' of https://github.com/TUBvision/stimuli ([`f05aa0b`](https://github.com/computational-psychology/stimupy/commit/f05aa0bf6fbfa838cc2cde689bbcc187236d558a)) +* Merge branch `master` of https://github.com/TUBvision/stimuli ([`f05aa0b`](https://github.com/computational-psychology/stimupy/commit/f05aa0bf6fbfa838cc2cde689bbcc187236d558a)) * added documentation ([`cf034c5`](https://github.com/computational-psychology/stimupy/commit/cf034c57d1f0ec49dfe176500a0102db52d12e02)) diff --git a/README.md b/README.md index 820bf5a0..8caaf0ce 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ so that they are reproducible, flexible, and easy. (e.g. Simultaneous Brightness Contrast, White's illusion, Hermann grid, Ponzo illusion), and many more - exact replications of stimuli previously published (e.g. ModelFest) - as described in their respecive [papers](stimupy/papers/) + as described in their respective [papers](stimupy/papers/) - all stimuli are fully parameterizable - with interpretable parameters that are familiar and relevant to vision scientists diff --git a/docs/contributing/dev_environ.md b/docs/contributing/dev_environ.md index 0f69586c..b2a56f0c 100644 --- a/docs/contributing/dev_environ.md +++ b/docs/contributing/dev_environ.md @@ -7,7 +7,7 @@ - `".[dev,docs]"` to also edit and build the documentation The `stimupy` project uses a couple of development tools -to work towards more consisten code quality: +to work towards more consistent code quality: - `pytest` for unit and integration tests - `pyupgrade` for possible syntax improvements using newer language features diff --git a/docs/contributing/sets.md b/docs/contributing/sets.md index fd69a9a5..4ff6ead7 100644 --- a/docs/contributing/sets.md +++ b/docs/contributing/sets.md @@ -3,7 +3,7 @@ that can generate many parameterizated stimulus images, and several complete sets of stimuli that all come from the same {py:mod}`source `. -Development, organization and maintanance of these sets can be arduous, +Development, organization and maintenance of these sets can be arduous, and we are committed to providing a high-quality and well-tested suite of functions. Thus, `stimupy` is a curated and maintained _library_ of stimuli (stimulus-functions, to be precise), diff --git a/docs/getting_started/composition.md b/docs/getting_started/composition.md index 296a1d16..28090de1 100644 --- a/docs/getting_started/composition.md +++ b/docs/getting_started/composition.md @@ -238,7 +238,7 @@ This has created the bullseye stimulus that we want, and included with this is a `mask` that can separately indicate each of the three regions (and background). We can easily visualize this mask as well, -overlayed as colorcoding on top of the stimulus: +overlaid as colorcoding on top of the stimulus: ``` plt.subplot(1,2,1) diff --git a/docs/getting_started/first_stim.md b/docs/getting_started/first_stim.md index 9627cf2c..2e97cd78 100644 --- a/docs/getting_started/first_stim.md +++ b/docs/getting_started/first_stim.md @@ -173,7 +173,7 @@ Thus, this output is self-documenting: all the necessary information to produce this stimulus are in the stimulus-`dict`. A nice feature of these {py:class}`dict`s is that you, the user, -can add any arbitray (meta)data to them, after creating the stimulus. +can add any arbitrary (meta)data to them, after creating the stimulus. For instance, we can add some label, or a creation date: ```{code-cell} diff --git a/docs/howtos/export.md b/docs/howtos/export.md index 03269aff..8d0fe954 100644 --- a/docs/howtos/export.md +++ b/docs/howtos/export.md @@ -59,7 +59,7 @@ or [OpenCV](https://github.com/opencv/opencv-python) ## Exporting only parameters In some cases, you may wish to save/export only the stimulus parameters -- for a given version of `stimupy`, -these parameters should reproduce the exact same stimulus everytime. +these parameters should reproduce the exact same stimulus every time. For stimuli created using just `stimupy` functions, the output stimulus-`dict` contains not just the `img`-array but also all parameters for creating that stimulus. diff --git a/docs/howtos/share.md b/docs/howtos/share.md index fb797e10..372695cf 100644 --- a/docs/howtos/share.md +++ b/docs/howtos/share.md @@ -131,7 +131,7 @@ that all come from the same {py:mod}`paper ` (/ source). The ones currently included span wide range of the stimuli implemented in `stimupy` and have formed both the inspiration and a testing benchmark for development. -Development, organization and maintanance of these sets can be arduous, +Development, organization and maintenance of these sets can be arduous, and we are committed to providing a high-quality and well-tested suite of functions. Thus, `stimupy` is a curated and maintained _library_ of stimuli (stimulus-functions, to be precise), diff --git a/docs/reference/demos/stimuli/sbcs.md b/docs/reference/demos/stimuli/sbcs.md index 318b39a1..f6976f87 100644 --- a/docs/reference/demos/stimuli/sbcs.md +++ b/docs/reference/demos/stimuli/sbcs.md @@ -555,7 +555,7 @@ w_tint_l = iw.FloatSlider(value=0.5, min=0, max=1, description="intensity target w_tint_r = iw.FloatSlider(value=0.5, min=0, max=1, description="intensity target right") w_int_surround_l = iw.FloatSlider(value=0., min=0, max=1, description="intensity left surround") w_int_surround_r = iw.FloatSlider(value=1., min=0, max=1, description="intensity right surround") -w_int_background = iw.FloatSlider(value=.5, min=0, max=1, description="intenisty background") +w_int_background = iw.FloatSlider(value=.5, min=0, max=1, description="intensity background") w_rot_l = iw.FloatSlider(value=0, min=0, max=360, description="rotation left [deg]") w_rot_r = iw.FloatSlider(value=0, min=0, max=360, description="rotation right [deg]") @@ -651,7 +651,7 @@ w_tint_l = iw.FloatSlider(value=0.5, min=0, max=1, description="intensity target w_tint_r = iw.FloatSlider(value=0.5, min=0, max=1, description="intensity target right") w_int_surround_l = iw.FloatSlider(value=0., min=0, max=1, description="intensity left surround") w_int_surround_r = iw.FloatSlider(value=1., min=0, max=1, description="intensity right surround") -w_int_background = iw.FloatSlider(value=.5, min=0, max=1, description="intenisty background") +w_int_background = iw.FloatSlider(value=.5, min=0, max=1, description="intensity background") w_mask = iw.ToggleButton(value=False, disabled=False, description="add mask") diff --git a/docs/topic_guides/organization.md b/docs/topic_guides/organization.md index d4b6b04d..76010d37 100644 --- a/docs/topic_guides/organization.md +++ b/docs/topic_guides/organization.md @@ -20,7 +20,7 @@ Broadly, `stimupy` functions currently fall into the following categories, which - a variety of so-called illusions (e.g. Simultaneous Brightness Contrast, White's illusion, Hermann grid, Ponzo illusion), and many more - exact replications of stimuli previously published (e.g. ModelFest) - as described in their respecive [papers](../reference/_api/stimupy.papers) + as described in their respective [papers](../reference/_api/stimupy.papers) - [utility functions](https://stimupy.readthedocs.io/en/latest/reference/_api/stimupy.utils.html) for stimulus import, export, manipulation (e.g. contrast, size), or plotting @@ -76,7 +76,7 @@ OR as having a [cross-shaped target](todorovics.cross) with adjoining squares. For a single stimulus parameterization, these two conceptions may produce perfectly identical images ([see fig, top](fig_todorovics)). However, when changing parameters, -you would expect different *behavior* from the stimulus fuction +you would expect different *behavior* from the stimulus function dependent on your conception/interpretation of the stimulus ([see fig, bottom](fig_todorovics)). ```{code-cell} diff --git a/docs/topic_guides/waves.md b/docs/topic_guides/waves.md index d7f21559..a0d46d79 100644 --- a/docs/topic_guides/waves.md +++ b/docs/topic_guides/waves.md @@ -14,7 +14,7 @@ kernelspec: ```{tip} This guide explains the principles behind, behavior of, and relations between the parameters of periodic stimuli in `stimupy`. -For a more hands-on demonstration of how those paramaters affect a specific stimulus, +For a more hands-on demonstration of how those parameters affect a specific stimulus, see, e.g., [](../reference/demos/stimuli/waves.md) ``` @@ -48,7 +48,7 @@ namely that there are repeated _cycles_ (here of 2 phases/elements per cycle), where each cycle is identical to each other cycle. This regularity can be expressed in several different ways, with several different parameters --- and these parameters have some interdependence on eachother. +-- and these parameters have some interdependence on each other. ```{tip} In the examples in this section, diff --git a/stimupy/components/frames.py b/stimupy/components/frames.py index ce2c8a4e..3480da2f 100644 --- a/stimupy/components/frames.py +++ b/stimupy/components/frames.py @@ -32,7 +32,7 @@ def mask_frames( if "mean": set origin to hypothetical image center (default) if "center": set origin to real center (closest existing value to mean) rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) Returns ------- @@ -77,7 +77,7 @@ def frames( radii : Sequence[Number] radii of each frame, in degrees visual angle rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_frames : Sequence[float, ...], optional intensity value for each frame, by default (1.0, 0.0). Can specify as many intensities as number of frame_widths; diff --git a/stimupy/components/lines.py b/stimupy/components/lines.py index f964dcd4..7075c4f7 100644 --- a/stimupy/components/lines.py +++ b/stimupy/components/lines.py @@ -158,7 +158,7 @@ def dipole( line_gap : Number distance between line centers, in degrees visual angle rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_lines : (Number, Number) intensity value of the line (default: (0, 1)); background intensity is the mean of these two values diff --git a/stimupy/components/radials.py b/stimupy/components/radials.py index 23585e42..73b1cda7 100644 --- a/stimupy/components/radials.py +++ b/stimupy/components/radials.py @@ -117,7 +117,7 @@ def rings( visual_size = resolution.validate_visual_size(visual_size) if visual_size is None or visual_size == (None, None): - # Two axes are None; make image large enought to fit + # Two axes are None; make image large enough to fit visual_size = resolution.validate_visual_size(np.max(radii) * 2) elif None in visual_size: # one axis is None; make square diff --git a/stimupy/components/shapes.py b/stimupy/components/shapes.py index 2d9dfbf2..d4d933c5 100644 --- a/stimupy/components/shapes.py +++ b/stimupy/components/shapes.py @@ -49,7 +49,7 @@ def rectangle( intensity_background : float, optional intensity value of background, by default 0.0 rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) Returns ------- diff --git a/stimupy/components/waves.py b/stimupy/components/waves.py index 96d90301..e67ee60d 100644 --- a/stimupy/components/waves.py +++ b/stimupy/components/waves.py @@ -46,7 +46,7 @@ def resolve_grating_params( Parameters ---------- length : Number, or None (default) - lenght of grating, in pixels + length of grating, in pixels visual_angle :Number, or None (default) visual angle of grating, in degrees ppd : Number, or None (default) @@ -214,7 +214,7 @@ def round_n_phases(n_phases, length, period="either"): n_phases : int number of phases (e.g., bars), i.e., half the number of full periods length : Number - lenght of grating, in pixels + length of grating, in pixels period : "even", "odd", "either" (default) whether to ensure the grating has "even" number of phases, "odd" number of phases, or "either" even/odd @@ -281,7 +281,7 @@ def sine( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees, by default 0.0 intensities : Sequence[float, float] @@ -512,7 +512,7 @@ def square( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees, by default 0.0 intensities : Sequence[float, float] @@ -596,7 +596,7 @@ def staircase( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees, by default 0.o origin : "corner", "mean", or "center" (default) diff --git a/stimupy/papers/domijan2015.py b/stimupy/papers/domijan2015.py index 7afb4784..9b27c0c8 100644 --- a/stimupy/papers/domijan2015.py +++ b/stimupy/papers/domijan2015.py @@ -1224,7 +1224,7 @@ def white_howe(visual_size=VSIZES["white_howe"], ppd=PPD, shape=SHAPES["white_ho https://doi.org/10.3389/fnhum.2015.00093 Howe, P. D. L. (2001). A comment on the Anderson (1997), the Todorovic (1997), - and the Ross nd Pessoa (2000) explanations of White's effect. + and the Ross and Pessoa (2000) explanations of White's effect. Perception, 30, 1023-1026 """ diff --git a/stimupy/papers/modelfest.py b/stimupy/papers/modelfest.py index ac5db9a8..a189baa3 100644 --- a/stimupy/papers/modelfest.py +++ b/stimupy/papers/modelfest.py @@ -1654,7 +1654,7 @@ def Line31(ppd=PPD): def Dipole32(ppd=PPD): """Dipole32: lines x Gaussian, Carney et al (1999) Line width: 3 px = - Seperation: 1 px = + Separation: 1 px = Gaussian window: sy=sx=0.5 deg Parameters @@ -1708,7 +1708,7 @@ def GaborString33(ppd=PPD): """GaborString33 - 5 collinear in-phase Gabors, Carney et al (1999) Frequency: 8 cpd Gaussian window of individual Gabors: sx=sy=0.07 deg (~1octave) - Seperation: 5sx + Separation: 5sx Parameters ---------- @@ -1770,7 +1770,7 @@ def GaborString34(ppd=PPD): """GaborString33 - 5 collinear out-of-phase Gabors, Carney et al (1999) Frequency: 8 cpd Gaussian window of individual Gabors: sx=sy= deg (~1octave) - Seperation: 5sx + Separation: 5sx Parameters ---------- diff --git a/stimupy/stimuli/bullseyes.py b/stimupy/stimuli/bullseyes.py index 7d2a6ee7..3d33b0f5 100644 --- a/stimupy/stimuli/bullseyes.py +++ b/stimupy/stimuli/bullseyes.py @@ -137,7 +137,7 @@ def circular_generalized( radii : Sequence[Number] or None (default) radii of each ring, in degrees visual angle rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_rings : Sequence[float, float] intensities of rings, by default (1.0, 0.0) intensity_background : float (optional) @@ -212,7 +212,7 @@ def rectangular( frame_width : Number, or None (default) width of a single frame, in degrees visual angle rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_frames : Sequence[float, float] @@ -290,7 +290,7 @@ def rectangular_generalized( radii : Sequence[Number] or None (default) radii of each frame, in degrees visual angle rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_frames : Sequence[float, float] min and max intensity of square-wave, by default (0.0, 1.0) intensity_background : float (optional) diff --git a/stimupy/stimuli/checkerboards.py b/stimupy/stimuli/checkerboards.py index bce13ec4..f50df39f 100644 --- a/stimupy/stimuli/checkerboards.py +++ b/stimupy/stimuli/checkerboards.py @@ -25,7 +25,7 @@ def mask_from_idx(checkerboard_stim, check_idc): Returns ------- numpy.ndarray - mask, as binary 2D numpy.ndarray with 1 for all pixels beloning to + mask, as binary 2D numpy.ndarray with 1 for all pixels belonging to specified check(s), and 0 everywhere else Raises @@ -158,7 +158,7 @@ def checkerboard( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_checks : Sequence[float, float] intensity values of checks, by default (0.0, 1.0) round_phase_width : Bool @@ -352,7 +352,7 @@ def contrast_contrast( tau : Number tau of transparency (i.e. value of transparent medium), default 0.5 alpha : Number or None (default) - alpha of transparency (i.e. how transparant the medium is) + alpha of transparency (i.e. how transparent the medium is) round_phase_width : Bool if True, round width of bars given resolution (default: True) diff --git a/stimupy/stimuli/cornsweets.py b/stimupy/stimuli/cornsweets.py index 0100728e..d1f53132 100644 --- a/stimupy/stimuli/cornsweets.py +++ b/stimupy/stimuli/cornsweets.py @@ -39,7 +39,7 @@ def cornsweet( ramp_width : float width of luminance ramp in degrees of visual angle rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_edges : (float, float) intensity of edges intensity_plateau : float diff --git a/stimupy/stimuli/gabors.py b/stimupy/stimuli/gabors.py index bf1bb81b..fc0607df 100644 --- a/stimupy/stimuli/gabors.py +++ b/stimupy/stimuli/gabors.py @@ -42,7 +42,7 @@ def gabor( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensities : Sequence[float, ...] diff --git a/stimupy/stimuli/gratings.py b/stimupy/stimuli/gratings.py index ec8fe3a9..80000248 100644 --- a/stimupy/stimuli/gratings.py +++ b/stimupy/stimuli/gratings.py @@ -62,7 +62,7 @@ def on_uniform( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_bars : Sequence[float, ...] @@ -398,7 +398,7 @@ def grating_induction( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_bars : Sequence[float, ...] @@ -500,7 +500,7 @@ def grating_induction_blur( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_bars : Sequence[float, ...] diff --git a/stimupy/stimuli/rings.py b/stimupy/stimuli/rings.py index d192a91e..bae9f974 100644 --- a/stimupy/stimuli/rings.py +++ b/stimupy/stimuli/rings.py @@ -127,7 +127,7 @@ def rectangular_generalized( if "mean": set origin to hypothetical image center (default) if "center": set origin to real center (closest existing value to mean) rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) Returns diff --git a/stimupy/stimuli/sbcs.py b/stimupy/stimuli/sbcs.py index c1110e19..8e80acb6 100644 --- a/stimupy/stimuli/sbcs.py +++ b/stimupy/stimuli/sbcs.py @@ -49,7 +49,7 @@ def generalized( intensity_target : float, optional intensity value for target, by default 0.5 rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) Returns @@ -165,7 +165,7 @@ def square( surround_radius : float radius of surround context field, in degrees visual angle rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_surrond : float, optional intensity of surround context field, by default 0.0 intensity_background : float, optional @@ -224,7 +224,7 @@ def circular( surround_radius : float radius of surround context field, in degrees visual angle rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_surrond : float, optional intensity of surround context field, by default 0.0 intensity_background : float (optional) diff --git a/stimupy/stimuli/waves.py b/stimupy/stimuli/waves.py index eda677c0..f900c431 100644 --- a/stimupy/stimuli/waves.py +++ b/stimupy/stimuli/waves.py @@ -57,7 +57,7 @@ def sine_linear( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensities : Sequence[float, float] or None (default) @@ -171,7 +171,7 @@ def square_linear( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_bars : Sequence[float, ...] @@ -278,7 +278,7 @@ def staircase_linear( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_bars : Sequence[float, float] or Sequence[float, ...] @@ -392,7 +392,7 @@ def sine_radial( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensities : Sequence[float, float] or None (default) @@ -519,7 +519,7 @@ def square_radial( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_rings : Sequence[float, float] @@ -644,7 +644,7 @@ def staircase_radial( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_rings : Sequence[float, ...] @@ -772,7 +772,7 @@ def sine_rectilinear( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensities : Sequence[float, float] or None (default) @@ -908,7 +908,7 @@ def square_rectilinear( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_frames : Sequence[float, float] @@ -1020,7 +1020,7 @@ def staircase_rectilinear( clip=False, intensity_background=0.5, ): - """Rectiinear staircase, with some frame(s) as target(s) + """Rectilinear staircase, with some frame(s) as target(s) Parameters ---------- @@ -1041,7 +1041,7 @@ def staircase_rectilinear( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_frames : Sequence[float, ...] @@ -1175,7 +1175,7 @@ def sine_angular( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensities : Sequence[float, float] or None (default) @@ -1282,7 +1282,7 @@ def square_angular( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_segments : Sequence[float, ...] @@ -1389,7 +1389,7 @@ def staircase_angular( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_segments : Sequence[float, ...] diff --git a/stimupy/stimuli/whites.py b/stimupy/stimuli/whites.py index 4683ce9e..0e99520e 100644 --- a/stimupy/stimuli/whites.py +++ b/stimupy/stimuli/whites.py @@ -61,7 +61,7 @@ def generalized( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_bars : Sequence[float, ...] intensity value for each bar, by default (1.0, 0.0). Can specify as many intensities as n_bars; @@ -212,7 +212,7 @@ def white( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) phase_shift : float phase shift of grating in degrees intensity_bars : Sequence[float, ...] @@ -309,7 +309,7 @@ def white_two_rows( number of phases, either or whether not to round the number of phases ("ignore") rotation : float, optional - rotation (in degrees), counterclockwise, by default 0.0 (horizonal) + rotation (in degrees), counterclockwise, by default 0.0 (horizontal) intensity_bars : Sequence[float, ...] intensity value for each bar, by default (1.0, 0.0). Can specify as many intensities as n_bars; @@ -605,7 +605,7 @@ def howe( Vision Research, 45, 607-615. Howe, P. D. L. (2001). A comment on the Anderson (1997), the Todorovic (1997), - and the Ross nd Pessoa (2000) explanations of White's effect. + and the Ross and Pessoa (2000) explanations of White's effect. Perception, 30, 1023-1026 """ return anderson( diff --git a/stimupy/utils/contrast_conversions.py b/stimupy/utils/contrast_conversions.py index 87049f06..e7c3576b 100644 --- a/stimupy/utils/contrast_conversions.py +++ b/stimupy/utils/contrast_conversions.py @@ -19,12 +19,12 @@ def transparency(img, mask=None, alpha=0.5, tau=0.2): Parameters ---------- img : np.array - image to which transparancy will be applied + image to which transparency will be applied mask : np.array or None (default) - if not None, transparancy will be provided at non-zero locations + if not None, transparency will be provided at non-zero locations provided in this mask alpha : Number - alpha of transparency (i.e. how transparant the medium is), default 0.2 + alpha of transparency (i.e. how transparent the medium is), default 0.2 tau : Number tau of transparency (i.e. value of transparent medium), default 0.5 diff --git a/stimupy/utils/pad.py b/stimupy/utils/pad.py index 4d73418a..b6fba782 100644 --- a/stimupy/utils/pad.py +++ b/stimupy/utils/pad.py @@ -375,7 +375,7 @@ def pad_dict_by_shape(dct, padding, pad_value=0, keys=("img", "*mask")): def pad_dict_to_shape(dct, shape, pad_value=0, keys=("img", "*mask")): - """Pad images in dicationary to a resulting specified shape in pixels + """Pad images in dictionary to a resulting specified shape in pixels Parameters ---------- diff --git a/stimupy/utils/resolution.py b/stimupy/utils/resolution.py index 29cf5060..d88013cc 100644 --- a/stimupy/utils/resolution.py +++ b/stimupy/utils/resolution.py @@ -132,7 +132,7 @@ def resolve_1D(length=None, visual_angle=None, ppd=None, round=True): # Triage based on number of unknowns if n_unknowns > 1: # More than 1 unknown we cannot resolve raise TooManyUnknownsError( - f"Too many unkowns to resolve resolution; {length},{visual_angle},{ppd}" + f"Too many unknowns to resolve resolution; {length},{visual_angle},{ppd}" ) else: # 1 unknown, so need to resolve # Which unknown? @@ -479,25 +479,23 @@ def ppd_from_length_visual_angle(length, visual_angle): def compute_ppd(screen_size, resolution, distance): - """ - Compute the pixels per degree, i.e. the number of pixels in the central - one degree of visual angle, in a presentation setup. + """Compute the pixels per degree in a presentation setup + i.e., the number of pixels in the central one degree of visual angle Parameters ---------- - screen_size : scalar - the size of the presentation screen, in whatever unti you - prefer. - resolution : scalar - the sceen resolution in the same direction that screen size - was measured in. - distance : scalar - the distance between the observer and the screen, in the same - unit as screen_size. + screen_size : (float, float) + physical size, in whatever units you prefer, of the presentation screen + resolution : (float, float) + screen resolution, in pixels, + in the same direction that screen size was measured in + distance : float + physical distance between the observer and the screen, in the same unit as screen_size + Returns ------- - ppd : number - the number of pixels in one degree of visual angle. + float + ppd, the number of pixels in one degree of visual angle """ ppmm = resolution / screen_size diff --git a/stimupy/utils/utils.py b/stimupy/utils/utils.py index 77254bb8..f6f5bd47 100644 --- a/stimupy/utils/utils.py +++ b/stimupy/utils/utils.py @@ -132,7 +132,7 @@ def resize_array(arr, factor): ---------- arr : 2D array the array to be resized - factor : tupel of 2 ints + factor : tuple of 2 ints the resize factor in the y and x dimensions Returns @@ -151,7 +151,7 @@ def resize_dict(dct, factor, keys=("img", "*mask")): ---------- dct : dict dict containing arrays to be resized - factor : tupel of 2 ints + factor : tuple of 2 ints the resize factor in the y and x dimensions keys : Sequence[String, String] or String keys in dict for images to be padded diff --git a/tests/test_resolve_resolutions.py b/tests/test_resolve_resolutions.py index f918f609..bd8240f2 100644 --- a/tests/test_resolve_resolutions.py +++ b/tests/test_resolve_resolutions.py @@ -1,6 +1,6 @@ """Tests whether resolving of resolution/components works as expected -Seperately tests each of three components: visual size, shape, ppd. +Separately tests each of three components: visual size, shape, ppd. For each component, the resolver routine has 1 expected behavior: from the two givens, calculate the third unknown component. As long as the two givens are valid (see valid_*), @@ -116,12 +116,12 @@ def test_resolve_resolution(shape, visual_size, ppd): @pytest.mark.parametrize( "shape, visual_size, ppd", [ - (None, None, (32, 32)), # Two unkowns - ((1024, 1024), None, None), # Two unkowns - (None, (32, 32), None), # Two unkowns - ((1024, None), (32, None), (32, 32)), # Two unkowns in one dimension - ((1024, 1024), (32, None), (32, None)), # Two unkowns in one dimension - ((1024, None), (32, 32), (32, None)), # Two unkowns in one dimension + (None, None, (32, 32)), # Two unknowns + ((1024, 1024), None, None), # Two unknowns + (None, (32, 32), None), # Two unknowns + ((1024, None), (32, None), (32, 32)), # Two unknowns in one dimension + ((1024, 1024), (32, None), (32, None)), # Two unknowns in one dimension + ((1024, None), (32, 32), (32, None)), # Two unknowns in one dimension ], ) def test_too_many_unknowns(shape, visual_size, ppd): diff --git a/tests/test_validate_resolution_components.py b/tests/test_validate_resolution_components.py index 2d3a8931..8c0ca660 100644 --- a/tests/test_validate_resolution_components.py +++ b/tests/test_validate_resolution_components.py @@ -1,6 +1,6 @@ """Tests whether validation of resolution components works as expected -Seperately tests each of three components: visual size, shape, ppd. +Separately tests each of three components: visual size, shape, ppd. For each component, the validation routine has two expected major behaviors: - if input is valid, return canonical format (2-(named)tuple) - casts values to correct type (float or int)