Skip to content
Snippets Groups Projects
Commit 6999ed17 authored by Andrew E. Torda's avatar Andrew E. Torda
Browse files

Merge branch 'devel'

parents dc11a66f c513b310
No related branches found
No related tags found
No related merge requests found
File added
......@@ -230,7 +230,7 @@ func singleRun(mcPrm *McPrm) (MCresult, error) {
fOld := ackley.Ackley(x) // Initial function value
fTrial := fOld
tmprtr := float64(mcPrm.IniTmp)
xDlta := mcPrm.XDlta // Step size which might be adjusted on the fly
xDlta := mcPrm.XDlta
saveStep(&cprm, 0, tmprtr, x, fOld)
for n := 0; n < mcPrm.NStep; n++ {
......
......@@ -31,7 +31,7 @@ func runStatTxt(rslt *mcwork.MCresult) fyne.Widget {
s := fmt.Sprintf("Num steps %d\nNum accepted %d\nacceptance rate %.1f %%",
rslt.NStep, rslt.NAcc, (float32(rslt.NAcc)/float32(rslt.NStep))*100.)
if rslt.BestX != nil {
s += fmt.Sprintf("\nbest function value: %.2f\nat %.1g",
s += fmt.Sprintf("\nbest function value: %.2g\nat %.1g",
rslt.Bestfval, rslt.BestX)
}
r := widget.NewLabel(s)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment