diff --git a/experiment/cal.py b/experiment/cal.py index 25624a8..a307bbf 100755 --- a/experiment/cal.py +++ b/experiment/cal.py @@ -274,7 +274,9 @@ def gen_samples(dir): if __name__ == "__main__": solvers = [] # solvers.append(solver_SAT_standard_gnomon("/pub/netdisk1/qianyh/aws-batch-comp-infrastructure-sample/docker/runner/exp-result","mallob")) - solvers.append(solver_SAT_standard_gnomon("./exp-result","light-new")) + solvers.append(solver_SAT_standard_gnomon("./light-3m-no-pre","light-3m-no-pre")) + solvers.append(solver_SAT_standard_gnomon("./light-3m","light-3m")) + solvers.append(solver_SAT_standard_gnomon("./light-no-bug","light-no-bug")) solvers.append(solver_SAT_standard_gnomon("./light-circle","light-circle")) solvers.append(solver_SAT_standard_gnomon("./light-circle-unique","light-circle-unique")) solvers.append(solver_SAT_standard_gnomon("./first_version","bug-cloud")) diff --git a/run.sh b/run.sh index adaed5b..ff36f2c 100755 --- a/run.sh +++ b/run.sh @@ -17,6 +17,9 @@ # 04157f716c1e9606c6a530657bf8f957-Kakuro-easy-125-ext.xml.hg_4.cnf +#每次都有BUG +# 3d2a6e5c2f8f58dee79fd50444009625-cfi-rigid-z2-0088-03-or_2_shuffle_all.cnf + # 这个存在问题 DIR=/pub/data/chenzh/data/sat2022 diff --git a/src/solve.cpp b/src/solve.cpp index 44c44f5..6f015ab 100644 --- a/src/solve.cpp +++ b/src/solve.cpp @@ -77,7 +77,7 @@ void light::diversity_workers() { if(worker_type == SAT) { if (OPT(shuffle)) { - if (i) workers[i]->configure("order_reset", i); + if (i) workers[i]->configure("order_reset", (rank - 1) * OPT(threads) + i); } workers[i]->configure("stable", 1);