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

Had not removed n_output from the settable parameters.

parent e2d8b571
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,6 @@ final_temp 0 ...@@ -20,7 +20,6 @@ final_temp 0
x_ini 0.8,0.8,0.8 x_ini 0.8,0.8,0.8
x_delta, "0.4" x_delta, "0.4"
n_step = 100000 n_step = 100000
n_output = 5000
fOutNamen testReal` fOutNamen testReal`
func TestTypo(t *testing.T) { // Make sure a typo in input does provoke an error func TestTypo(t *testing.T) { // Make sure a typo in input does provoke an error
...@@ -34,7 +33,6 @@ ini_temp 1 ...@@ -34,7 +33,6 @@ ini_temp 1
final_temp 0.05 final_temp 0.05
x_ini 15 x_ini 15
n_step 10000 n_step 10000
n_output 5000
fOutName testanneal1d` fOutName testanneal1d`
var s3d = ` var s3d = `
...@@ -42,7 +40,6 @@ ini_temp 1 ...@@ -42,7 +40,6 @@ ini_temp 1
final_temp 0.05 final_temp 0.05
x_ini 15,15,15 x_ini 15,15,15
n_step 10000 n_step 10000
n_output 500
fOutName testanneal3d` fOutName testanneal3d`
// Five dimensions works easily. 10 is too hard. // Five dimensions works easily. 10 is too hard.
...@@ -51,16 +48,13 @@ ini_temp 0.15 ...@@ -51,16 +48,13 @@ ini_temp 0.15
final_temp 0.02 final_temp 0.02
x_ini 7,7,7,7,7 x_ini 7,7,7,7,7
n_step 100000 n_step 100000
n_output 10000
fOutName testanneal5d` fOutName testanneal5d`
var s10d = ` var s10d = `
ini_temp 0.1 ini_temp 0.1
final_temp 0.02 final_temp 0.02
x_ini 7,7,7,7,7,7,7,7,7,7 x_ini 7,7,7,7,7,7,7,7,7,7
n_step 10000000 n_step 1000000
n_step 10
n_output 10000
fOutName testanneal10d` fOutName testanneal10d`
var sCold = ` var sCold = `
...@@ -68,7 +62,6 @@ ini_temp 1e-10 ...@@ -68,7 +62,6 @@ ini_temp 1e-10
final_temp 1e-12 final_temp 1e-12
x_ini 1,1,1 x_ini 1,1,1
n_step 10000 n_step 10000
n_output 500
fOutName testcold` fOutName testcold`
var sHot = ` var sHot = `
...@@ -76,7 +69,6 @@ ini_temp 1 ...@@ -76,7 +69,6 @@ ini_temp 1
final_temp 1 final_temp 1
x_ini 1,1,1 x_ini 1,1,1
n_step 10000 n_step 10000
n_output 500
fOutName testhot` fOutName testhot`
var sRealAnneal = ` var sRealAnneal = `
...@@ -84,7 +76,6 @@ ini_temp 0.5 ...@@ -84,7 +76,6 @@ ini_temp 0.5
final_temp 0.05 final_temp 0.05
x_ini 7,1,7 x_ini 7,1,7
n_step 100000 n_step 100000
n_output 5000
fOutName testreal` fOutName testreal`
// These values seem to work well. There is something of a phase // These values seem to work well. There is something of a phase
...@@ -104,7 +95,6 @@ ini_temp 0.18 ...@@ -104,7 +95,6 @@ ini_temp 0.18
final_temp 0.01 final_temp 0.01
x_ini 7,1,7 x_ini 7,1,7
n_step 100000 n_step 100000
n_output 50000
fOutName testphase` fOutName testphase`
var csv_test = []string{ var csv_test = []string{
...@@ -113,7 +103,7 @@ var csv_test = []string{ ...@@ -113,7 +103,7 @@ var csv_test = []string{
func TestCsv(t *testing.T) { func TestCsv(t *testing.T) {
for _, s := range csv_test { for _, s := range csv_test {
if err := realmain(strings.NewReader(s)); err != nil { 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 = ` ...@@ -122,8 +112,7 @@ var s1dplot = `
ini_temp 0.0925 ini_temp 0.0925
final_temp 0.09 final_temp 0.09
x_ini 15,10,11,12,14,18,-12,-8,-9 x_ini 15,10,11,12,14,18,-12,-8,-9
n_step 100000 n_step 1000
n_output 5000
fOutName test9d fOutName test9d
fPltName testplot.svg fPltName testplot.svg
xPltName testrajplt` xPltName testrajplt`
......
...@@ -25,7 +25,6 @@ var cmdDflt = []struct { ...@@ -25,7 +25,6 @@ var cmdDflt = []struct {
{"final_temp", "1"}, {"final_temp", "1"},
{"n_step", "1000"}, {"n_step", "1000"},
{"n_run", "1"}, {"n_run", "1"},
{"n_output", "500"},
{"x_ini", "3,4,5"}, {"x_ini", "3,4,5"},
{"x_delta", "0.5"}, {"x_delta", "0.5"},
{"seed", "1637"}, {"seed", "1637"},
...@@ -80,7 +79,6 @@ func digest(prmMap map[string]string, mcPrm *mcPrm) error { ...@@ -80,7 +79,6 @@ func digest(prmMap map[string]string, mcPrm *mcPrm) error {
mcPrm.xDlta = getf(prmMap["x_delta"]) mcPrm.xDlta = getf(prmMap["x_delta"])
mcPrm.nStep = getu(prmMap["n_step"]) mcPrm.nStep = getu(prmMap["n_step"])
mcPrm.nRun = getu(prmMap["n_run"]) mcPrm.nRun = getu(prmMap["n_run"])
mcPrm.nOutput = getu(prmMap["n_output"])
mcPrm.xIni = getx(prmMap["x_ini"]) mcPrm.xIni = getx(prmMap["x_ini"])
mcPrm.fOutName = prmMap["foutname"] mcPrm.fOutName = prmMap["foutname"]
mcPrm.fPltName = prmMap["fpltname"] mcPrm.fPltName = prmMap["fpltname"]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment