Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging updates from gentnerlab into our master branch. #2

Open
wants to merge 121 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
a650cf0
replaced class_assoc with a port lookup
neuromusic Jul 14, 2015
69db8bc
Implemented interface for using an Arduino as a DAQ.
siriuslee Dec 12, 2015
e5c5161
Merge pull request #99 from siriuslee/arduino
neuromusic Dec 27, 2015
fa09030
added gitter badge back in
neuromusic Jan 18, 2016
854e10e
switched to BSD license
neuromusic Jan 26, 2016
055a5b5
Merge pull request #106 from gentnerlab/bsd
neuromusic Jan 31, 2016
b98257f
fixes for doublestaircase in queues.py
MarvinT Aug 11, 2015
b171c16
Merge pull request #98 from MarvinT/double_staircase
neuromusic Mar 30, 2016
7d96bd4
derisking the pyaudio callback
neuromusic Apr 6, 2016
559e749
Merge pull request #111 from gentnerlab/pyaudio_derisk
neuromusic Apr 12, 2016
7e0a9a5
Update README.rst
neuromusic Apr 25, 2017
80ff648
Delete allsummary.py
MarvinT Nov 8, 2017
4ad944b
added new free food block branch to to merge with newer commits of ma…
Mar 5, 2018
a29d2b0
fixed return outside function
Mar 5, 2018
96a67ab
fixed free food call
Mar 5, 2018
d10d910
Merge pull request #115 from gentnerlab/updated_free_food_block
timsainb Jun 24, 2018
542d319
Merge pull request #121 from gentnerlab/multiclass
theilmbh Jan 21, 2019
eec9c4a
Raspberry Pi Support (#116)
theilmbh Jan 21, 2019
20491f9
Update conf.py
acmai Jan 26, 2019
7d2bfc5
Update index.rst
acmai Jan 26, 2019
14fb100
Update conf.py
acmai Jan 30, 2019
3fa188d
Update index.rst
acmai Jan 30, 2019
2e37477
Update index.rst
acmai Jan 30, 2019
e504445
Update pyoperant.rst
acmai Jan 30, 2019
4945b7b
Update index.rst
acmai Jan 30, 2019
b09f273
Update pyoperant.behavior.rst
acmai Jan 30, 2019
5d0f5eb
Update pyoperant.interfaces.rst
acmai Jan 30, 2019
fbd2f35
Update pyoperant.interfaces.rst
acmai Jan 30, 2019
098297f
Update pyoperant.rst
acmai Jan 30, 2019
5902b93
Update pyoperant.rst
acmai Jan 30, 2019
ee6a3af
Update lights.py
acmai Jan 30, 2019
4c96c8d
Update lights.py
acmai Jan 30, 2019
c37d422
Update conf.py
acmai Jan 30, 2019
2bb4577
Update conf.py
acmai Jan 30, 2019
f0b93a6
Update two_alt_choice.py
acmai Jan 30, 2019
32b47a0
Update conf.py
acmai Jan 30, 2019
58f893a
Update conf.py
acmai Jan 30, 2019
951102c
Update two_alt_choice.py
acmai Jan 30, 2019
9021b10
Update pyoperant.behavior.base.rst
acmai Jan 30, 2019
4d822e6
Update pyoperant.behavior.rst
acmai Jan 30, 2019
6d50102
Update pyoperant.behavior.shape.rst
acmai Jan 30, 2019
a5e50be
Update pyoperant.behavior.three_ac_matching.rst
acmai Jan 30, 2019
599a221
Update pyoperant.behavior.two_alt_choice.rst
acmai Jan 30, 2019
8b9dff5
Update conf.py
acmai Jan 30, 2019
43cd614
Update utils.py
acmai Jan 31, 2019
4f1c0a4
Update utils.py
acmai Jan 31, 2019
4b93b43
Change PWM frequency
theilmbh Mar 15, 2019
c534cc3
mutate config
theilmbh May 22, 2019
bca0b8c
json structur
theilmbh May 22, 2019
b4a4ef3
indent
theilmbh May 22, 2019
04a2aed
dump vs dumps
theilmbh May 22, 2019
8dfaf3b
ordered dict
theilmbh May 22, 2019
35bcb1e
revert during shape fix
theilmbh Jun 2, 2019
9abfe2c
Add place preference experiment
xingjeffrey Jul 14, 2023
d9c0303
Update place pref visibility
xingjeffrey Jul 14, 2023
192f4cd
Update place_pref.py
xingjeffrey Jul 14, 2023
a685b8b
Update place_pref.py
xingjeffrey Jul 14, 2023
2e10d0a
Update place_pref.py
xingjeffrey Jul 14, 2023
d812c18
Update place_pref.py
xingjeffrey Jul 14, 2023
2bf8275
Update place_pref.py
xingjeffrey Jul 14, 2023
0a839b1
Update place_pref.py
xingjeffrey Jul 17, 2023
dd81ab8
Update place_pref.py
xingjeffrey Jul 17, 2023
668b729
Update place_pref.py
xingjeffrey Jul 17, 2023
e2d6c67
Update place_pref.py
xingjeffrey Jul 17, 2023
89e5f67
Update place_pref.py
xingjeffrey Jul 17, 2023
b51aff1
Update place_pref.py
xingjeffrey Jul 17, 2023
a44cd17
Update place_pref.py
xingjeffrey Jul 17, 2023
d5c4acc
Update place_pref.py
xingjeffrey Jul 17, 2023
e5e2c52
Update place_pref.py
xingjeffrey Jul 17, 2023
1331850
Update place_pref.py
xingjeffrey Jul 17, 2023
8d6d22f
Update place_pref.py
xingjeffrey Jul 17, 2023
211da1f
Update place_pref.py
xingjeffrey Jul 17, 2023
6b8036e
Update place_pref.py
xingjeffrey Jul 17, 2023
9586882
Update place_pref.py
xingjeffrey Jul 17, 2023
53a90cb
Update place_pref.py
xingjeffrey Jul 17, 2023
a04d392
Update place_pref.py
xingjeffrey Jul 17, 2023
627b3bd
Update place_pref.py
xingjeffrey Jul 17, 2023
dec1b89
Update place_pref.py
xingjeffrey Jul 17, 2023
9e3bf8f
Update place_pref.py
xingjeffrey Jul 17, 2023
ee6d98a
Update place_pref.py
xingjeffrey Jul 17, 2023
8009189
Update place_pref.py
xingjeffrey Jul 17, 2023
67f4b8a
Update place_pref.py
xingjeffrey Jul 17, 2023
bd95eb5
Update place_pref.py
xingjeffrey Jul 17, 2023
34ef08e
Update place_pref.py
xingjeffrey Jul 17, 2023
f35454a
Update place_pref.py
xingjeffrey Jul 17, 2023
310772d
Update place_pref.py
xingjeffrey Jul 17, 2023
141344a
Update place_pref.py
xingjeffrey Jul 17, 2023
c045839
Update place_pref.py
xingjeffrey Jul 17, 2023
b106213
Update place_pref.py
xingjeffrey Jul 17, 2023
3bc23fe
Update place_pref.py
xingjeffrey Jul 17, 2023
2945eff
Update place_pref.py
xingjeffrey Jul 17, 2023
9af0c43
Update place_pref.py
xingjeffrey Jul 17, 2023
44f4c8d
Update place_pref.py
xingjeffrey Jul 18, 2023
d01c820
Update place_pref.py
xingjeffrey Jul 18, 2023
6901ba2
Update place_pref.py
xingjeffrey Jul 18, 2023
aef3827
Update place_pref.py
xingjeffrey Jul 18, 2023
3301c26
Update place_pref.py
xingjeffrey Jul 18, 2023
90a3708
Update place_pref.py
xingjeffrey Jul 18, 2023
d00066e
Update place_pref.py
xingjeffrey Jul 19, 2023
7cd3e13
Update place_pref.py
xingjeffrey Jul 20, 2023
7a4a15b
Update place_pref.py
xingjeffrey Jul 24, 2023
e66b4d3
Bug fix pyoperant
xingjeffrey Feb 16, 2024
835bcf9
hotfix
xingjeffrey Feb 16, 2024
98f4604
Update place preference with variable ratio reinforcement
xingjeffrey Mar 8, 2024
f842095
Update place_pref.py
xingjeffrey Mar 8, 2024
dffdaa6
Update place_pref.py
xingjeffrey Mar 8, 2024
8354cff
Update place_pref.py
xingjeffrey Mar 8, 2024
eba02a9
Update place_pref.py
xingjeffrey Mar 8, 2024
f58d832
Update place_pref.py
xingjeffrey Mar 8, 2024
075ea04
Update separate reinforcement counter for each perch
xingjeffrey Mar 8, 2024
40cedd2
Update place_pref.py
xingjeffrey Mar 21, 2024
9aaaf93
Create place_pref_24hr.py
xingjeffrey Aug 19, 2024
ef15a8a
Update 24hr for testing
xingjeffrey Aug 19, 2024
12ed5c5
Update place_pref_24hr.py
xingjeffrey Aug 19, 2024
f8c1de3
Load 24 hrs into initialization
xingjeffrey Aug 20, 2024
950f8ef
Debug 24hr place pref
xingjeffrey Aug 20, 2024
8f527b8
Update 24hr pref to start from night
xingjeffrey Aug 20, 2024
5418bf1
update 24hr to have no reinforcement at night
xingjeffrey Aug 20, 2024
63b27d6
Update __init__.py
xingjeffrey Sep 4, 2024
e599585
Update place_pref_24hr.py
xingjeffrey Sep 17, 2024
31e8866
Update utils.py
xingjeffrey Sep 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
676 changes: 7 additions & 669 deletions LICENSE.txt

Large diffs are not rendered by default.

Empty file removed __init__.py
Empty file.
5 changes: 5 additions & 0 deletions docs/README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
pyoperant
=========


.. image:: https://badges.gitter.im/Join%20Chat.svg
:alt: Join the chat at https://gitter.im/gentnerlab/pyoperant
:target: https://gitter.im/gentnerlab/pyoperant?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge

Pyoperant is a framework to easily construct and share new operant behavior paradigms.

With PyOperant, you can write a single behavior script that works across different species, different computers, different hardware, different rewards, different modalities.
Expand Down
19 changes: 16 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.insert(0, os.path.abspath('.'))
sys.path.insert(0, os.path.abspath('../'))

# -- General configuration ------------------------------------------------
Expand All @@ -32,7 +33,7 @@
'sphinx.ext.autodoc',
'sphinx.ext.doctest',
'sphinx.ext.viewcode',
# 'sphinx.ext.autosummary',
'sphinx.ext.autosummary',
'sphinxcontrib.napoleon',
# 'numpydoc',
]
Expand Down Expand Up @@ -110,7 +111,19 @@
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
#html_theme_options = {}
html_theme_options = {
'logo_only': False,
'display_version': True,
'prev_next_buttons_location': 'bottom',
'style_external_links': False,
'vcs_pageview_mode': '',
# Toc options
'collapse_navigation': True,
'sticky_navigation': True,
'navigation_depth': 4,
'includehidden': True,
'titles_only': False
}

# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
Expand Down Expand Up @@ -287,7 +300,7 @@ def __getattr__(cls, name):
else:
return Mock()

MOCK_MODULES = ['comedi','comedi_poll', 'numpy', 'ephem']
MOCK_MODULES = ['comedi','comedi_poll', 'numpy', 'ephem', 'scipy', 'pyaudio', 'scipy.special']
for mod_name in MOCK_MODULES:
sys.modules[mod_name] = Mock()

2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Welcome to pyoperant's documentation!
=====================================

.. include:: ../README.rst
.. include:: README.rst

Contents
========
Expand Down
2 changes: 1 addition & 1 deletion docs/pyoperant.behavior.base.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pyoperant.behavior.base module
============================
==============================

.. automodule:: pyoperant.behavior.base
:members:
Expand Down
12 changes: 6 additions & 6 deletions docs/pyoperant.behavior.rst
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
pyoperant.behavior package
========================
==========================

Submodules
----------

.. toctree::

pyoperant.behavior.base
pyoperant.behavior.lights
pyoperant.behavior.shape
pyoperant.behavior.three_ac_matching
pyoperant.behavior.two_alt_choice
base <pyoperant.behavior.base>
lights <pyoperant.behavior.lights>
shape <pyoperant.behavior.shape>
three_ac_matching <pyoperant.behavior.three_ac_matching>
two_alt_choice <pyoperant.behavior.two_alt_choice>

Module contents
---------------
Expand Down
2 changes: 1 addition & 1 deletion docs/pyoperant.behavior.shape.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pyoperant.behavior.shape module
=============================
===============================

.. automodule:: pyoperant.behavior.shape
:members:
Expand Down
2 changes: 1 addition & 1 deletion docs/pyoperant.behavior.three_ac_matching.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pyoperant.behavior.three_ac_matching module
=========================================
===========================================

.. automodule:: pyoperant.behavior.three_ac_matching
:members:
Expand Down
2 changes: 1 addition & 1 deletion docs/pyoperant.behavior.two_alt_choice.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pyoperant.behavior.two_alt_choice module
======================================
========================================

.. automodule:: pyoperant.behavior.two_alt_choice
:members:
Expand Down
10 changes: 5 additions & 5 deletions docs/pyoperant.interfaces.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ Submodules

.. toctree::

pyoperant.interfaces.base_
pyoperant.interfaces.comedi_
pyoperant.interfaces.console_
pyoperant.interfaces.pyaudio_
pyoperant.interfaces.spike2_
base <pyoperant.interfaces.base_>
comedi <pyoperant.interfaces.comedi_>
console <pyoperant.interfaces.console_>
pyaudio <pyoperant.interfaces.pyaudio_>
spike2 <pyoperant.interfaces.spike2_>

Module contents
---------------
Expand Down
27 changes: 13 additions & 14 deletions docs/pyoperant.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,24 @@ Subpackages

.. toctree::

pyoperant.interfaces
pyoperant.behavior
The Interfaces Subpackage <pyoperant.interfaces>
The Behavior Subpackage <pyoperant.behavior>

Submodules
Modules
----------

.. toctree::

pyoperant.behavior
pyoperant.components
pyoperant.errors
pyoperant.hwio
pyoperant.local
pyoperant.local_vogel
pyoperant.local_zog
pyoperant.panels
pyoperant.queues
pyoperant.reinf
pyoperant.utils
components <pyoperant.components>
errors <pyoperant.errors>
hwio <pyoperant.hwio>
local <pyoperant.local>
local_vogel <pyoperant.local_vogel>
local_zog <pyoperant.local_zog>
panels <pyoperant.panels>
queues <pyoperant.queues>
reinf <pyoperant.reinf>
utils <pyoperant.utils>

Module contents
---------------
Expand Down
Loading