update to core with tensor stats renames

emer · Aug 30, 2024 · a349afb · a349afb
1 parent 926d9b3
commit a349afb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/estats/funcs.go b/estats/funcs.go
@@ -98,7 +98,7 @@ func (st *Stats) PCAStats(ix *table.IndexView, varNm string, layers []string) {
 	svd := &st.SVD
 	svd.Cond = PCAStrongThr
 	for _, lnm := range layers {
-		svd.TableCol(ix, lnm+"_"+varNm, metric.Covariance64)
+		svd.TableColumn(ix, lnm+"_"+varNm, metric.Covariance64)
 		ln := len(svd.Values)
 		var nstr float64 // nstr := float64(svd.Rank)  this didn't work..
 		for i, v := range svd.Values {

diff --git a/estats/plots.go b/estats/plots.go
@@ -25,12 +25,12 @@ func ConfigPCAPlot(plt *plotcore.PlotEditor, dt *table.Table, nm string) {
 	plt.SetColumnOptions(dt.ColumnName(2), plotcore.On, plotcore.FloatMin, -3, plotcore.FloatMax, 3)
 }
 
-// ClustPlot does one cluster plot on given table column name
+// ClusterPlot does one cluster plot on given table column name
 // and label name
-func ClustPlot(plt *plotcore.PlotEditor, ix *table.IndexView, colNm, lblNm string) {
+func ClusterPlot(plt *plotcore.PlotEditor, ix *table.IndexView, colNm, lblNm string) {
 	nm, _ := ix.Table.MetaData["name"]
 	smat := &simat.SimMat{}
-	smat.TableCol(ix, colNm, lblNm, false, metric.Euclidean64)
+	smat.TableColumnStd(ix, colNm, lblNm, false, metric.Euclidean)
 	pt := &table.Table{}
 	clust.Plot(pt, clust.Glom(smat, clust.ContrastDist), smat)
 	plt.Name = colNm

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/emer/emergent/v2
 go 1.22
 
 require (
-	cogentcore.org/core v0.3.3-0.20240828192310-4322e1aa7196
+	cogentcore.org/core v0.3.3-0.20240830054126-b6ff6f0d3b0e
 	github.com/BurntSushi/toml v1.3.2
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-cogentcore.org/core v0.3.3-0.20240828192310-4322e1aa7196 h1:8WSL8NMxjc2PP6dPYpLHyIf852mtiIAHWkaX37Kko0M=
-cogentcore.org/core v0.3.3-0.20240828192310-4322e1aa7196/go.mod h1:dg3uRsPcd8S1ZYvRD2TztCtjopRkrB5V/lbl54xsQd4=
+cogentcore.org/core v0.3.3-0.20240830054126-b6ff6f0d3b0e h1:DsU7I70bCcTWBPjW84b3Sp6tOVw+0Jx2OTwZxTaM9U0=
+cogentcore.org/core v0.3.3-0.20240830054126-b6ff6f0d3b0e/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=