Remaved self inverse scattering in favor of overlap, worked on camparisons for Ciamarra.HEADmaster

1 files changed, 14 insertions, 6 deletions

diff --git a/distinguishable.cpp b/distinguishable.cpp
index 0aae0c1..de71c47 100644
--- a/distinguishable.cpp
+++ b/distinguishable.cpp
@@ -53,7 +53,7 @@ int main() {
   unsigned N = 1560;
   double Tmin = 0;
   double Tmax = 0.4;
-  double δT = 0.02;
+  double δT = 0.05;
 
   Rng r;
 
@@ -86,23 +86,29 @@ int main() {
     /*
      */
     std::cout << T << " ";
+    for (unsigned i = 0; i < 1e3; i++) {
+      for (unsigned j = 0; j < s.vertices.size(); j++) {
+        s.tryRandomSwap(T, r);
+      }
+    }
     s.setInitialPosition();
+    DistinguishableSystem<D> s0 = s;
     auto start = std::chrono::high_resolution_clock::now();
-    Quantity<double> energy(1e3);
+//    Quantity<double> energy(1e3);
     for (unsigned i = 0; i < 1e5; i++) {
+      /*
       for (unsigned j = 0; j < s.vertices.size(); j++) {
         s.tryRandomSwap(T, r);
       }
-      /*
+      */
       Matrix<D> m = r.pick(ms);
       Vertex<D, DistinguishableState>& v = r.pick(s.vertices);
       s.wolff(Transformation<D>(L, m, v.position - m * v.position), T, r);
-      */
       if (i % 10 == 0) {
-        energy.add(s.energy());
+//        energy.add(s.energy());
         auto stop = std::chrono::high_resolution_clock::now();
         auto duration = duration_cast<std::chrono::microseconds>(stop - start);
-        std::cout /*<< duration.count() << " "*/ << s.selfIntermediateScattering(ms) << " ";
+        std::cout << duration.count() << " " << s.overlap(s0) << " ";
       }
     }
     /*
@@ -114,12 +120,14 @@ int main() {
     }
     */
     std::cout << std::endl;
+    /*
     std::vector<double> rho = energy.ρ();
     for (const double& x : rho) {
       std::cout << x << " ";
     }
     std::cout << std::endl;
     std::cerr << T << " " << s.energy() / N << std::endl;
+    */
     //    s.sweepLocal(r);
     //    s.sweepSwap(r);
     //    s.swendsenWang(Transformation<D>(L, ms, r), r);