From 2870cfd8cedbaeca1942c7b75f86227a10ab6ca6 Mon Sep 17 00:00:00 2001 From: "Randall C. O'Reilly" Date: Fri, 25 Oct 2024 12:49:36 -0700 Subject: [PATCH] set testing flag on viewupdate; rename TD names -- don't need Rew --- axon/looper.go | 2 ++ axon/pathparams.go | 2 +- axon/pathparams.goal | 2 +- axon/rl_net.go | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/axon/looper.go b/axon/looper.go index 385179a7..8b4f63ed 100644 --- a/axon/looper.go +++ b/axon/looper.go @@ -134,6 +134,7 @@ func LooperUpdateNetView(man *looper.Manager, viewupdt *netview.ViewUpdate, net if curTime != etime.Cycle { loop.OnEnd.Add("GUI:UpdateNetView", func() { ctrUpdateFunc(curTime) + viewupdt.Testing = m == etime.Test viewupdt.UpdateTime(curTime) }) } @@ -142,6 +143,7 @@ func LooperUpdateNetView(man *looper.Manager, viewupdt *netview.ViewUpdate, net cycLoop.OnEnd.Add("GUI:UpdateNetView", func() { cyc := cycLoop.Counter.Cur ctrUpdateFunc(etime.Cycle) + viewupdt.Testing = m == etime.Test viewupdt.UpdateCycle(cyc) }) } diff --git a/axon/pathparams.go b/axon/pathparams.go index 5e1e5048..15fb186b 100644 --- a/axon/pathparams.go +++ b/axon/pathparams.go @@ -561,7 +561,7 @@ func (pt *PathParams) DWtSynRWPred(ctx *Context, syni, si, ri, di uint32, layPoo } // DWtSynTDPred computes the weight change (learning) at given synapse, -// for the TDRewPredPath type +// for the TDPredPath type func (pt *PathParams) DWtSynTDPred(ctx *Context, syni, si, ri, di uint32, layPool, subPool *Pool) { // todo: move all of this into rn.RLRate lda := GlobalScalars.Value(int(GvDA), int(di)) diff --git a/axon/pathparams.goal b/axon/pathparams.goal index 77f936ca..b6110420 100644 --- a/axon/pathparams.goal +++ b/axon/pathparams.goal @@ -559,7 +559,7 @@ func (pt *PathParams) DWtSynRWPred(ctx *Context, syni, si, ri, di uint32, layPoo } // DWtSynTDPred computes the weight change (learning) at given synapse, -// for the TDRewPredPath type +// for the TDPredPath type func (pt *PathParams) DWtSynTDPred(ctx *Context, syni, si, ri, di uint32, layPool, subPool *Pool) { // todo: move all of this into rn.RLRate lda := GlobalScalars[GvDA, di] diff --git a/axon/rl_net.go b/axon/rl_net.go index bdbad5b6..97a5f53d 100644 --- a/axon/rl_net.go +++ b/axon/rl_net.go @@ -22,7 +22,7 @@ func (nt *Network) AddClampDaLayer(name string) *Layer { } // AddTDLayers adds the standard TD temporal differences layers, generating a DA signal. -// Pathway from Rew to RewInteg is given class TDRewToInteg -- should +// Pathway from Rew to RewInteg is given class TDToInteg -- should // have no learning and 1 weight. func (nt *Network) AddTDLayers(prefix string, rel relpos.Relations, space float32) (rew, rp, ri, td *Layer) { rew = nt.AddRewLayer(prefix + "Rew")