diff --git a/axon/logging.go b/axon/logging.go index 1918117ff..af59c9730 100644 --- a/axon/logging.go +++ b/axon/logging.go @@ -534,12 +534,12 @@ func LayerActsLogRecReset(lg *elog.Logs) { // LayerActsLogConfigGUI configures GUI for LayerActsLog Plot and LayerActs Avg Plot func LayerActsLogConfigGUI(lg *elog.Logs, gui *egui.GUI) { pt, _ := gui.Tabs.NewTab("LayerActs Plot") - plt := plotcore.NewPlotEditor(pt) + plt := plotcore.NewEditor(pt) gui.Plots["LayerActs"] = plt plt.SetTable(lg.MiscTables["LayerActs"]) pt, _ = gui.Tabs.NewTab("LayerActs Avg Plot") - plt = plotcore.NewPlotEditor(pt) + plt = plotcore.NewEditor(pt) gui.Plots["LayerActsAvg"] = plt plt.SetTable(lg.MiscTables["LayerActsAvg"]) } diff --git a/axon/simstats.go b/axon/simstats.go index 73fc33772..517de1a66 100644 --- a/axon/simstats.go +++ b/axon/simstats.go @@ -153,7 +153,7 @@ func StatLoopCounters(statsDir, currentDir *tensorfs.Node, ls *looper.Stacks, ne tsr := levelDir.Int(name) if start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0) }) if level.Int64() == trialLevel.Int64() { @@ -262,7 +262,7 @@ func StatPerTrialMSec(statsDir *tensorfs.Node, trainMode enums.Enum, trialLevel tsr := levelDir.Float64(name) if start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0) }) return @@ -309,7 +309,7 @@ func StatLayerActGe(statsDir *tensorfs.Node, net *Network, trainMode, trialLevel tsr := levelDir.Float64(name) if start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0) }) continue @@ -453,7 +453,7 @@ func StatPCA(statsDir, currentDir *tensorfs.Node, net *Network, interval int, tr tsr := levelDir.Float64(name) if start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0) }) continue @@ -502,7 +502,7 @@ func StatPrevCorSim(statsDir, currentDir *tensorfs.Node, net *Network, trialLeve tsr := levelDir.Float64(name) if start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) }) continue @@ -561,7 +561,7 @@ func StatLevelAll(statsDir *tensorfs.Node, srcMode, srcLevel enums.Enum, styleFu trg := tensorfs.ValueType(allDir, cl.Name(), clv.DataType(), clv.ShapeSizes()...) if trg.Len() == 0 { if styleFunc != nil { - plot.SetFirstStylerTo(trg, func(s *plot.Style) { + plot.SetFirstStyle(trg, func(s *plot.Style) { styleFunc(s, clv) }) } diff --git a/chans/chanplots/ak-plot.go b/chans/chanplots/ak-plot.go index e1daf215b..ce087a0e7 100644 --- a/chans/chanplots/ak-plot.go +++ b/chans/chanplots/ak-plot.go @@ -113,12 +113,12 @@ func (pl *AKPlot) GVRun() { //types:add } metadata.SetDoc(dir.Float64("Gaks"), "Gaks is the simplified AK conductance, actually used in models") metadata.SetDoc(dir.Float64("Ms"), "Ms is the simplified AK M gate, actually used in models") - plot.SetFirstStylerTo(dir.Float64("V"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("V"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Gak", "M", "H", "Gaks"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "AK G(V)" }) @@ -185,12 +185,12 @@ func (pl *AKPlot) TimeRun() { //types:add } } } - plot.SetFirstStylerTo(dir.Float64("Time"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Time"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Gak", "M", "H"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "AK G(t)" }) diff --git a/chans/chanplots/gabab-plot.go b/chans/chanplots/gabab-plot.go index 3fb962d82..b15c25b87 100644 --- a/chans/chanplots/gabab-plot.go +++ b/chans/chanplots/gabab-plot.go @@ -113,12 +113,12 @@ func (pl *GababPlot) GVRun() { //types:add dir.Float64("GgabaBstd", nv).SetFloat1D(float64(gs), vi) } metadata.SetDoc(dir.Float64("GgabaBstd"), "std is from code actually used in models") - plot.SetFirstStylerTo(dir.Float64("V"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("V"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"GgabaB"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "GABA-B G(V)" }) @@ -146,12 +146,12 @@ func (pl *GababPlot) GSRun() { //types:add dir.Float64("GgabaBstd_max", nv).SetFloat1D(float64(gs), si) } metadata.SetDoc(dir.Float64("GgabaBstd_max"), "std is from code actually used in models") - plot.SetFirstStylerTo(dir.Float64("S"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("S"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"GgabaB_max"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "GABAB G(spike)" }) @@ -198,12 +198,12 @@ func (pl *GababPlot) TimeRun() { //types:add } metadata.SetDoc(dir.Float64("GabaBstd"), "std is from code actually used in models") metadata.SetDoc(dir.Float64("GabaBXstd"), "std is from code actually used in models") - plot.SetFirstStylerTo(dir.Float64("Time"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Time"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"GabaB", "GabaBX"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "GABAB G(t)" }) diff --git a/chans/chanplots/kir-plot.go b/chans/chanplots/kir-plot.go index f5c7bcc2e..4bd11cd93 100644 --- a/chans/chanplots/kir-plot.go +++ b/chans/chanplots/kir-plot.go @@ -92,12 +92,12 @@ func (pl *KirPlot) GVRun() { //types:add dir.Float64("Minf", nv).SetFloat1D(float64(minf), vi) dir.Float64("Mtau", nv).SetFloat1D(float64(mtau), vi) } - plot.SetFirstStylerTo(dir.Float64("V"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("V"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"GkIR", "M"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "kIR G(V)" }) @@ -153,12 +153,12 @@ func (pl *KirPlot) TimeRun() { //types:add } } } - plot.SetFirstStylerTo(dir.Float64("Time"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Time"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"V", "GkIR", "M"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "GkIR G(t)" }) diff --git a/chans/chanplots/mahp-plot.go b/chans/chanplots/mahp-plot.go index 4f02cc903..7b7f7e281 100644 --- a/chans/chanplots/mahp-plot.go +++ b/chans/chanplots/mahp-plot.go @@ -85,12 +85,12 @@ func (pl *MahpPlot) GVRun() { //types:add dir.Float64("Ninf", nv).SetFloat1D(float64(ninf), vi) dir.Float64("Tau", nv).SetFloat1D(float64(tau), vi) } - plot.SetFirstStylerTo(dir.Float64("V"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("V"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Ninf", "Tau"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "Mahp G(V)" }) @@ -148,12 +148,12 @@ func (pl *MahpPlot) TimeRun() { //types:add } } } - plot.SetFirstStylerTo(dir.Float64("Time"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Time"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"GmAHP", "N"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "Mahp G(t)" }) diff --git a/chans/chanplots/nmda-plot.go b/chans/chanplots/nmda-plot.go index 9f8018617..a746fbaf2 100644 --- a/chans/chanplots/nmda-plot.go +++ b/chans/chanplots/nmda-plot.go @@ -117,12 +117,12 @@ func (pl *NMDAPlot) GVRun() { //types:add dir.Float64("Ca", nv).SetFloat1D(float64(ca), vi) } metadata.SetDoc(dir.Float64("Gnmda_std"), "std is the standard equations actually used in models") - plot.SetFirstStylerTo(dir.Float64("V"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("V"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Gnmda"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "NMDA G(V)" }) @@ -154,12 +154,12 @@ func (pl *NMDAPlot) TimeRun() { //types:add dir.Float64("Gnmda", nv).SetFloat1D(g, ti) dir.Float64("NMDA", nv).SetFloat1D(nmda, ti) } - plot.SetFirstStylerTo(dir.Float64("Time"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Time"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Gnmda", "NMDA"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "NMDA G(t)" }) diff --git a/chans/chanplots/sahp-plot.go b/chans/chanplots/sahp-plot.go index 5b20257b0..e9224ae51 100644 --- a/chans/chanplots/sahp-plot.go +++ b/chans/chanplots/sahp-plot.go @@ -77,12 +77,12 @@ func (pl *SahpPlot) GCaRun() { //types:add dir.Float64("Ninf", nv).SetFloat1D(float64(ninf), vi) dir.Float64("Tau", nv).SetFloat1D(float64(tau), vi) } - plot.SetFirstStylerTo(dir.Float64("Ca"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Ca"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Ninf", "Tau"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "sAHP G(Ca)" }) @@ -121,12 +121,12 @@ func (pl *SahpPlot) TimeRun() { //types:add ca = mp.CaInt(ca, pl.TimeCaD) n += dn } - plot.SetFirstStylerTo(dir.Float64("Time"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Time"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Ca", "GsAHP", "N"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "sAHP G(t)" }) diff --git a/chans/chanplots/skca-plot.go b/chans/chanplots/skca-plot.go index e7999ae19..dbe3e3ec5 100644 --- a/chans/chanplots/skca-plot.go +++ b/chans/chanplots/skca-plot.go @@ -77,12 +77,12 @@ func (pl *SKCaPlot) GCaRun() { //types:add dir.Float64("Mhill", nv).SetFloat1D(float64(mh), vi) dir.Float64("Mgw06", nv).SetFloat1D(float64(mg), vi) } - plot.SetFirstStylerTo(dir.Float64("Ca"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Ca"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Mhill", "Mgw06"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "sK Ca G(Ca)" }) @@ -133,12 +133,12 @@ func (pl *SKCaPlot) TimeRun() { //types:add // todo: update // ss.CaParams.FromSpike(spike, &caM, &caP, &caD) } - plot.SetFirstStylerTo(dir.Float64("Time"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Time"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Spike", "CaIn", "CaR", "M"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "sK Ca G(t)" }) diff --git a/chans/chanplots/synca-plot.go b/chans/chanplots/synca-plot.go index ee057ad47..c79c2e57d 100644 --- a/chans/chanplots/synca-plot.go +++ b/chans/chanplots/synca-plot.go @@ -173,12 +173,12 @@ func (pl *SynCaPlot) TimeRun() { //types:add di += float64(pl.CaDt.DDt) * (pi - di) } - plot.SetFirstStylerTo(dir.Float64("t"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("t"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"m", "p", "d"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "SynCa" }) diff --git a/chans/chanplots/vgcc-plot.go b/chans/chanplots/vgcc-plot.go index 6f188ad48..c2b99e795 100644 --- a/chans/chanplots/vgcc-plot.go +++ b/chans/chanplots/vgcc-plot.go @@ -91,12 +91,12 @@ func (pl *VGCCPlot) GVRun() { //types:add dir.Float64("dM", nv).SetFloat1D(float64(dm), vi) dir.Float64("dH", nv).SetFloat1D(float64(dh), vi) } - plot.SetFirstStylerTo(dir.Float64("V"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("V"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Gvgcc", "M", "H"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "VGCC G(V)" }) @@ -151,12 +151,12 @@ func (pl *VGCCPlot) TimeRun() { //types:add } } } - plot.SetFirstStylerTo(dir.Float64("Time"), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64("Time"), func(s *plot.Style) { s.Role = plot.X }) ons := []string{"Gvgcc", "V", "M", "H"} for _, on := range ons { - plot.SetFirstStylerTo(dir.Float64(on), func(s *plot.Style) { + plot.SetFirstStyle(dir.Float64(on), func(s *plot.Style) { s.On = true s.Plot.Title = "VGCC G(t)" }) diff --git a/go.mod b/go.mod index d9ae9f13e..d2b952a9d 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/emer/axon/v2 go 1.22 require ( - cogentcore.org/core v0.3.8-0.20250113105110-b73be80edead - cogentcore.org/lab v0.0.0-20250109203708-c742f9552551 + cogentcore.org/core v0.3.8-0.20250116184504-a8f1ea77c96a + cogentcore.org/lab v0.0.0-20250116190940-0b99b79306a7 github.com/anthonynsimon/bild v0.13.0 github.com/cogentcore/yaegi v0.0.0-20240724064145-e32a03faad56 - github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20241223211126-97d70964931f + github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250116192121-bef0fa284613 github.com/emer/v1vision v0.1.1-0.20241223003153-dd6818448b3b github.com/stretchr/testify v1.9.0 gitlab.com/gomidi/midi/v2 v2.0.30 @@ -49,7 +49,7 @@ require ( golang.org/x/crypto v0.31.0 // indirect golang.org/x/image v0.18.0 // indirect golang.org/x/mod v0.20.0 // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect diff --git a/go.sum b/go.sum index fe99ebfc4..c2a333a26 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -cogentcore.org/core v0.3.8-0.20250113105110-b73be80edead h1:aBcVq6+4XbhphORwy1oyZUGbTSkKMkzyxKnM5Oo/O1c= -cogentcore.org/core v0.3.8-0.20250113105110-b73be80edead/go.mod h1:Ipnb14B+l0qLzjvcvCIhnDucV9H9RyuqS4knZz5kB8A= -cogentcore.org/lab v0.0.0-20250109203708-c742f9552551 h1:aHaTWuqrsVKnwrcPACwAGy8v0KN5bCxgDqcwfzjtsmA= -cogentcore.org/lab v0.0.0-20250109203708-c742f9552551/go.mod h1:cFjKEyMK/eCST7x6sGCGjC12iY+/vcgZime7ASFnM/k= +cogentcore.org/core v0.3.8-0.20250116184504-a8f1ea77c96a h1:xCB5wB7hkL7/y2dLNfXr4Hd8SMwpdmk6NQi9mqhItnI= +cogentcore.org/core v0.3.8-0.20250116184504-a8f1ea77c96a/go.mod h1:X82rE06Zg1s8KHqm4IlnTzk2kBjNGScRlUHsui5vRj4= +cogentcore.org/lab v0.0.0-20250116190940-0b99b79306a7 h1:+ZilP89A6Fzz6W/QX/l2OVtfTLFPUr+hEH7z7ZoTWyE= +cogentcore.org/lab v0.0.0-20250116190940-0b99b79306a7/go.mod h1:Tu7zXJLh01yQrNL9ojRtY54hNL5sDYYzo3Ab37kNqMo= 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= @@ -38,8 +38,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.7.0.20241223211126-97d70964931f h1:8BClX4zufSO1UcFqrWaHLOebvEEeZoXAf2cbSJL5tl4= -github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20241223211126-97d70964931f/go.mod h1:Ty+hS7cpIhBvrtq6TzNClkx5PU/d7ob+YrIpHoURwis= +github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250116192121-bef0fa284613 h1:zPCKB06yq0CNE2n8uuEZKWChOgRoN4Bhwd1VZJry6bs= +github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250116192121-bef0fa284613/go.mod h1:kWXpQFYstjmqi2zs25uGmORzIJoWMG6IDaiOYA3FNbw= github.com/emer/v1vision v0.1.1-0.20241223003153-dd6818448b3b h1:UBArUDbvn8BWihXRqQldTAao2KmbJmxZwWo9BJB+O1s= github.com/emer/v1vision v0.1.1-0.20241223003153-dd6818448b3b/go.mod h1:UxlVgZX0apfnWPXD9XOkaC4TnZkQhgU8D3G2Lj20sTg= github.com/ergochat/readline v0.1.2 h1:zxiwQB8DyTLD0HSWthJlnvs5E2X1qnyXZ44RFf1jRlg= @@ -134,8 +134,8 @@ golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/sims/_attn/attn.go b/sims/_attn/attn.go index 825f5deae..26dd79e1c 100644 --- a/sims/_attn/attn.go +++ b/sims/_attn/attn.go @@ -280,10 +280,10 @@ type Sim struct { ToolBar *core.ToolBar `display:"-"` // the test-trial plot - TstTrlPlot *plotcore.PlotEditor `display:"-"` + TstTrlPlot *plotcore.Editor `display:"-"` // the test-trial plot - TstRunPlot *plotcore.PlotEditor `display:"-"` + TstRunPlot *plotcore.Editor `display:"-"` // for holding layer values ValuesTsrs map[string]*tensor.Float32 `display:"-"` @@ -850,7 +850,7 @@ func (ss *Sim) ConfigTstTrlLog(dt *table.Table) { dt.SetNumRows(0) } -func (ss *Sim) ConfigTstTrlPlot(plt *plotcore.PlotEditor, dt *table.Table) *plotcore.PlotEditor { +func (ss *Sim) ConfigTstTrlPlot(plt *plotcore.Editor, dt *table.Table) *plotcore.Editor { plt.Options.Title = "Attn Test Trial Plot" plt.Options.XAxis = "Trial" plt.SetTable(dt) @@ -898,7 +898,7 @@ func (ss *Sim) ConfigTstRunLog(dt *table.Table) { dt.SetNumRows(0) } -func (ss *Sim) ConfigTstRunPlot(plt *plotcore.PlotEditor, dt *table.Table) *plotcore.PlotEditor { +func (ss *Sim) ConfigTstRunPlot(plt *plotcore.Editor, dt *table.Table) *plotcore.Editor { plt.Options.Title = "Attn Test Run Plot" plt.Options.XAxis = "Trial" plt.SetTable(dt) @@ -957,10 +957,10 @@ func (ss *Sim) ConfigGUI() *core.Window { ss.NetView = nv ss.ConfigNetView(nv) - plt := tv.AddNewTab(plotcore.KiT_PlotView, "TstTrlPlot").(*plotcore.PlotEditor) + plt := tv.AddNewTab(plotcore.KiT_PlotView, "TstTrlPlot").(*plotcore.Editor) ss.TstTrlPlot = ss.ConfigTstTrlPlot(plt, ss.TstTrlLog) - plt = tv.AddNewTab(plotcore.KiT_PlotView, "TstRunPlot").(*plotcore.PlotEditor) + plt = tv.AddNewTab(plotcore.KiT_PlotView, "TstRunPlot").(*plotcore.Editor) ss.TstRunPlot = ss.ConfigTstRunPlot(plt, ss.TstRunLog) split.SetSplits(.2, .8) diff --git a/sims/bgdorsal/bg-dorsal.go b/sims/bgdorsal/bg-dorsal.go index 47b938ef7..4ba4523f4 100644 --- a/sims/bgdorsal/bg-dorsal.go +++ b/sims/bgdorsal/bg-dorsal.go @@ -792,7 +792,7 @@ func (ss *Sim) ConfigStats() { tsr := levelDir.Float64(name) if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) if si >= 3 && si <= 4 { s.On = true @@ -838,7 +838,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) if name != "RT" { s.On = true @@ -886,7 +886,7 @@ func (ss *Sim) ConfigStats() { tsr := levelDir.Float64(name) if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0) s.On = true }) @@ -913,7 +913,7 @@ func (ss *Sim) ConfigStats() { tsr := levelDir.Float64(name) if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0) s.On = true }) diff --git a/sims/bgventral/bg-ventral.go b/sims/bgventral/bg-ventral.go index 6822d24c4..a4382e6d2 100644 --- a/sims/bgventral/bg-ventral.go +++ b/sims/bgventral/bg-ventral.go @@ -619,7 +619,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) if si >= 2 && si <= 5 { s.On = true @@ -664,7 +664,7 @@ func (ss *Sim) ConfigStats() { stats.GroupStats(curModeDir, stats.StatMean, subDir.Value(name)) // note: results go under Group name: TrialName gp := curModeDir.Dir("Stats/TrialName/" + name).Value("Mean") - plot.SetFirstStylerTo(gp, func(s *plot.Style) { + plot.SetFirstStyle(gp, func(s *plot.Style) { if si >= 2 && si <= 3 { s.On = true } diff --git a/sims/choose/armaze/gui.go b/sims/choose/armaze/gui.go index e89e22986..746204115 100644 --- a/sims/choose/armaze/gui.go +++ b/sims/choose/armaze/gui.go @@ -141,13 +141,13 @@ type GUI struct { DepthImage *core.Image `display:"-"` // plot of positive valence drives, active OFC US state, and reward - USposPlot *plotcore.PlotEditor + USposPlot *plotcore.Editor // data for USPlot USposData *table.Table // plot of negative valence active OFC US state, and outcomes - USnegPlot *plotcore.PlotEditor + USnegPlot *plotcore.Editor // data for USPlot USnegData *table.Table @@ -229,7 +229,7 @@ func (vw *GUI) ConfigWorldGUI(ev *Env) *core.Body { wd := float32(200) ht := float32(100) - vw.USposPlot = plotcore.NewPlotEditor(svfr) + vw.USposPlot = plotcore.NewEditor(svfr) vw.USposPlot.Name = "us-pos" vw.USposPlot.Styler(func(s *styles.Style) { s.Min.X.Px(wd) @@ -237,7 +237,7 @@ func (vw *GUI) ConfigWorldGUI(ev *Env) *core.Body { s.Grow.Set(0, 0) }) - vw.USnegPlot = plotcore.NewPlotEditor(svfr) + vw.USnegPlot = plotcore.NewEditor(svfr) vw.USnegPlot.Name = "us-neg" vw.USnegPlot.Styler(func(s *styles.Style) { s.Min.X.Px(wd) @@ -522,7 +522,7 @@ func (vw *GUI) ConfigUSPlots() { cols := []string{"Drive", "USin", "OFC"} for _, cl := range cols { - plot.SetFirstStylerTo(cl, func(s *plot.Style) { + plot.SetFirstStyle(cl, func(s *plot.Style) { s.On = true s.Range.SetMin(0).SetMax(1) diff --git a/sims/choose/choose.go b/sims/choose/choose.go index 3f80fd65d..0be245d78 100644 --- a/sims/choose/choose.go +++ b/sims/choose/choose.go @@ -754,7 +754,7 @@ func (ss *Sim) ConfigStats() { // var stat float64 // if phase == Start { // tsr.SetNumRows(0) - // plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + // plot.SetFirstStyle(tsr, func(s *plot.Style) { // s.Range.SetMin(0).SetMax(1) // s.On = true // }) diff --git a/sims/deepfsa/deep-fsa.go b/sims/deepfsa/deep-fsa.go index 2f3aea7e0..496cca4c2 100644 --- a/sims/deepfsa/deep-fsa.go +++ b/sims/deepfsa/deep-fsa.go @@ -535,7 +535,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = true switch name { diff --git a/sims/deepmove/deep-move.go b/sims/deepmove/deep-move.go index 9db242364..23172ad26 100644 --- a/sims/deepmove/deep-move.go +++ b/sims/deepmove/deep-move.go @@ -570,7 +570,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = true }) diff --git a/sims/deepmusic/deep-music.go b/sims/deepmusic/deep-music.go index b4c340d33..45dacb177 100644 --- a/sims/deepmusic/deep-music.go +++ b/sims/deepmusic/deep-music.go @@ -551,7 +551,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = true }) diff --git a/sims/hip/hip.go b/sims/hip/hip.go index 22baca577..13ad4cecb 100644 --- a/sims/hip/hip.go +++ b/sims/hip/hip.go @@ -498,7 +498,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = true switch name { diff --git a/sims/inhib/inhib.go b/sims/inhib/inhib.go index 4a15f006d..a867a4ef3 100644 --- a/sims/inhib/inhib.go +++ b/sims/inhib/inhib.go @@ -475,7 +475,7 @@ func (ss *Sim) ConfigStats() { ndata := 1 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = false switch stnm { diff --git a/sims/kinasesim/sim.go b/sims/kinasesim/sim.go index 791fd0a0e..8c97776fb 100644 --- a/sims/kinasesim/sim.go +++ b/sims/kinasesim/sim.go @@ -257,7 +257,7 @@ func (ss *Sim) ConfigStats() { tsr := tensorfs.ValueType(levelDir, name, kind) if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0) switch level { case Cycle: diff --git a/sims/mpi/mpi.go b/sims/mpi/mpi.go index c51e0e86f..ec08cfa27 100644 --- a/sims/mpi/mpi.go +++ b/sims/mpi/mpi.go @@ -557,7 +557,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = true switch name { diff --git a/sims/neuron/neuron.go b/sims/neuron/neuron.go index cf0f1fc2a..4428dccd0 100644 --- a/sims/neuron/neuron.go +++ b/sims/neuron/neuron.go @@ -377,7 +377,7 @@ func (ss *Sim) ConfigStats() { tsr := levelDir.Int(name) if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(float64(ss.Config.Run.Cycles)) }) return @@ -396,7 +396,7 @@ func (ss *Sim) ConfigStats() { tsr := levelDir.Float64(name) if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = false switch name { diff --git a/sims/objrec/objrec.go b/sims/objrec/objrec.go index c0fcb85da..09b4d02f3 100644 --- a/sims/objrec/objrec.go +++ b/sims/objrec/objrec.go @@ -538,7 +538,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = true switch name { diff --git a/sims/pfcmaint/pfcmaint.go b/sims/pfcmaint/pfcmaint.go index c58d25f2a..dc0781aa1 100644 --- a/sims/pfcmaint/pfcmaint.go +++ b/sims/pfcmaint/pfcmaint.go @@ -494,7 +494,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = true }) diff --git a/sims/pvlv/effort-plot.go b/sims/pvlv/effort-plot.go index 1296d93ed..a792fcefa 100644 --- a/sims/pvlv/effort-plot.go +++ b/sims/pvlv/effort-plot.go @@ -54,13 +54,13 @@ type DrEffPlot struct { Table *table.Table `display:"no-inline"` // the plot - Plot *plotcore.PlotEditor `display:"-"` + Plot *plotcore.Editor `display:"-"` // table for plot TimeTable *table.Table `display:"no-inline"` // the plot - TimePlot *plotcore.PlotEditor `display:"-"` + TimePlot *plotcore.Editor `display:"-"` // random number generator Rand randx.SysRand `display:"-"` @@ -139,7 +139,7 @@ func (ss *DrEffPlot) ConfigTable(dt *table.Table) { dt.SetNumRows(0) } -func (ss *DrEffPlot) ConfigPlot(plt *plotcore.PlotEditor, dt *table.Table) *plotcore.PlotEditor { +func (ss *DrEffPlot) ConfigPlot(plt *plotcore.Editor, dt *table.Table) *plotcore.Editor { plt.Options.Title = "Effort Discount or Urgency Function Plot" plt.Options.XAxis = "X" plt.SetTable(dt) @@ -206,7 +206,7 @@ func (ss *DrEffPlot) ConfigTimeTable(dt *table.Table) { dt.SetNumRows(0) } -func (ss *DrEffPlot) ConfigTimePlot(plt *plotcore.PlotEditor, dt *table.Table) *plotcore.PlotEditor { +func (ss *DrEffPlot) ConfigTimePlot(plt *plotcore.Editor, dt *table.Table) *plotcore.Editor { plt.Options.Title = "Effort / Drive over Time Plot" plt.Options.XAxis = "T" plt.SetTable(dt) diff --git a/sims/pvlv/pvlv.go b/sims/pvlv/pvlv.go index 9e0301aed..a52b0eaa0 100644 --- a/sims/pvlv/pvlv.go +++ b/sims/pvlv/pvlv.go @@ -606,7 +606,7 @@ func (ss *Sim) ConfigStats() { // tsr := levelDir.Float64(name) // if phase == Start { // tsr.SetNumRows(0) - // plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + // plot.SetFirstStyle(tsr, func(s *plot.Style) { // s.Range.SetMin(0).SetMax(1) // if si >= 2 && si <= 5 { // s.On = true @@ -644,7 +644,7 @@ func (ss *Sim) ConfigStats() { // var stat float64 // if phase == Start { // tsr.SetNumRows(0) - // plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + // plot.SetFirstStyle(tsr, func(s *plot.Style) { // s.Range.SetMin(0).SetMax(1) // s.On = true // }) diff --git a/sims/ra25/ra25.go b/sims/ra25/ra25.go index 2ccbd36e1..99e8d56f0 100644 --- a/sims/ra25/ra25.go +++ b/sims/ra25/ra25.go @@ -566,7 +566,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = true switch name { diff --git a/sims/ra25x/ra25x.go b/sims/ra25x/ra25x.go index 307d81a20..e62cd500a 100644 --- a/sims/ra25x/ra25x.go +++ b/sims/ra25x/ra25x.go @@ -548,7 +548,7 @@ func (ss *Sim) ConfigStats() { ndata := int(ss.Net.Context().NData) if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.On = false }) return @@ -577,7 +577,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) s.On = true switch name { diff --git a/sims/rl/rl.go b/sims/rl/rl.go index 7af9455b3..2c7520b70 100644 --- a/sims/rl/rl.go +++ b/sims/rl/rl.go @@ -440,7 +440,7 @@ func (ss *Sim) ConfigStats() { ndata := int(ss.Net.Context().NData) if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.On = false }) return @@ -468,7 +468,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) if si == 0 { s.On = true diff --git a/sims/vspatch/vspatch.go b/sims/vspatch/vspatch.go index 60609f5cd..cc9511994 100644 --- a/sims/vspatch/vspatch.go +++ b/sims/vspatch/vspatch.go @@ -543,7 +543,7 @@ func (ss *Sim) ConfigStats() { var stat float64 if phase == Start { tsr.SetNumRows(0) - plot.SetFirstStylerTo(tsr, func(s *plot.Style) { + plot.SetFirstStyle(tsr, func(s *plot.Style) { s.Range.SetMin(0).SetMax(1) if si >= 2 && si <= 5 { s.On = true @@ -601,7 +601,7 @@ func (ss *Sim) ConfigStats() { } // note: results go under Group name: Cond gp := curModeDir.Dir("Stats/Cond/" + name).Value("Mean") - plot.SetFirstStylerTo(gp, func(s *plot.Style) { + plot.SetFirstStyle(gp, func(s *plot.Style) { s.Range.SetMin(0) if si >= 2 && si <= 4 { s.On = true