diff --git a/axon/neuron.go b/axon/neuron.go index 918ff7fa..d09cdc5b 100644 --- a/axon/neuron.go +++ b/axon/neuron.go @@ -560,10 +560,10 @@ var NeuronVarProps = map[string]string{ "SpkMaxCa": `desc:"Ca integrated like CaSpkP but only starting at MaxCycStart cycle, to prevent inclusion of carryover spiking from prior theta cycle trial -- the PTau time constant otherwise results in significant carryover. This is the input to SpkMax"`, "SpkMax": `desc:"maximum CaSpkP across one theta cycle time window (max of SpkMaxCa) -- used for specialized algorithms that have more phasic behavior within a single trial, e.g., BG Matrix layer gating. Also useful for visualization of peak activity of neurons."`, - "SpkBin0": `desc:"aggregated spikes within 50 msec bins across the theta cycle, for computing synaptic calcium efficiently."`, - "SpkBin1": `desc:"aggregated spikes within 50 msec bins across the theta cycle, for computing synaptic calcium efficiently."`, - "SpkBin2": `desc:"aggregated spikes within 50 msec bins across the theta cycle, for computing synaptic calcium efficiently."`, - "SpkBin3": `desc:"aggregated spikes within 50 msec bins across the theta cycle, for computing synaptic calcium efficiently."`, + "SpkBin0": `min:"0" max:"10" desc:"aggregated spikes within 50 msec bins across the theta cycle, for computing synaptic calcium efficiently."`, + "SpkBin1": `min:"0" max:"10" desc:"aggregated spikes within 50 msec bins across the theta cycle, for computing synaptic calcium efficiently."`, + "SpkBin2": `min:"0" max:"10" desc:"aggregated spikes within 50 msec bins across the theta cycle, for computing synaptic calcium efficiently."`, + "SpkBin3": `min:"0" max:"10" desc:"aggregated spikes within 50 msec bins across the theta cycle, for computing synaptic calcium efficiently."`, "SpkPrv": `desc:"final CaSpkD activation state at end of previous theta cycle. used for specialized learning mechanisms that operate on delayed sending activations."`, "SpkSt1": `desc:"the activation state at specific time point within current state processing window (e.g., 50 msec for beta cycle within standard theta cycle), as saved by SpkSt1() function. Used for example in hippocampus for CA3, CA1 learning"`, diff --git a/go.mod b/go.mod index 9abcd1a1..c6b0ba3a 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/emer/axon/v2 go 1.22 require ( - cogentcore.org/core v0.1.5-0.20240614235343-22f64ec2583a + cogentcore.org/core v0.1.5-0.20240615200534-448a70a5ecef github.com/anthonynsimon/bild v0.13.0 - github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240614233842-96b5da775420 + github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240615201003-f4bdab6dbea1 github.com/emer/vision/v2 v2.0.0-dev0.0.10.0.20240615002009-932108fbb2af github.com/goki/vulkan v1.0.7 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 64bae2ab..8404ea44 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cogentcore.org/core v0.1.5-0.20240614235343-22f64ec2583a h1:aHJEDfStMYHoaWe1F7K/t009hxze3sIWIxfYH4tZY+s= -cogentcore.org/core v0.1.5-0.20240614235343-22f64ec2583a/go.mod h1:o477M2AoxLk2ayvQgNiN1eCkXPn0cZuY7JJgX+cxoa0= +cogentcore.org/core v0.1.5-0.20240615200534-448a70a5ecef h1:GMzVnrvf2PsQZXm2W7kPY34lUjBmMA8kxGVUHECtvss= +cogentcore.org/core v0.1.5-0.20240615200534-448a70a5ecef/go.mod h1:o477M2AoxLk2ayvQgNiN1eCkXPn0cZuY7JJgX+cxoa0= github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4 h1:6lx9xzJAhdjq0LvVfbITeC3IH9Fzvo1aBahyPu2FuG8= github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4/go.mod h1:FChzXi1izqzdPb6BiNZmcZLGyTYiT61iGx9Rxx9GNeI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -32,8 +32,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240614233842-96b5da775420 h1:c7VX1WXDAuzGPlN4ErGLl+Sp5fCYKo5hXMoNaTHWv+8= -github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240614233842-96b5da775420/go.mod h1:sDaAY5YRxO4bcweXnmRT4MXgjy82uDURViLMVdLLf/o= +github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240615201003-f4bdab6dbea1 h1:jD2EKjqsFPPQ2mtJaEFrQme8b0ZOyvskHs1CQ57PTSs= +github.com/emer/emergent/v2 v2.0.0-dev0.0.14.0.20240615201003-f4bdab6dbea1/go.mod h1:S2ojSrjFC6uF1LSZD1bvj2siI3xqtzKmEoe6aBv7b5E= github.com/emer/vision/v2 v2.0.0-dev0.0.10.0.20240615002009-932108fbb2af h1:EygCJa/2UHXazkv2HX7yJ79TKXzwjX3nxGNhl+V5mn4= github.com/emer/vision/v2 v2.0.0-dev0.0.10.0.20240615002009-932108fbb2af/go.mod h1:p1JsCly+knLmWoUv9O2GSvF+WHqV4wK9OdGSJWeQi3E= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=