1 files changed, 32 insertions, 18 deletions

diff --git a/walk.cpp b/walk.cpp
index cd07253..0e9675b 100644
--- a/walk.cpp
+++ b/walk.cpp
@@ -1,6 +1,6 @@
 #include <getopt.h>
 #include <iomanip>
-
+#include <fstream>
 #include "pcg-cpp/include/pcg_random.hpp"
 #include "randutils/randutils.hpp"
 
@@ -50,10 +50,8 @@ Real wignerInverse(Real p, Real ε = 1e-14) {
 }
 
 class QuadraticModel {
-private:
-  Vector J;
-
 public:
+  Vector J;
   unsigned N;
 
   QuadraticModel(unsigned N, Rng& r, bool diag = false) : J(N), N(N) {
@@ -128,14 +126,14 @@ Vector randomStep(const QuadraticModel& M, const Vector& x₀, Real E, Rng& r, R
 int main(int argc, char* argv[]) {
   unsigned N = 10;
   Real T = 10;
-  Real T₀ = 2;
   Real E = 0;
   Real Δt = 1e-4;
-  Real Δt₀ = 1e-2;
+  Real Δw = 1e-2;
+  bool diag = true;
 
   int opt;
 
-  while ((opt = getopt(argc, argv, "N:E:T:t:I:i:")) != -1) {
+  while ((opt = getopt(argc, argv, "N:E:T:t:w:d")) != -1) {
     switch (opt) {
     case 'N':
       N = (unsigned)atof(optarg);
@@ -146,14 +144,14 @@ int main(int argc, char* argv[]) {
     case 'T':
       T = atof(optarg);
       break;
-    case 'I':
-      T₀ = atof(optarg);
-      break;
     case 't':
       Δt = atof(optarg);
       break;
-    case 'i':
-      Δt₀ = atof(optarg);
+    case 'w':
+      Δw = atof(optarg);
+      break;
+    case 'd':
+      diag = false;
       break;
     default:
       exit(1);
@@ -161,23 +159,39 @@ int main(int argc, char* argv[]) {
   }
 
   Rng r;
-  QuadraticModel model(N, r, true);
+  QuadraticModel model(N, r, diag);
 
   Vector x₀ = normalizeVector(randomVector(N, r));
   x₀ = gradientDescent(model, x₀, E);
 
   std::cout << std::setprecision(15);
 
-  for (Real t = 0; t < T₀; t += Δt₀) {
-    x₀ = randomStep(model, x₀, E, r, Δt₀);
-  }
-
   Vector x = x₀;
 
+  Real timeSinceWrite = Δw;
+
+  std::ofstream outfile(std::to_string(N) + "_" + std::to_string(E) + "_" + std::to_string(Δt) + "_" + std::to_string(Δw) + ".dat", std::ios::out | std::ios::binary);
+
+  for (Real Jᵢ : model.J) {
+    float Jif = Jᵢ;
+    outfile.write((const char*)(&Jif), sizeof(float));
+  }
+
   for (Real t = 0; t < T; t += Δt) {
-    std::cout << t << " " << x.dot(x₀) / N << std::endl;
     x = randomStep(model, x, E, r, Δt);
+
+    if (timeSinceWrite >= Δw) {
+      for (Real xᵢ : x) {
+        float xif = xᵢ;
+        outfile.write((const char*)(&xif), sizeof(float));
+      }
+      timeSinceWrite = 0;
+    }
+
+    timeSinceWrite += Δt;
   }
 
+  outfile.close();
+
   return 0;
 }