update to emergent netview updates, params -> options

emer · Aug 27, 2024 · 6915741 · 6915741
1 parent 4cf4f73
commit 6915741
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 34 deletions.
diff --git a/examples/choose/choose.go b/examples/choose/choose.go
@@ -1332,8 +1332,8 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 20
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = ss.Config.Run.NCycles * 2
- nv.Params.LayNmSize = 0.02
+ nv.Options.MaxRecs = ss.Config.Run.NCycles * 2
+ nv.Options.LayerNameSize = 0.02
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
 

diff --git a/examples/deep_fsa/deep_fsa.go b/examples/deep_fsa/deep_fsa.go
@@ -616,7 +616,7 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
+ nv.Options.MaxRecs = 300
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
  ss.ConfigNetView(nv)

diff --git a/examples/deep_move/deep_move.go b/examples/deep_move/deep_move.go
@@ -612,7 +612,7 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
+ nv.Options.MaxRecs = 300
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
  ss.ConfigNetView(nv)

diff --git a/examples/deep_music/deep_music.go b/examples/deep_music/deep_music.go
@@ -603,7 +603,7 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
+ nv.Options.MaxRecs = 300
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
  ss.ConfigNetView(nv)

diff --git a/examples/dls/dls.go b/examples/dls/dls.go
@@ -979,8 +979,8 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 20
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
- nv.Params.LayNmSize = 0.04
+ nv.Options.MaxRecs = 300
+ nv.Options.LayerNameSize = 0.04
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
 

diff --git a/examples/hip/hip.go b/examples/hip/hip.go
@@ -782,7 +782,7 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
+ nv.Options.MaxRecs = 300
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
  ss.GUI.ViewUpdate = &ss.ViewUpdate

diff --git a/examples/inhib/inhib.go b/examples/inhib/inhib.go
@@ -517,7 +517,7 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 1 // 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
+ nv.Options.MaxRecs = 300
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.AlphaCycle, etime.AlphaCycle)
  ss.GUI.ViewUpdate = &ss.ViewUpdate

diff --git a/examples/mpi/ra25.go b/examples/mpi/ra25.go
@@ -701,7 +701,7 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
+ nv.Options.MaxRecs = 300
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
  ss.GUI.ViewUpdate = &ss.ViewUpdate

diff --git a/examples/objrec/objrec.go b/examples/objrec/objrec.go
@@ -662,8 +662,8 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
- nv.Params.LayNmSize = 0.03
+ nv.Options.MaxRecs = 300
+ nv.Options.LayerNameSize = 0.03
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
 

diff --git a/examples/pcore_ds/pcore_ds.go b/examples/pcore_ds/pcore_ds.go
@@ -829,9 +829,9 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 20
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 400
- nv.Params.Raster.Max = ss.Config.Run.ThetaCycles
- nv.Params.LayNmSize = 0.03
+ nv.Options.MaxRecs = 400
+ nv.Options.Raster.Max = ss.Config.Run.ThetaCycles
+ nv.Options.LayerNameSize = 0.03
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
 

diff --git a/examples/pcore_vs/pcore_vs.go b/examples/pcore_vs/pcore_vs.go
@@ -661,8 +661,8 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 20
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = ss.Config.Run.NCycles * 2
- nv.Params.LayNmSize = 0.03
+ nv.Options.MaxRecs = ss.Config.Run.NCycles * 2
+ nv.Options.LayerNameSize = 0.03
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
 

diff --git a/examples/pfcmaint/pfcmaint.go b/examples/pfcmaint/pfcmaint.go
@@ -500,8 +500,8 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 20
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
- nv.Params.LayNmSize = 0.03
+ nv.Options.MaxRecs = 300
+ nv.Options.LayerNameSize = 0.03
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
 

diff --git a/examples/pvlv/pvlv.go b/examples/pvlv/pvlv.go
@@ -699,9 +699,9 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 400
- nv.Params.Raster.Max = ss.Config.Run.ThetaCycles
- nv.Params.LayNmSize = 0.02
+ nv.Options.MaxRecs = 400
+ nv.Options.Raster.Max = ss.Config.Run.ThetaCycles
+ nv.Options.LayerNameSize = 0.02
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
  ss.GUI.ViewUpdate = &ss.ViewUpdate

