From 3cb50a6ee5b3be8955b6d83eaaa180a0b5fd8edd Mon Sep 17 00:00:00 2001 From: "Andrew E. Torda" <torda@zbh.uni-hamburg.de> Date: Tue, 11 Jan 2022 15:48:38 +0100 Subject: [PATCH] About to play with being able to turn off csv files. --- ackwork/ackwork_test.go | 43 +++++++++++++++++++++++++++++++---------- ackwork/dorun.go | 1 - 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/ackwork/ackwork_test.go b/ackwork/ackwork_test.go index a02d223..36826be 100644 --- a/ackwork/ackwork_test.go +++ b/ackwork/ackwork_test.go @@ -64,7 +64,7 @@ ini_temp 0.5 final_temp 0.05 x_ini 7,1,7 n_step 100000 -fOutName testreal` +fOutName ""` // These values seem to work well. There is something of a phase // transition near temperature 0.09. Good values for an optimisation @@ -128,7 +128,7 @@ func TestPlot(t *testing.T) { } } -func TestSetSuffix (t *testing.T) { +func TestSetSuffix(t *testing.T) { var tdata = []struct { in, suffix, want string }{ @@ -144,24 +144,47 @@ func TestSetSuffix (t *testing.T) { } for _, s := range tdata { - if tmp, err := SetSuffix (s.in, s.suffix); err != nil { - t.Fatal ("setSuffix error handling", s) + if tmp, err := SetSuffix(s.in, s.suffix); err != nil { + t.Fatal("setSuffix error handling", s) } else { if tmp != s.want { - t.Fatal ("Wanted", s.want, "got", tmp, "working on", s) + t.Fatal("Wanted", s.want, "got", tmp, "working on", s) } } } } +func TestRemoveQuotes(t *testing.T) { + var tdata = []struct { + in, out string + } { + {"hello", "hello"}, + {"", ""}, + {`"`, ""}, + {`""`, ""}, + {`"""`, ""}, + {`""a"`, "a"}, + {`""aa"`, "aa"}, + {`""a""`, "a"}, + {`"a"`, "a"}, + {`a"`, "a"}, + {`a""`, "a"}, + } + for _, ss := range tdata { + if out := RemoveQuotes (ss.in); out != ss.out { + t.Fatalf ("Wanted <%s>, got <%s>. Input was <%s>", ss.out, out, ss.in) + } + } +} + // Check that errors are generated -func TestSetSuffixErr (t *testing.T) { - var tdata = []struct {in, suffix string}{ +func TestSetSuffixErr(t *testing.T) { + var tdata = []struct{ in, suffix string }{ {"", ""}, - {".", ""} } + {".", ""}} for _, s := range tdata { - if _, err := SetSuffix (s.in, s.suffix); err == nil { - t.Fatal ("setSuffix should return error on", s) + if _, err := SetSuffix(s.in, s.suffix); err == nil { + t.Fatal("setSuffix should return error on", s) } } } diff --git a/ackwork/dorun.go b/ackwork/dorun.go index 9bae766..ad540e9 100644 --- a/ackwork/dorun.go +++ b/ackwork/dorun.go @@ -204,7 +204,6 @@ func doRun(mcPrm *mcPrm) error { } newx(x, xT, cprm.rand, xDlta) fTrial = ackley.Ackley(xT) - if fTrial <= fOld { accept = true } else { -- GitLab