Removed overengineered tuning system.

1 files changed, 9 insertions, 19 deletions

diff --git a/hadamard.cpp b/hadamard.cpp
index b311e2d..4630ca0 100644
--- a/hadamard.cpp
+++ b/hadamard.cpp
@@ -121,26 +121,16 @@ int main(int argc, char* argv[]) {
   std::vector<double> f;
 
   std::cout << "Beginning simulation of " << n << ".\n";
-  bool still_tuning = true;
-  while (still_tuning) {
-    std::cout << "Beginning " << n_tuning << " tuning tempering updates of " << M
-              << " sweeps each.\n";
-    f = p.tune(n_tuning, M, ε, ε2);
-    std::cout << "Finished tuning, beginning " << m << " measurement tempering updates of " << M
-              << " sweeps each.\n";
-    std::cout << "βs: ";
-    for (const MCMC& M : p.Ms) {
-      std::cout << M.β << " ";
-    }
-    std::cout << std::endl;
-    std::cout << "Accept tuning as finished? (y/N): ";
-    char answer = getchar();
-    if (answer == 'y') {
-      still_tuning = false;
-    }
-    ε /= 2;
-    ε2 /= 2;
+  std::cout << "Beginning " << n_tuning << " tuning tempering updates of " << M
+            << " sweeps each.\n";
+  f = p.tune(n_tuning, M, ε, ε2);
+  std::cout << "Finished tuning, beginning " << m << " measurement tempering updates of " << M
+            << " sweeps each.\n";
+  std::cout << "βs: ";
+  for (const MCMC& M : p.Ms) {
+    std::cout << M.β << " ";
   }
+  std::cout << std::endl;
   std::cout << "Running " << m << " PT swaps of " << M << " sweeps each.";
   p.run(m, M); 
   std::cout << "Finished " << n << ".\n";