From 0ddb7920f2452bf721c5f838f70d9d7ad851bc0c Mon Sep 17 00:00:00 2001 From: jdcpni Date: Thu, 15 Feb 2018 20:26:12 -0500 Subject: [PATCH] Docs/function/hebbian (#661) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeuLink into refactor/Projection/Context_devel # Conflicts: # psyneulink/components/mechanisms/adaptive/control/controlmechanism.py * - * • Function Hebbian().function - updated docstring to show proper calculation --- psyneulink/components/functions/function.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/psyneulink/components/functions/function.py b/psyneulink/components/functions/function.py index b5a54436280..a95b4898495 100644 --- a/psyneulink/components/functions/function.py +++ b/psyneulink/components/functions/function.py @@ -9042,7 +9042,11 @@ def function(self, context=None): """Calculate a matrix of weight changes from a 1d array of activity values using Hebbian learning function. - Weight change matrix = *learning_rate* :math:`* w_{ij}x_ix_j` + The weight change matrix is calculated as: + + *learning_rate* * :math:`a_ia_j` if `i \\neq j`, else `0` + + where :math:`a_i` and :math:`a_j` are elements of `variable `. Arguments ---------