more name updates, generate updates

emer · Aug 11, 2024 · e359c2b · e359c2b
1 parent 38ab689
commit e359c2b
Show file tree

Hide file tree

Showing 56 changed files with 88 additions and 88 deletions.
diff --git 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.
-// Projection from Rew to RewInteg is given class TDRewToInteg -- should
+// Pathway from Rew to RewInteg is given class TDRewToInteg -- 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")

diff --git a/axon/typegen.go b/axon/typegen.go
diff --git a/examples/attn_trn/attn.go b/examples/attn_trn/attn.go
@@ -647,10 +647,10 @@ func (ss *Sim) Stopped() {
 	}
 }
 
-// SaveWts saves the network weights -- when called with views.CallMethod
+// SaveWeights saves the network weights -- when called with views.CallMethod
 // it will auto-prompt for filename
-func (ss *Sim) SaveWts(filename core.Filename) {
-	ss.Net.SaveWtsJSON(filename)
+func (ss *Sim) SaveWeights(filename core.Filename) {
+	ss.Net.SaveWeightsJSON(filename)
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////
@@ -1091,7 +1091,7 @@ func (ss *Sim) ConfigGUI() *core.Window {
 // These props register Save methods so they can be used
 var SimProps = tree.Props{
 	"CallMethods": tree.PropSlice{
-		{"SaveWts", tree.Props{
+		{"SaveWeights", tree.Props{
 			"desc": "save network weights to file",
 			"icon": "file-save",
 			"Args": tree.PropSlice{

diff --git a/examples/choose/choose.go b/examples/choose/choose.go
@@ -486,7 +486,7 @@ func (ss *Sim) ConfigLoops() {
 	// Save weights to file, to look at later
 	man.GetLoop(etime.Train, etime.Run).OnEnd.Add("SaveWeights", func() {
 		ctrString := ss.Stats.PrintValues([]string{"Run", "Epoch"}, []string{"%03d", "%05d"}, "_")
-		axon.SaveWeightsIfConfigSet(ss.Net, ss.Config.Log.SaveWts, ctrString, ss.Stats.String("RunName"))
+		axon.SaveWeightsIfConfigSet(ss.Net, ss.Config.Log.SaveWeights, ctrString, ss.Stats.String("RunName"))
 	})
 
 	man.GetLoop(etime.Train, etime.Epoch).OnEnd.Add("PctCortex", func() {
@@ -678,9 +678,9 @@ func (ss *Sim) NewRun() {
 	ss.InitStats()
 	ss.StatCounters(0)
 	ss.Logs.ResetLog(etime.Train, etime.Epoch)
-	if ss.Config.OpenWts != "" {
-		ss.Net.OpenWtsJSON(core.Filename(ss.Config.OpenWts))
-		log.Println("Opened weights:", ss.Config.OpenWts)
+	if ss.Config.OpenWeights != "" {
+		ss.Net.OpenWeightsJSON(core.Filename(ss.Config.OpenWeights))
+		log.Println("Opened weights:", ss.Config.OpenWeights)
 	}
 }
 
@@ -1443,7 +1443,7 @@ func (ss *Sim) RunNoGUI() {
 	if ss.Config.Params.Note != "" {
 		mpi.Printf("Note: %s\n", ss.Config.Params.Note)
 	}
-	if ss.Config.Log.SaveWts {
+	if ss.Config.Log.SaveWeights {
 		mpi.Printf("Saving final weights per run\n")
 	}
 	runName := ss.Params.RunName(ss.Config.Run.Run)

diff --git a/examples/choose/config.go b/examples/choose/config.go
@@ -109,7 +109,7 @@ type RunConfig struct {
 type LogConfig struct {
 
 	// if true, save final weights after each run
-	SaveWts bool
+	SaveWeights bool
 
 	// if true, save train epoch log to file, as .epc.tsv typically
 	Epoch bool `default:"true" nest:"+"`
@@ -140,7 +140,7 @@ type Config struct {
 	Debug bool
 
 	// if set, open given weights file at start of training
-	OpenWts string
+	OpenWeights string
 
 	// environment configuration options
 	Env EnvConfig `display:"add-fields"`