Skip to content

Commit 5466ab6

Browse files
rcoreillyrcoreilly
committed
update to new egui StopNow logic, remove legacy reset from Init, update core, lab
1 parent f611514 commit 5466ab6

File tree

22 files changed

+43
-67
lines changed

22 files changed

+43
-67
lines changed

‎go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ module github.com/emer/axon/v2
33
go 1.23.4
44

55
require (
6-
cogentcore.org/core v0.3.10-0.20250427014623-de19631808dc
7-
cogentcore.org/lab v0.1.1-0.20250417215607-52af09a8ee8f
6+
cogentcore.org/core v0.3.10-0.20250429190334-2e6129cfd538
7+
cogentcore.org/lab v0.1.1-0.20250502170537-c2f728058d0f
88
github.com/anthonynsimon/bild v0.13.0
99
github.com/chewxy/math32 v1.10.1
1010
github.com/cogentcore/yaegi v0.0.0-20240724064145-e32a03faad56
11-
github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250421193715-8ee934c6c0f6
11+
github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250502170855-f1a87d89008f
1212
github.com/emer/v1vision v0.1.1-0.20241223003153-dd6818448b3b
1313
github.com/stretchr/testify v1.10.0
1414
gitlab.com/gomidi/midi/v2 v2.0.30
@@ -52,12 +52,12 @@ require (
5252
github.com/rivo/uniseg v0.4.7 // indirect
5353
github.com/tdewolff/minify/v2 v2.21.3 // indirect
5454
github.com/tdewolff/parse/v2 v2.7.19 // indirect
55-
golang.org/x/crypto v0.36.0 // indirect
55+
golang.org/x/crypto v0.37.0 // indirect
5656
golang.org/x/mod v0.20.0 // indirect
57-
golang.org/x/net v0.37.0 // indirect
58-
golang.org/x/sync v0.12.0 // indirect
59-
golang.org/x/sys v0.31.0 // indirect
60-
golang.org/x/text v0.23.0 // indirect
57+
golang.org/x/net v0.39.0 // indirect
58+
golang.org/x/sync v0.13.0 // indirect
59+
golang.org/x/sys v0.32.0 // indirect
60+
golang.org/x/text v0.24.0 // indirect
6161
golang.org/x/tools v0.24.0 // indirect
6262
gonum.org/v1/gonum v0.15.0 // indirect
6363
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
cogentcore.org/core v0.3.10-0.20250427014623-de19631808dc h1:jWa+DfOjY4IzFMjI7awVdM9Jn4kGEnF/EvaeyrQN4OU=
2-
cogentcore.org/core v0.3.10-0.20250427014623-de19631808dc/go.mod h1:dSb8eH/6CsC7Y9S7ZdqLf0TUbvbgPgrBGCUCn/Z1b/0=
3-
cogentcore.org/lab v0.1.1-0.20250417215607-52af09a8ee8f h1:PbnQxiBw82zPlQ7+wtyf+BY/x3pAsgm50SOPtgpMIVM=
4-
cogentcore.org/lab v0.1.1-0.20250417215607-52af09a8ee8f/go.mod h1:g1O98Mxg0ke7P2D7bUR4XCSJQvQ6sIpo6vj/XoTWHwg=
1+
cogentcore.org/core v0.3.10-0.20250429190334-2e6129cfd538 h1:XzdvNkGtyiRDHLudIZqg2FsH+VdmOlwPbfVzaCA6PcE=
2+
cogentcore.org/core v0.3.10-0.20250429190334-2e6129cfd538/go.mod h1:dSb8eH/6CsC7Y9S7ZdqLf0TUbvbgPgrBGCUCn/Z1b/0=
3+
cogentcore.org/lab v0.1.1-0.20250502170537-c2f728058d0f h1:4FnzXrKHpTvdx7FVW86aAfD7YHavCp8/jpUf7XnKqKQ=
4+
cogentcore.org/lab v0.1.1-0.20250502170537-c2f728058d0f/go.mod h1:NtLlJJoAoR6YOFcL9od9kGnLX7AbpjHkdtOZizckA0Y=
55
github.com/Bios-Marcel/wastebasket/v2 v2.0.2 h1:zOgACjeSca1lvhGDRN/dbcpFkY6FT85f5F2CImywPh4=
66
github.com/Bios-Marcel/wastebasket/v2 v2.0.2/go.mod h1:769oPCv6eH7ugl90DYIsWwjZh4hgNmMS3Zuhe1bH6KU=
77
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -42,8 +42,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
4242
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4343
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
4444
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
45-
github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250421193715-8ee934c6c0f6 h1:XophNZ+3U6XvH7ltPlc4+6YeBvfuNcRxWO30YuKy+Bc=
46-
github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250421193715-8ee934c6c0f6/go.mod h1:C5GOboYpLH8cegYNHdQ0KzQDKlWHEK+AlY3Td6cSI3s=
45+
github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250502170855-f1a87d89008f h1:4v747yDrLaQ31hZGXt64ehGjFz0f9/GE2BQ2N8wH/eI=
46+
github.com/emer/emergent/v2 v2.0.0-dev0.1.7.0.20250502170855-f1a87d89008f/go.mod h1:Ld5BHHOtg1Wuv2LDLf+v9WSriAxWKTOv8Pnbc+CuIxQ=
4747
github.com/emer/v1vision v0.1.1-0.20241223003153-dd6818448b3b h1:UBArUDbvn8BWihXRqQldTAao2KmbJmxZwWo9BJB+O1s=
4848
github.com/emer/v1vision v0.1.1-0.20241223003153-dd6818448b3b/go.mod h1:UxlVgZX0apfnWPXD9XOkaC4TnZkQhgU8D3G2Lj20sTg=
4949
github.com/ericchiang/css v1.3.0 h1:e0vS+vpujMjtT3/SYu7qTHn1LVzXWcLCCDjlfq3YlLY=
@@ -139,8 +139,8 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:
139139
gitlab.com/gomidi/midi/v2 v2.0.30 h1:RgRYbQeQSab5ZaP1lqRcCTnTSBQroE3CE6V9HgMmOAc=
140140
gitlab.com/gomidi/midi/v2 v2.0.30/go.mod h1:Y6IFFyABN415AYsFMPJb0/43TRIuVYDpGKp2gDYLTLI=
141141
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
142-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
143-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
142+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
143+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
144144
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA=
145145
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
146146
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -149,23 +149,23 @@ golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs
149149
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
150150
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
151151
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
152-
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
153-
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
154-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
155-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
152+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
153+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
154+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
155+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
156156
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
157157
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
158158
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
159159
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
160-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
161-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
160+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
161+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
162162
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
163-
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
164-
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
163+
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
164+
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
165165
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
166166
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
167-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
168-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
167+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
168+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
169169
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
170170
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
171171
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=

‎sims/bgdorsal/bgdorsal.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ func (ss *Sim) Init() {
375375
ss.InitRandSeed(0)
376376
ss.ConfigEnv() // always do -- otherwise env params not reset after run
377377
// selected or patterns have been modified etc
378-
ss.GUI.StopNow = false
379378
ss.ApplyParams()
380379
ss.StatsInit()
381380
ss.NewRun()

‎sims/bgventral/bgventral.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ func (ss *Sim) Init() {
292292
ss.InitRandSeed(0)
293293
ss.ConfigEnv() // always do -- otherwise env params not reset after run
294294
// selected or patterns have been modified etc
295-
ss.GUI.StopNow = false
296295
ss.ApplyParams()
297296
ss.StatsInit()
298297
ss.NewRun()

‎sims/choose/choose.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@ func (ss *Sim) Init() {
400400
ss.SetRunName()
401401
ss.InitRandSeed(0)
402402
// ss.ConfigEnv() // always do -- otherwise env params not reset after run
403-
ss.GUI.StopNow = false
404403
ss.ApplyParams()
405404
ss.StatsInit()
406405
ss.NewRun()

‎sims/deepfsa/deepfsa.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ func (ss *Sim) Init() {
259259
ss.InitRandSeed(0)
260260
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
261261
// selected or patterns have been modified etc
262-
ss.GUI.StopNow = false
263262
ss.ApplyParams()
264263
ss.StatsInit()
265264
ss.NewRun()

‎sims/deepmove/deepmove.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ func (ss *Sim) Init() {
316316
ss.InitRandSeed(0)
317317
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
318318
// selected or patterns have been modified etc
319-
ss.GUI.StopNow = false
320319
ss.ApplyParams()
321320
ss.StatsInit()
322321
ss.NewRun()

‎sims/deepmusic/deepmusic.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ func (ss *Sim) Init() {
300300
ss.InitRandSeed(0)
301301
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
302302
// selected or patterns have been modified etc
303-
ss.GUI.StopNow = false
304303
ss.ApplyParams()
305304
ss.StatsInit()
306305
ss.NewRun()

‎sims/hip/hip.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ func (ss *Sim) Init() {
240240
ss.InitRandSeed(0)
241241
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
242242
// selected or patterns have been modified etc
243-
ss.GUI.StopNow = false
244243
ss.ApplyParams()
245244
ss.StatsInit()
246245
ss.NewRun()

‎sims/inhib/inhib.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,6 @@ func (ss *Sim) Init() {
364364
ss.Loops.ResetCounters()
365365
ss.SetRunName()
366366
ss.InitRandSeed(0)
367-
ss.GUI.StopNow = false
368367
ss.ApplyParams()
369368
ss.StatsInit()
370369
ss.NewRun()

‎sims/kinasesim/kinase.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func (ss *Sim) Run() {
216216

217217
// RunImpl runs NTrials, recording to RunLog and TrialLog
218218
func (ss *Sim) RunImpl(minusHz, plusHz float32, ntrials int) {
219-
if ss.GUI.StopNow {
219+
if ss.GUI.StopNow() {
220220
return
221221
}
222222
ss.StatsStart(Test, Trial)
@@ -235,7 +235,7 @@ func (ss *Sim) Trial() {
235235

236236
// TrialImpl runs one trial for given parameters
237237
func (ss *Sim) TrialImpl(minusHz, plusHz float32) {
238-
if ss.GUI.StopNow {
238+
if ss.GUI.StopNow() {
239239
return
240240
}
241241
ss.StatsStart(Test, Trial)

‎sims/kinasesim/sim.go

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ func (ss *Sim) ConfigSim() {
155155
func (ss *Sim) Init() {
156156
ss.SetRunName()
157157
ss.InitRandSeed(0)
158-
ss.GUI.StopNow = false
159158
ss.ConfigKinase()
160159
ss.StatsInit()
161160
}
@@ -167,7 +166,7 @@ func (ss *Sim) InitRandSeed(run int) {
167166

168167
// Stop tells the sim to stop running
169168
func (ss *Sim) Stop() {
170-
ss.GUI.StopNow = true
169+
ss.GUI.SetStopNow()
171170
}
172171

173172
//////// Stats
@@ -372,12 +371,11 @@ func (ss *Sim) MakeToolbar(p *tree.Plan) {
372371
Tooltip: "Runs Kinase sweep over set of minus / plus spiking levels.",
373372
Active: egui.ActiveStopped,
374373
Func: func() {
375-
if !ss.GUI.IsRunning {
374+
if !ss.GUI.IsRunning() {
376375
go func() {
377-
ss.GUI.IsRunning = true
376+
ss.GUI.StartRun()
378377
ss.Sweep()
379-
ss.GUI.IsRunning = false
380-
ss.GUI.UpdateWindow()
378+
ss.GUI.Stopped(Test, Condition)
381379
}()
382380
}
383381
},
@@ -386,12 +384,11 @@ func (ss *Sim) MakeToolbar(p *tree.Plan) {
386384
Tooltip: "Runs NTrials of Kinase updating.",
387385
Active: egui.ActiveStopped,
388386
Func: func() {
389-
if !ss.GUI.IsRunning {
387+
if !ss.GUI.IsRunning() {
390388
go func() {
391-
ss.GUI.IsRunning = true
389+
ss.GUI.StartRun()
392390
ss.Run()
393-
ss.GUI.IsRunning = false
394-
ss.GUI.UpdateWindow()
391+
ss.GUI.Stopped(Test, Trial)
395392
}()
396393
}
397394
},
@@ -400,12 +397,11 @@ func (ss *Sim) MakeToolbar(p *tree.Plan) {
400397
Tooltip: "Runs one Trial of Kinase updating.",
401398
Active: egui.ActiveStopped,
402399
Func: func() {
403-
if !ss.GUI.IsRunning {
400+
if !ss.GUI.IsRunning() {
404401
go func() {
405-
ss.GUI.IsRunning = true
402+
ss.GUI.StartRun()
406403
ss.Trial()
407-
ss.GUI.IsRunning = false
408-
ss.GUI.UpdateWindow()
404+
ss.GUI.Stopped(Test, Trial)
409405
}()
410406
}
411407
},

‎sims/lvis/lvis.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,6 @@ func (ss *Sim) Init() {
589589
ss.InitRandSeed(0)
590590
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
591591
// selected or patterns have been modified etc
592-
ss.GUI.StopNow = false
593592
ss.ApplyParams()
594593
ss.StatsInit()
595594
ss.NewRun()

‎sims/mpi/mpi.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ func (ss *Sim) Init() {
261261
ss.InitRandSeed(0)
262262
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
263263
// selected or patterns have been modified etc
264-
ss.GUI.StopNow = false
265264
ss.ApplyParams()
266265
ss.StatsInit()
267266
ss.NewRun()

‎sims/neuron/neuron.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ func (ss *Sim) ApplyParams() {
254254
func (ss *Sim) Init() {
255255
ss.SetRunName()
256256
ss.InitRandSeed(0)
257-
ss.GUI.StopNow = false
258257
ss.ApplyParams()
259258
ss.StatsInit()
260259
ss.NewRun()
@@ -280,7 +279,6 @@ func (ss *Sim) InitRandSeed(run int) {
280279
// RunCycles updates neuron over specified number of cycles.
281280
func (ss *Sim) RunCycles() {
282281
ctx := ss.Net.Context()
283-
ss.GUI.StopNow = false
284282
ss.Net.InitActs()
285283
ctx.NewState(Test, false)
286284
ss.ApplyParams()
@@ -296,7 +294,7 @@ func (ss *Sim) RunCycles() {
296294
ctx.Cycle = int32(cyc)
297295
ss.RunStats(Test, Cycle, Step)
298296
ss.NetUpdate.UpdateCycle(cyc, Test, Cycle)
299-
if ss.GUI.StopNow {
297+
if ss.GUI.StopNow() {
300298
break
301299
}
302300
}
@@ -341,7 +339,7 @@ func (ss *Sim) NeuronUpdate(nt *axon.Network, inputOn bool) {
341339

342340
// Stop tells the sim to stop running
343341
func (ss *Sim) Stop() {
344-
ss.GUI.StopNow = true
342+
ss.GUI.SetStopNow()
345343
}
346344

347345
//////// Stats
@@ -526,12 +524,11 @@ func (ss *Sim) MakeToolbar(p *tree.Plan) {
526524
Tooltip: "Runs neuron updating over Cycles.",
527525
Active: egui.ActiveStopped,
528526
Func: func() {
529-
if !ss.GUI.IsRunning {
527+
if !ss.GUI.IsRunning() {
530528
go func() {
531-
ss.GUI.IsRunning = true
529+
ss.GUI.StartRun()
532530
ss.RunCycles()
533-
ss.GUI.IsRunning = false
534-
ss.GUI.UpdateWindow()
531+
ss.GUI.Stopped(Test, Trial)
535532
}()
536533
}
537534
},

‎sims/objrec/objrec.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ func (ss *Sim) Init() {
279279
ss.InitRandSeed(0)
280280
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
281281
// selected or patterns have been modified etc
282-
ss.GUI.StopNow = false
283282
ss.ApplyParams()
284283
ss.StatsInit()
285284
ss.NewRun()

‎sims/pfcmaint/pfcmaint.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ func (ss *Sim) Init() {
258258
ss.InitRandSeed(0)
259259
ss.ConfigEnv() // always do -- otherwise env params not reset after run
260260
// selected or patterns have been modified etc
261-
ss.GUI.StopNow = false
262261
ss.ApplyParams()
263262
ss.StatsInit()
264263
ss.NewRun()

‎sims/pvlv/pvlv.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ func (ss *Sim) Init() {
295295
ss.SetRunName()
296296
ss.InitRandSeed(0)
297297
// ss.ConfigEnv() // always do -- otherwise env params not reset after run
298-
ss.GUI.StopNow = false
299298
ss.ApplyParams()
300299
ss.StatsInit()
301300
ss.NewRun()

‎sims/ra25/ra25.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ func (ss *Sim) Init() {
263263
ss.InitRandSeed(0)
264264
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
265265
// selected or patterns have been modified etc
266-
ss.GUI.StopNow = false
267266
ss.ApplyParams()
268267
ss.StatsInit()
269268
ss.NewRun()

‎sims/ra25x/ra25x.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ func (ss *Sim) Init() {
261261
ss.InitRandSeed(0)
262262
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
263263
// selected or patterns have been modified etc
264-
ss.GUI.StopNow = false
265264
ss.ApplyParams()
266265
ss.StatsInit()
267266
ss.NewRun()

‎sims/rl/rl.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ func (ss *Sim) Init() {
229229
ss.InitRandSeed(0)
230230
// ss.ConfigEnv() // re-config env just in case a different set of patterns was
231231
// selected or patterns have been modified etc
232-
ss.GUI.StopNow = false
233232
ss.ApplyParams()
234233
ss.StatsInit()
235234
ss.NewRun()

‎sims/vspatch/vspatch.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ func (ss *Sim) Init() {
263263
ss.InitRandSeed(0)
264264
ss.ConfigEnv() // always do -- otherwise env params not reset after run
265265
// selected or patterns have been modified etc
266-
ss.GUI.StopNow = false
267266
ss.ApplyParams()
268267
ss.StatsInit()
269268
ss.NewRun()

0 commit comments

Comments
 (0)