diff --git a/ackwork/ackwork_test.go b/ackwork/ackwork_test.go index 43ef64162f90c0c1656e8ae90b00ddee161b84ad..c23b841d11b8832bb8839910fda1d98835ef0d80 100644 --- a/ackwork/ackwork_test.go +++ b/ackwork/ackwork_test.go @@ -20,7 +20,6 @@ final_temp 0 x_ini 0.8,0.8,0.8 x_delta, "0.4" n_step = 100000 -n_output = 5000 fOutNamen testReal` func TestTypo(t *testing.T) { // Make sure a typo in input does provoke an error @@ -34,7 +33,6 @@ ini_temp 1 final_temp 0.05 x_ini 15 n_step 10000 -n_output 5000 fOutName testanneal1d` var s3d = ` @@ -42,7 +40,6 @@ ini_temp 1 final_temp 0.05 x_ini 15,15,15 n_step 10000 -n_output 500 fOutName testanneal3d` // Five dimensions works easily. 10 is too hard. @@ -51,16 +48,13 @@ ini_temp 0.15 final_temp 0.02 x_ini 7,7,7,7,7 n_step 100000 -n_output 10000 fOutName testanneal5d` var s10d = ` ini_temp 0.1 final_temp 0.02 x_ini 7,7,7,7,7,7,7,7,7,7 -n_step 10000000 -n_step 10 -n_output 10000 +n_step 1000000 fOutName testanneal10d` var sCold = ` @@ -68,7 +62,6 @@ ini_temp 1e-10 final_temp 1e-12 x_ini 1,1,1 n_step 10000 -n_output 500 fOutName testcold` var sHot = ` @@ -76,7 +69,6 @@ ini_temp 1 final_temp 1 x_ini 1,1,1 n_step 10000 -n_output 500 fOutName testhot` var sRealAnneal = ` @@ -84,7 +76,6 @@ ini_temp 0.5 final_temp 0.05 x_ini 7,1,7 n_step 100000 -n_output 5000 fOutName testreal` // These values seem to work well. There is something of a phase @@ -104,7 +95,6 @@ ini_temp 0.18 final_temp 0.01 x_ini 7,1,7 n_step 100000 -n_output 50000 fOutName testphase` var csv_test = []string{ @@ -113,7 +103,7 @@ var csv_test = []string{ func TestCsv(t *testing.T) { for _, s := range csv_test { if err := realmain(strings.NewReader(s)); err != nil { - t.Fatal("csv failed with\n", err, "\nInput", s) + t.Fatal("csv failed with\n", err, "\nInput:", s) } } } @@ -122,8 +112,7 @@ var s1dplot = ` ini_temp 0.0925 final_temp 0.09 x_ini 15,10,11,12,14,18,-12,-8,-9 -n_step 100000 -n_output 5000 +n_step 1000 fOutName test9d fPltName testplot.svg xPltName testrajplt` diff --git a/ackwork/rdprm.go b/ackwork/rdprm.go index 02a62f1f00f3047f45cd057598f822b84a140e32..687fe4b5ba3f3bdd16028aaf255b10f8af26fe58 100644 --- a/ackwork/rdprm.go +++ b/ackwork/rdprm.go @@ -25,7 +25,6 @@ var cmdDflt = []struct { {"final_temp", "1"}, {"n_step", "1000"}, {"n_run", "1"}, - {"n_output", "500"}, {"x_ini", "3,4,5"}, {"x_delta", "0.5"}, {"seed", "1637"}, @@ -80,7 +79,6 @@ func digest(prmMap map[string]string, mcPrm *mcPrm) error { mcPrm.xDlta = getf(prmMap["x_delta"]) mcPrm.nStep = getu(prmMap["n_step"]) mcPrm.nRun = getu(prmMap["n_run"]) - mcPrm.nOutput = getu(prmMap["n_output"]) mcPrm.xIni = getx(prmMap["x_ini"]) mcPrm.fOutName = prmMap["foutname"] mcPrm.fPltName = prmMap["fpltname"]