diff --git a/docs/uebung_sim_anneal_ackley.docx b/docs/uebung_sim_anneal_ackley.docx new file mode 100644 index 0000000000000000000000000000000000000000..5eca6db2662d072d6c87fec558513c7df09ce99a Binary files /dev/null and b/docs/uebung_sim_anneal_ackley.docx differ diff --git a/mc_work/dorun.go b/mc_work/dorun.go index 31f9954c2aedf54f5cc6487c5ffaa60d886114bb..5ae54601514234ae76769dafdaa1a697238c135d 100644 --- a/mc_work/dorun.go +++ b/mc_work/dorun.go @@ -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++ { diff --git a/ui/output_tab.go b/ui/output_tab.go index ef47670d879441c68e960df8d7a4577483bab314..f1e92a2ae3981e75912f74c16e4f21b0a2fad342 100644 --- a/ui/output_tab.go +++ b/ui/output_tab.go @@ -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)