Skip to content

Commit ea30d13

Browse files
authored
Merge pull request #51 from cogentcore/simmer
Simmer
2 parents d5b53d5 + 05b356e commit ea30d13

File tree

6 files changed

+33
-13
lines changed

6 files changed

+33
-13
lines changed

examples/simmer/results.go

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/simmer/results.goal

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,13 @@ func (sr *Simmer) Diff() { //types:add
127127
func (sr *Simmer) Plot() { //types:add
128128
ts := sr.Tabs.AsLab()
129129
tv := sr.ResultsTableView
130+
if tv == nil {
131+
core.MessageSnackbar(sr, "Plot: no results available to plot")
132+
return
133+
}
130134
jis := tv.SelectedIndexesList(false)
131135
if len(jis) == 0 {
132-
fmt.Println("No Results rows selected")
136+
core.MessageSnackbar(sr, "Plot: No Results rows selected")
133137
return
134138
}
135139
var AggTable *table.Table
@@ -157,9 +161,13 @@ func (sr *Simmer) Plot() { //types:add
157161
func (sr *Simmer) PlotMean() { //types:add
158162
ts := sr.Tabs.AsLab()
159163
tv := sr.ResultsTableView
164+
if tv == nil {
165+
core.MessageSnackbar(sr, "PlotMean: no results available to plot")
166+
return
167+
}
160168
jis := tv.SelectedIndexesList(false)
161169
if len(jis) == 0 {
162-
fmt.Println("No Results rows selected")
170+
core.MessageSnackbar(sr, "PlotMean: No Results rows selected")
163171
return
164172
}
165173
nc := len(sr.Config.GroupColumns)

examples/simmer/typegen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ go 1.25.6
88
// https://github.com/googleapis/go-genproto/issues/1015
99

1010
require (
11-
cogentcore.org/core v0.3.18
11+
cogentcore.org/core v0.3.21
1212
github.com/cogentcore/readline v0.1.3
1313
github.com/cogentcore/yaegi v0.0.0-20260116172027-700fbf8949f3
1414
github.com/mitchellh/go-homedir v1.1.0
@@ -67,8 +67,8 @@ require (
6767
golang.org/x/sync v0.19.0 // indirect
6868
golang.org/x/sys v0.40.0 // indirect
6969
golang.org/x/text v0.33.0 // indirect
70-
google.golang.org/genproto v0.0.0-20260209200024-4cfbd4190f57 // indirect
71-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 // indirect
70+
google.golang.org/genproto v0.0.0-20260226221140-a57be14db171 // indirect
71+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect
7272
gopkg.in/yaml.v3 v3.0.1 // indirect
7373
modernc.org/knuth v0.5.4 // indirect
7474
modernc.org/token v1.1.0 // indirect

go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
codeberg.org/go-pdf/fpdf v0.11.0 h1:n3I8WISQ1cr0S2rvx9DOlE/GypbcimMWqLpel3slHmY=
22
codeberg.org/go-pdf/fpdf v0.11.0/go.mod h1:Y0DGRAdZ0OmnZPvjbMp/1bYxmIPxm0ws4tfoPOc4LjU=
3-
cogentcore.org/core v0.3.18 h1:xJXwUfrIg7bX9BJe3DEbOjn2a3TkIhFOvjeIzY3L0GU=
4-
cogentcore.org/core v0.3.18/go.mod h1:IQBEleZr+h6O/UjnymY875ve9kY0yokLK8YJ/JUPPBg=
3+
cogentcore.org/core v0.3.21 h1:IPxkRb/ibwXEWoyTr7jmUOky3HQkJeq10e3VL8dlih0=
4+
cogentcore.org/core v0.3.21/go.mod h1:IQBEleZr+h6O/UjnymY875ve9kY0yokLK8YJ/JUPPBg=
55
git.sr.ht/~sbinet/cmpimg v0.1.0 h1:E0zPRk2muWuCqSKSVZIWsgtU9pjsw3eKHi8VmQeScxo=
66
git.sr.ht/~sbinet/cmpimg v0.1.0/go.mod h1:FU12psLbF4TfNXkKH2ZZQ29crIqoiqTZmeQ7dkp/pxE=
77
github.com/Bios-Marcel/wastebasket/v2 v2.0.3 h1:TkoDPcSqluhLGE+EssHu7UGmLgUEkWg7kNyHyyJ3Q9g=
@@ -165,10 +165,12 @@ golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg
165165
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
166166
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
167167
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
168-
google.golang.org/genproto v0.0.0-20260209200024-4cfbd4190f57 h1:uZSB/r2MjH9IsqpG2vRNSV1Juteix90oHe8oTcLW9tk=
169-
google.golang.org/genproto v0.0.0-20260209200024-4cfbd4190f57/go.mod h1:nGuPfp0lnDJcJD0J47StV0Skgnw3qMSQhjsLKiejq5Y=
168+
google.golang.org/genproto v0.0.0-20260226221140-a57be14db171 h1:RxhCsti413yL0IjU9dVvuTbCISo8gs3RW1jPMStck+4=
169+
google.golang.org/genproto v0.0.0-20260226221140-a57be14db171/go.mod h1:uhvzakVEqAuXU3TC2JCsxIRe5f77l+JySE3EqPoMyqM=
170170
google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 h1:Jr5R2J6F6qWyzINc+4AM8t5pfUz6beZpHp678GNrMbE=
171171
google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
172+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d h1:t/LOSXPJ9R0B6fnZNyALBRfZBH0Uy0gT+uR+SJ6syqQ=
173+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
172174
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
173175
google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
174176
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=

physics/step_joint.goal

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ func StepJointForces(i uint32) { //gosl:kernel
7474
// child world transform
7575
poseCR := DynamicPos(jCi, params.Cur)
7676
poseCQ := DynamicQuat(jCi, params.Cur)
77-
// note: NOT doing this: slmath.MulSpatialTransforms(poseCR, poseCQ, jCR, jCQ, &xwCR, &xwCQ)
77+
xwCR := jCR
78+
xwCQ := jCQ
79+
slmath.MulSpatialTransforms(poseCR, poseCQ, jCR, jCQ, &xwCR, &xwCQ)
7880
// https://github.com/newton-physics/newton/issues/1261
7981
comC := BodyCom(jCbi)
8082
dC := poseCR.Sub(slmath.MulSpatialPoint(poseCR, poseCQ, comC)) // child moment arm

0 commit comments

Comments
 (0)