update to latest emergent with path rendering

emer · Aug 26, 2024 · 4cf4f73 · 4cf4f73
1 parent 4c962e3
commit 4cf4f73
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/axon/layerbase.go b/axon/layerbase.go
@@ -94,6 +94,7 @@ type Layer struct {
 
 func (ly *Layer) StyleObject() any           { return ly.Params }
 func (ly *Layer) TypeName() string           { return ly.Type.String() }
+func (ly *Layer) TypeNumber() int            { return int(ly.Type) }
 func (ly *Layer) NumRecvPaths() int          { return len(ly.RecvPaths) }
 func (ly *Layer) RecvPath(idx int) emer.Path { return ly.RecvPaths[idx] }
 func (ly *Layer) NumSendPaths() int          { return len(ly.SendPaths) }

diff --git a/axon/pathbase.go b/axon/pathbase.go
@@ -48,9 +48,6 @@ type Path struct {
 	// Typically just set to a literal map.
 	DefaultParams params.Params `table:"-"`
 
-	// provides a history of parameters applied to the layer
-	ParamsHistory params.HistoryImpl `table:"-"`
-
 	// average and maximum number of recv connections in the receiving layer
 	RecvConNAvgMax minmax.AvgMax32 `table:"-" edit:"-" display:"inline"`
 
@@ -91,6 +88,7 @@ func (pt *Path) StyleObject() any      { return pt.Params }
 func (pt *Path) RecvLayer() emer.Layer { return pt.Recv }
 func (pt *Path) SendLayer() emer.Layer { return pt.Send }
 func (pt *Path) TypeName() string      { return pt.Type.String() }
+func (pt *Path) TypeNumber() int       { return int(pt.Type) }
 
 // Connect sets the connectivity between two layers and the pattern to use in interconnecting them
 func (pt *Path) Connect(slay, rlay *Layer, pat paths.Pattern, typ PathTypes) {

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.20240821175244-e58d15222272
+	cogentcore.org/core v0.3.3-0.20240825182959-fe4840922a21
 	github.com/anthonynsimon/bild v0.13.0
-	github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240821185300-2fdedc8771da
+	github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240826102207-14a576d51386
 	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.20240821175244-e58d15222272 h1:Rg4+pPgZmyuwdVIPlvInNnub4eF4CN0e6n4vRepfj3M=
-cogentcore.org/core v0.3.3-0.20240821175244-e58d15222272/go.mod h1:dg3uRsPcd8S1ZYvRD2TztCtjopRkrB5V/lbl54xsQd4=
+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=
 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.20240821185300-2fdedc8771da h1:w8nmwNT7/RdTCHBW1XXBDLLz5hPCcSXMvC79nOHBqcI=
-github.com/emer/emergent/v2 v2.0.0-dev0.1.0.0.20240821185300-2fdedc8771da/go.mod h1:RXZ29Mze6HXSxFQ3nFZa1HJy2FgVP2oiUG4s6/l3UUo=
+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/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=