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

Feat/log/log with time #582

Merged
merged 88 commits into from
Dec 10, 2017
Merged
Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
263b22b
• System
jdcpni Nov 30, 2017
0f1613d
adding new UniformToNormalDist function which allows for a direct com…
KristenManning Nov 30, 2017
9d440d2
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
KristenManning Dec 1, 2017
6546d27
adding a pytest for the new uniform --> normal distribution function
KristenManning Dec 1, 2017
2966f43
• System
jdcpni Dec 1, 2017
caddf50
Feat/log (#564)
jdcpni Dec 4, 2017
27d6f09
Feat/log (#565)
jdcpni Dec 4, 2017
ed0e604
fix incorrect construction of Process and System in Multitasking exam…
kmantel Dec 4, 2017
aa97dd7
adding LC Control Mechanism test to verify that it is updating multip…
KristenManning Dec 4, 2017
5a885c1
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
KristenManning Dec 4, 2017
175acd2
Merge pull request #567 from PrincetonUniversity/fix/lc-control-mecha…
KristenManning Dec 4, 2017
187218d
Feat/log (#568)
jdcpni Dec 4, 2017
90c316f
add docstring explanation for processing and learning termination con…
kmantel Dec 4, 2017
42200ff
EVCAuxiliary: replace kwargs function signatures with explicit arguments
kmantel Dec 5, 2017
9ce27d4
Feat/log (#569)
jdcpni Dec 5, 2017
f11ec55
• Log
jdcpni Dec 5, 2017
2221e6e
Feat/mechanism/additional props (#570)
jdcpni Dec 5, 2017
d681e33
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 5, 2017
4e5ab8a
Name/log/numpy array to nparray (#571)
jdcpni Dec 5, 2017
ad06e2d
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 5, 2017
22becf7
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
KristenManning Dec 5, 2017
bc5651e
adding gilzenrat figures in _build file
KristenManning Dec 5, 2017
7a3c2ae
Docs/log/docstring update (#572)
jdcpni Dec 5, 2017
f33338c
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 5, 2017
d2c43ad
validating uniform-to-normal distribution function (matlab)
KristenManning Dec 5, 2017
92cc9bc
adding documentation for UniformToNormalDist
KristenManning Dec 5, 2017
966f9cb
Merge branch 'devel' into feat/normal-dist/matlab
KristenManning Dec 5, 2017
e2470f0
using UniformToNormalDist pytest as a check of the scipy requirement …
KristenManning Dec 5, 2017
70466a0
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
KristenManning Dec 5, 2017
6f30017
Merge branch 'feat/normal-dist/matlab' of https://github.com/Princeto…
KristenManning Dec 5, 2017
740a14d
Merge pull request #575 from PrincetonUniversity/feat/normal-dist/matlab
KristenManning Dec 5, 2017
416b247
Fix/log/logged items bug (#577)
jdcpni Dec 5, 2017
1a92a6d
pytest: Add benchmarking plugin
jvesely Aug 7, 2017
92b94b5
setup.cfg: Disable benchmarks by default
jvesely Aug 7, 2017
2671c17
setup.cfg: Use warmup if benchmarks are enabled
jvesely Aug 8, 2017
21b0b61
function: test for both 1d and 2d noise
jvesely Dec 5, 2017
d1ccac5
Add distance function tests
jvesely Dec 4, 2017
6fe46bf
Add transfer function tests
jvesely Dec 4, 2017
f0e62f1
Add integrator function tests
jvesely Dec 4, 2017
6b38083
Docs/log/docstring update (#578)
jdcpni Dec 5, 2017
20b5a07
Refactor/log/entry management (#579)
jdcpni Dec 6, 2017
9762997
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 6, 2017
c29ab56
-
jdcpni Dec 6, 2017
36b67c9
-
jdcpni Dec 6, 2017
86a6a03
-
jdcpni Dec 6, 2017
b1b8cf7
-
jdcpni Dec 6, 2017
f7838a1
-
jdcpni Dec 6, 2017
a6978a2
-
jdcpni Dec 6, 2017
dc1e886
• Log
jdcpni Dec 7, 2017
55ffacd
• Log
jdcpni Dec 7, 2017
0094a2b
-
jdcpni Dec 7, 2017
7c9abb9
-
jdcpni Dec 7, 2017
09a04e8
-
jdcpni Dec 7, 2017
36997cc
• Log, State, Projection
jdcpni Dec 7, 2017
1102944
-
jdcpni Dec 7, 2017
414e0b1
• ControlSignal
jdcpni Dec 7, 2017
ed740d4
• Log
jdcpni Dec 7, 2017
28f442c
• Log
jdcpni Dec 7, 2017
509e0e9
• Log
jdcpni Dec 7, 2017
4997f33
Feat/log/log levels (#580)
jdcpni Dec 7, 2017
04c6d53
• Log, State, Projection
jdcpni Dec 8, 2017
eb2c364
• Log
jdcpni Dec 8, 2017
cea37ca
• Log
jdcpni Dec 8, 2017
7aa78cb
• Log
jdcpni Dec 8, 2017
7a1b1f1
remove old Clock/CentralClock
kmantel Dec 4, 2017
f666d51
create and integrate a new Clock class, and several new classes to ke…
kmantel Dec 5, 2017
ae3d61d
Merge branch 'feat/scheduling/enhanced-clock' into devel
kmantel Dec 8, 2017
06d32c2
rename psyneulink.scheduling.timescale -> psyneulink.scheduling.time
kmantel Dec 8, 2017
01a2d09
-
jdcpni Dec 9, 2017
9ee8230
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 9, 2017
f186686
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Dec 9, 2017
c613e73
• Successfully merged with devel
jdcpni Dec 9, 2017
acc3662
• Log
jdcpni Dec 9, 2017
c1c57f7
• Log
jdcpni Dec 9, 2017
b7870d0
• Log
jdcpni Dec 9, 2017
d68a52b
-
jdcpni Dec 9, 2017
7b1a647
-
jdcpni Dec 9, 2017
c120b40
• Log
jdcpni Dec 9, 2017
0bce146
-
jdcpni Dec 9, 2017
e2064cb
-
jdcpni Dec 9, 2017
329fc7f
-
jdcpni Dec 9, 2017
db1bce6
-
jdcpni Dec 9, 2017
18c11ae
-
jdcpni Dec 10, 2017
93dd01c
-
Dec 10, 2017
f9629f1
-
Dec 10, 2017
ad56703
-
Dec 10, 2017
fcaba5a
-
Dec 10, 2017
d757d3d
• Log
Dec 10, 2017
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
32 changes: 22 additions & 10 deletions tests/mechanisms/test_transfer_mechanism.py
Original file line number Diff line number Diff line change
@@ -221,17 +221,29 @@ def test_transfer_mech_exponential_noise(self):
assert np.allclose(val, [[0.4836021009022533, 1.5688961399691683, 0.7526741095365884, 0.8394328467388229]])

def test_transfer_mech_uniform_to_normal_noise(self):
try:
import scipy
T = TransferMechanism(
name='T',
default_variable=[0, 0, 0, 0],
function=Linear(),
noise=UniformToNormalDist().function,
time_constant=1.0
)
np.random.seed(22)
val = T.execute([0, 0, 0, 0])
assert np.allclose(val, [[-0.81177443, -0.04593492, -0.20051725, 1.07665147]])
except:
with pytest.raises(FunctionError) as error_text:
T = TransferMechanism(
name='T',
default_variable=[0, 0, 0, 0],
function=Linear(),
noise=UniformToNormalDist().function,
time_constant=1.0
)
assert "The UniformToNormalDist function requires the SciPy package." in str(error_text)

T = TransferMechanism(
name='T',
default_variable=[0, 0, 0, 0],
function=Linear(),
noise=UniformToNormalDist().function,
time_constant=1.0
)
np.random.seed(22)
val = T.execute([0, 0, 0, 0])
assert np.allclose(val, [[-0.81177443, -0.04593492, -0.20051725, 1.07665147]])

def test_transfer_mech_Uniform_noise(self):