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.

Sign up for GitHub

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

Refactor/modulatory signals/linear default function #665

Merged
merged 9 commits into from
Feb 17, 2018
Merged

Refactor/modulatory signals/linear default function #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fc772b3
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 2, 2018
75db09f
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 2, 2018
537c696
-
jdcpni Feb 5, 2018
2212777
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 10, 2018
9b9771e
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 16, 2018
50a0076
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 16, 2018
748ec88
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 17, 2018
9d56786
Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu…
jdcpni Feb 17, 2018
8efea49
• LearningSignal, ControlSignal, GatingSignal
jdcpni Feb 17, 2018
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
6 changes: 3 additions & 3 deletions psyneulink/components/states/modulatorysignals/controlsignal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ class ControlSignal(ModulatorySignal):
ControlSignal( \
owner, \
index=SEQUENTIAL, \
function=LinearCombination(operation=SUM), \
function=Linear(), \
costs_options=ControlSignalCosts.DEFAULTS, \
intensity_cost_function=Exponential, \
adjustment_cost_function=Linear, \
Expand Down Expand Up @@ -447,7 +447,7 @@ class ControlSignal(ModulatorySignal):
Class attributes:
+ componentType (str) = CONTROL_SIGNAL
+ paramClassDefaults (dict)
+ FUNCTION (LinearCombination)
+ FUNCTION (Linear)
+ FUNCTION_PARAMS (Operation.PRODUCT)

Class methods:
Expand Down Expand Up @@ -655,7 +655,7 @@ def __init__(self,
size=None,
index=None,
calculate=Linear,
function=LinearCombination(operation=SUM),
function=Linear(),
cost_options:tc.any(ControlSignalCosts, list)=ControlSignalCosts.DEFAULTS,
intensity_cost_function:(is_function_type)=Exponential,
adjustment_cost_function:tc.optional(is_function_type)=Linear,
Expand Down
6 changes: 3 additions & 3 deletions psyneulink/components/states/modulatorysignals/gatingsignal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ class GatingSignal(ModulatorySignal):
GatingSignal( \
owner, \
index=PRIMARY \
function=LinearCombination(operation=SUM), \
function=Linear(), \
modulation=ModulationParam.MULTIPLICATIVE, \
projections=None, \
params=None, \
Expand All @@ -284,7 +284,7 @@ class GatingSignal(ModulatorySignal):
Class attributes:
+ componentType (str) = GATING_SIGNAL
+ paramClassDefaults (dict)
+ FUNCTION (LinearCombination)
+ FUNCTION (Linear)
+ FUNCTION_PARAMS (Modulation.MULTIPLY)

Class methods:
Expand Down Expand Up @@ -419,7 +419,7 @@ def __init__(self,
size=None,
index=None,
calculate=Linear,
function=LinearCombination(operation=SUM),
function=Linear(),
modulation:tc.optional(_is_modulation_param)=None,
projections=None,
params=None,
Expand Down
6 changes: 3 additions & 3 deletions psyneulink/components/states/modulatorysignals/learningsignal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class LearningSignal(ModulatorySignal):
"""
LearningSignal( \
owner, \
function=LinearCombination(operation=SUM), \
function=Linear(), \
modulation=ModulationParam.MULTIPLICATIVE \
learning_rate=None \
params=None, \
Expand All @@ -222,7 +222,7 @@ class LearningSignal(ModulatorySignal):
Class attributes:
+ componentType (str) = LEARNING_SIGNAL
+ paramClassDefaults (dict)
+ FUNCTION (LinearCombination)
+ FUNCTION (Linear)
+ FUNCTION_PARAMS (Operation.PRODUCT)

Class methods:
Expand Down Expand Up @@ -361,7 +361,7 @@ def __init__(self,
size=None,
index=PRIMARY,
calculate=Linear,
function=LinearCombination(operation=SUM),
function=Linear(),
learning_rate: tc.optional(parameter_spec) = None,
modulation:tc.optional(_is_modulation_param)=None,
projections=None,
Expand Down