diff --git a/examples/ra25/ra25.go b/examples/ra25/ra25.go
@@ -286,7 +286,7 @@ func (ss *Sim) ConfigNet(net *axon.Network) {
  out := net.AddLayer2D("Output", 5, 5, axon.TargetLayer)
 
  // use this to position layers relative to each other
- // hid2.PlaceRightOf(hid1, 2)
+ hid2.PlaceRightOf(hid1, 2)
 
  // note: see emergent/path module for all the options on how to connect
  // NewFull returns a new paths.Full connectivity pattern
@@ -654,7 +654,7 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
+ nv.Options.MaxRecs = 300
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
  ss.GUI.ViewUpdate = &ss.ViewUpdate

diff --git a/examples/ra25x/ra25x.go b/examples/ra25x/ra25x.go
@@ -621,7 +621,7 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
+ nv.Options.MaxRecs = 300
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
  ss.GUI.ViewUpdate = &ss.ViewUpdate

diff --git a/examples/rl/rl.go b/examples/rl/rl.go
@@ -409,7 +409,7 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 10
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
+ nv.Options.MaxRecs = 300
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
  ss.GUI.ViewUpdate = &ss.ViewUpdate

diff --git a/examples/vspatch/vspatch.go b/examples/vspatch/vspatch.go
@@ -640,8 +640,8 @@ func (ss *Sim) ConfigGUI() {
  ss.GUI.CycleUpdateInterval = 20
 
  nv := ss.GUI.AddNetView("Network")
- nv.Params.MaxRecs = 300
- nv.Params.LayNmSize = 0.03
+ nv.Options.MaxRecs = 300
+ nv.Options.LayerNameSize = 0.03
  nv.SetNet(ss.Net)
  ss.ViewUpdate.Config(nv, etime.Phase, etime.Phase)
 

diff --git a/go.mod b/go.mod
@@ -3,9 +3,9 @@ module github.com/emer/axon/v2
 go 1.22
 
 require (
- cogentcore.org/core v0.3.3-0.20240825182959-fe4840922a21
+ cogentcore.org/core v0.3.3-0.20240826230222-6242fb115d90
  github.com/anthonynsimon/bild v0.13.0
- github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240826102207-14a576d51386
+ github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240827085126-42082ad0c8ab
  github.com/emer/vision/v2 v2.0.0-dev0.1.0
  github.com/goki/vulkan v1.0.8
  github.com/stretchr/testify v1.9.0

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-cogentcore.org/core v0.3.3-0.20240825182959-fe4840922a21 h1:tffR0tewNHVE36GpZE7ZjTSE4KYoRfbdeL9btV8UmbU=
-cogentcore.org/core v0.3.3-0.20240825182959-fe4840922a21/go.mod h1:dg3uRsPcd8S1ZYvRD2TztCtjopRkrB5V/lbl54xsQd4=
+cogentcore.org/core v0.3.3-0.20240826230222-6242fb115d90 h1:u9//N88JgZkODL1lhTS19mGMHVUV6MFHJ4ZOgsV0Kx4=
+cogentcore.org/core v0.3.3-0.20240826230222-6242fb115d90/go.mod h1:dg3uRsPcd8S1ZYvRD2TztCtjopRkrB5V/lbl54xsQd4=
 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=
@@ -34,8 +34,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.1.0.0.20240826102207-14a576d51386 h1:tFgKfRHzssTtHVvz4IUaBXf1Cqmmb5s1/bPb0HY0sLw=
-github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240826102207-14a576d51386/go.mod h1:jXS8jqUgcroXlX4510+FXsgb6osLiDWRJLDCD2gpzow=
+github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240827085126-42082ad0c8ab h1:n9vVBx75zvikobialVj3hS8wo99nZyIrzIvCCnDmT1Q=
+github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240827085126-42082ad0c8ab/go.mod h1:p3lypK0iDAhfsKVYFFmtmAFlNunliUFLYV/e9GCIVZk=
 github.com/emer/vision/v2 v2.0.0-dev0.1.0 h1:Xt1zRyjYNGw1XEq4e5mvM9/+GOOBRIu1HYVEYmklp+c=
 github.com/emer/vision/v2 v2.0.0-dev0.1.0/go.mod h1:NjWHbBnHzEEG5CzThQeOz8l/aLp2SROmyyBDIBuRYRc=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=