summaryrefslogtreecommitdiff
path: root/hadamard.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'hadamard.cpp')
-rw-r--r--hadamard.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/hadamard.cpp b/hadamard.cpp
index 74a8f3f..1d99a2e 100644
--- a/hadamard.cpp
+++ b/hadamard.cpp
@@ -62,10 +62,11 @@ int main(int argc, char* argv[]) {
unsigned M = 10;
unsigned N = 1e4;
+ unsigned m = 1e4;
int opt;
- while ((opt = getopt(argc, argv, "k:b:c:n:t:N:M:e:")) != -1) {
+ while ((opt = getopt(argc, argv, "k:b:c:n:t:N:M:e:m:")) != -1) {
switch (opt) {
case 'k':
k = atoi(optarg);
@@ -91,6 +92,9 @@ int main(int argc, char* argv[]) {
case 'M':
M = (unsigned)atof(optarg);
break;
+ case 'm':
+ m = (unsigned)atof(optarg);
+ break;
default:
exit(1);
}
@@ -133,7 +137,10 @@ int main(int argc, char* argv[]) {
std::cout << "Beginning " << n_tuning << " tuning steps for " << n << ".\n";
p.tune(n_tuning, ε);
- std::cout << "Finished tuning, beginning " << N << " tempering updates of " << M
+ std::cout << "Finished tuning, beginning " << N << " dry tempering updates of " << M
+ << " sweeps each.\n";
+ p.run(m, M, true);
+ std::cout << "Finished tuning, beginning " << N << " measurement tempering updates of " << M
<< " sweeps each.\n";
p.run(N, M);
std::cout << "Finished " << n << ".\n";