cleaned up bern-cell, hebb-syn

Author: Alexander Ororbia

ngclearn/components/neurons/graded/bernoulliErrorCell.py

@@ -80,12 +80,11 @@ def _advance_state(dt, p, target, modulator, mask, input_logits): ## compute Ber
             dL_dp = x - _p ## d(Bern LL)/dp where _p = sigmoid(p)
         else:
             dL_dp = x/(_p) - one_min_x/one_min_p  ## d(Bern LL)/dp
-        dL_dx = log_p - log_one_min_p  ## d(Bern LL)/dx
-        dp = dL_dp #* d_sigmoid(p)
-        if input_logits:
-            dp = dp * d_sigmoid(p)
+            dL_dp = dL_dp  * d_sigmoid(p)
+        dL_dx = (log_p - log_one_min_p)  ## d(Bern LL)/dx
+        dp = dL_dp
 
-        dp = dL_dp * modulator * mask ## NOTE: how does mask apply to a multivariate Bernoulli?
+        dp = dp * modulator * mask ## NOTE: how does mask apply to a multivariate Bernoulli?
         dtarget = dL_dx * modulator * mask
         mask = mask * 0. + 1. ## "eat" the mask as it should only apply at time t
         return dp, dtarget, jnp.squeeze(L), mask

ngclearn/components/synapses/hebbian/hebbianSynapse.py

@@ -178,6 +178,10 @@ def __init__(self, name, shape, eta=0., weight_init=None, bias_init=None,
         self.shape = shape
         self.Rscale = resist_scale
         self.prior_type = prior_type
+        if self.prior_type.lower() == "gaussian":
+            self.prior_type = "ridge"
+        elif self.prior_type.lower() == "laplacian":
+            self.prior_type = "lasso"
         self.prior_lmbda = prior_lmbda
         self.w_bound = w_bound
         self.pre_wght = pre_wght