start on negative valence update

Makefile

@@ -15,6 +15,22 @@ build:
  @echo "GO111MODULE = $(value GO111MODULE)"
  $(GOBUILD) -v $(DIRS)
 
+build_exe: ./examples/*
+ @echo "GO111MODULE = $(value GO111MODULE)"
+ @for f in $^; do \
+ DIR=$$(basename $${f}) && echo "" && echo "###########################" && \
+ echo "example: $${DIR} in path: $${f}"; \
+ cd $${f}; go build -v; cd ../../; \
+ done
+
+params_good: ./examples/*
+ @echo "GO111MODULE = $(value GO111MODULE)"
+ @for f in $^; do \
+ DIR=$$(basename $${f}) && echo "" && echo "###########################" && \
+ echo "example: $${DIR} in path: $${f}"; \
+ cd $${f}; go build -v; ./$${DIR} -no-gui -Params.SaveAll -Params.Good; cd ../../; \
+ done
+
 test:
  @echo "GO111MODULE = $(value GO111MODULE)"
  export TEST_GPU=false; $(GOTEST) -v -tags multinet $(DIRS)

axon/Makefile

@@ -18,7 +18,7 @@ clean:
  $(GOCLEAN)
 
 # NOTE: MUST update version number here prior to running 'make release'
-VERS=v1.8.15
+VERS=v1.8.16
 PACKAGE=axon
 VERS_DATE=`date -u +%Y-%m-%d\ %H:%M`
 GIT_COMMIT=`git rev-parse --short HEAD`

axon/act.go

@@ -289,8 +289,8 @@ type DtParams struct {
  // [def: 20] [min: 1] time constant for integrating slower long-time-scale averages, such as nrn.ActAvg, Pool.ActsMAvg, ActsPAvg -- computed in NewState when a new input state is present (i.e., not msec but in units of a theta cycle) (tau is roughly how long it takes for value to change significantly) -- set lower for smaller models
  LongAvgTau float32 `def:"20" min:"1" desc:"time constant for integrating slower long-time-scale averages, such as nrn.ActAvg, Pool.ActsMAvg, ActsPAvg -- computed in NewState when a new input state is present (i.e., not msec but in units of a theta cycle) (tau is roughly how long it takes for value to change significantly) -- set lower for smaller models"`
 
- // [def: 10] [min: 0] cycle to start updating the SpkMaxCa, SpkMax, GeIntMax values within a theta cycle -- early cycles often reflect prior state
- MaxCycStart int32 `def:"10" min:"0" desc:"cycle to start updating the SpkMaxCa, SpkMax, GeIntMax values within a theta cycle -- early cycles often reflect prior state"`
+ // [def: 10] [min: 0] cycle to start updating the SpkMaxCa, SpkMax values within a theta cycle -- early cycles often reflect prior state
+ MaxCycStart int32 `def:"10" min:"0" desc:"cycle to start updating the SpkMaxCa, SpkMax values within a theta cycle -- early cycles often reflect prior state"`
 
  // [view: -] nominal rate = Integ / tau
  VmDt float32 `view:"-" json:"-" xml:"-" desc:"nominal rate = Integ / tau"`
@@ -824,6 +824,10 @@ func (ac *ActParams) DecayState(ctx *Context, ni, di uint32, decay, glong, ahp f
  AddNrnV(ctx, ni, di, GiNoise, -decay*NrnV(ctx, ni, di, GiNoise))
 
  AddNrnV(ctx, ni, di, GiSyn, -decay*NrnV(ctx, ni, di, GiSyn))
+
+ AddNrnV(ctx, ni, di, GeInt, -decay*NrnV(ctx, ni, di, GeInt))
+ AddNrnV(ctx, ni, di, GiInt, -decay*NrnV(ctx, ni, di, GiInt))
+ AddNrnV(ctx, ni, di, GeIntNorm, -decay*NrnV(ctx, ni, di, GeIntNorm))
  }
 
  AddNrnV(ctx, ni, di, VmDend, -glong*(NrnV(ctx, ni, di, VmDend)-ac.Init.Vm))
@@ -897,6 +901,9 @@ func (ac *ActParams) InitActs(ctx *Context, ni, di uint32) {
  SetNrnV(ctx, ni, di, GiNoise, 0)
 
  SetNrnV(ctx, ni, di, GiSyn, 0)
+ SetNrnV(ctx, ni, di, GeInt, 0)
+ SetNrnV(ctx, ni, di, GeIntNorm, 0)
+ SetNrnV(ctx, ni, di, GiInt, 0)
 
  SetNrnV(ctx, ni, di, MahpN, 0)
  SetNrnV(ctx, ni, di, SahpCa, 0)
@@ -947,7 +954,7 @@ func (ac *ActParams) InitActs(ctx *Context, ni, di uint32) {
 }
 
 // InitLongActs initializes longer time-scale activation states in neuron
-// (SpkPrv, SpkSt*, ActM, ActP, GeInt, GiInt)
+// (SpkPrv, SpkSt*, ActM, ActP)
 // Called from InitActs, which is called from InitWts,
 // but otherwise not automatically called
 // (DecayState is used instead)
@@ -957,9 +964,6 @@ func (ac *ActParams) InitLongActs(ctx *Context, ni, di uint32) {
  SetNrnV(ctx, ni, di, SpkSt2, 0)
  SetNrnV(ctx, ni, di, ActM, 0)
  SetNrnV(ctx, ni, di, ActP, 0)
- SetNrnV(ctx, ni, di, GeInt, 0)
- SetNrnV(ctx, ni, di, GiInt, 0)
- SetNrnV(ctx, ni, di, GeIntMax, 0)
 }
 
 //gosl: start act

axon/basic_test.go

@@ -17,6 +17,7 @@ import (
  "strings"
  "testing"
 
+ "github.com/emer/emergent/erand"
  "github.com/emer/emergent/etime"
  "github.com/emer/emergent/params"
  "github.com/emer/emergent/prjn"
@@ -110,6 +111,9 @@ func newTestNet(ctx *Context, nData int) *Network {
  testNet.ConnectLayers(hidLay, outLay, prjn.NewOneToOne(), ForwardPrjn)
  testNet.ConnectLayers(outLay, hidLay, prjn.NewOneToOne(), BackPrjn)
 
+ testNet.PVLV.SetNUSs(ctx, 4, 3)
+ testNet.PVLV.Defaults()
+
  testNet.Build(ctx)
  ctx.NetIdxs.NData = uint32(nData)
  testNet.Defaults()
@@ -1429,37 +1433,30 @@ func saveToFile(net *Network, t *testing.T) {
 func TestGlobalIdxs(t *testing.T) {
  ctx := NewContext()
  nData := uint32(5)
- ctx.PVLV.Drive.NActive = 4
- ctx.PVLV.Drive.NNegUSs = 3
  net := newTestNet(ctx, int(nData))
+ pv := &net.PVLV
  val := float32(0)
 
- // fmt.Printf("MaxData: %d NActive: %d NNegUSs: %d NetIdxs: GvVTAOff: %d Stride: %d USnegOff: %d DriveOff: %d DriveStride: %d\n", ctx.NetIdxs.MaxData, ctx.PVLV.Drive.NActive, ctx.PVLV.Drive.NNegUSs, ctx.NetIdxs.GvVTAOff, ctx.NetIdxs.GvVTAStride, ctx.NetIdxs.GvUSnegOff, ctx.NetIdxs.GvDriveOff, ctx.NetIdxs.GvDriveStride)
+ // fmt.Printf("MaxData: %d NActive: %d NNegUSs: %d NetIdxs: USnegOff: %d DriveOff: %d DriveStride: %d\n", ctx.NetIdxs.MaxData, ctx.PVLV.NPosUSs, ctx.PVLV.Drive.NNegUSs, ctx.NetIdxs.GvUSnegOff, ctx.NetIdxs.GvDriveOff, ctx.NetIdxs.GvDriveStride)
 
- for vv := GvRew; vv < GvVtaDA; vv++ {
+ for vv := GvRew; vv < GvUSneg; vv++ {
  for di := uint32(0); di < nData; di++ {
  SetGlbV(ctx, di, vv, val)
  val += 1
  }
  }
- for vv := GvVtaDA; vv < GvUSneg; vv++ {
- for vt := GvVtaRaw; vt < GlobalVTATypeN; vt++ {
+ for vv := GvUSneg; vv <= GvUSnegRaw; vv++ {
+ for ui := uint32(0); ui < pv.NNegUSs; ui++ {
  for di := uint32(0); di < nData; di++ {
- SetGlbVTA(ctx, di, vt, vv, val)
+ SetGlbUSneg(ctx, di, vv, ui, val)
  val += 1
  }
  }
  }
- for ui := uint32(0); ui < ctx.PVLV.Drive.NNegUSs; ui++ {
- for di := uint32(0); di < nData; di++ {
- SetGlbUSneg(ctx, di, ui, val)
- val += 1
- }
- }
  for vv := GvDrives; vv < GlobalVarsN; vv++ {
- for ui := uint32(0); ui < ctx.PVLV.Drive.NActive; ui++ {
+ for ui := uint32(0); ui < pv.NPosUSs; ui++ {
  for di := uint32(0); di < nData; di++ {
- SetGlbDrvV(ctx, di, ui, vv, val)
+ SetGlbUSposV(ctx, di, vv, ui, val)
  val += 1
  }
  }
@@ -1477,8 +1474,6 @@ func TestGlobalIdxs(t *testing.T) {
 func TestSendGatherIdxs(t *testing.T) {
  ctx := NewContext()
  nData := uint32(3)
- ctx.PVLV.Drive.NActive = 4
- ctx.PVLV.Drive.NNegUSs = 3
  net := newTestNet(ctx, int(nData))
 
  maxDel := net.MaxDelay + 1
@@ -1597,6 +1592,17 @@ func TestSendGatherIdxs(t *testing.T) {
  }
 }
 
+func TestPVLVGiveUp(t *testing.T) {
+ t.Skip("")
+ gp := &GiveUpParams{}
+ gp.Defaults()
+ rnd := erand.NewGlobalRand()
+ for v := float32(-1.0); v <= float32(1); v += 0.01 {
+ p, b := gp.Prob(v, rnd)
+ fmt.Printf("%g\tp: %g\tb: %v\n", v, p, b)
+ }
+}
+
 /* todo: fixme
 func TestSWtInit(t *testing.T) {
  pj := &PrjnParams{}