removed a lot of research code to simplify library and examples for publication

5 files changed, 0 insertions, 573 deletions

diff --git a/examples/src/models/ising/CMakeLists.txt b/examples/src/models/ising/CMakeLists.txt
deleted file mode 100644
index 9f4acd4..0000000
--- a/examples/src/models/ising/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-
-add_executable(wolff_ising             wolff_ising.cpp)
-add_executable(wolff_ising_2d          wolff_ising.cpp)
-add_executable(wolff_ising_2d_no-field wolff_ising.cpp)
-add_executable(wolff_random-field_ising wolff_random-field_ising.cpp)
-
-set_target_properties(wolff_ising_2d          PROPERTIES COMPILE_FLAGS "-DDIMENSION=2")
-set_target_properties(wolff_ising_2d_no-field PROPERTIES COMPILE_FLAGS "-DDIMENSION=2 -DNOFIELD")
-
-find_library(GL NAMES GL)
-find_library(GLU NAMES GLU)
-find_library(GLUT NAMES glut)
-
-if (${GLUT} MATCHES "GLUT-NOTFOUND")
-  target_link_libraries(wolff_ising             wolff wolff_examples)
-  target_link_libraries(wolff_ising_2d          wolff wolff_examples)
-  target_link_libraries(wolff_ising_2d_no-field wolff wolff_examples)
-  target_link_libraries(wolff_random-field_ising wolff wolff_examples)
-else()
-  target_compile_definitions(wolff_ising             PUBLIC HAVE_GLUT)
-  target_compile_definitions(wolff_ising_2d          PUBLIC HAVE_GLUT)
-  target_compile_definitions(wolff_ising_2d_no-field PUBLIC HAVE_GLUT)
-  target_compile_definitions(wolff_random-field_ising PUBLIC HAVE_GLUT)
-
-  target_link_libraries(wolff_ising             wolff wolff_examples glut GL GLU)
-  target_link_libraries(wolff_ising_2d          wolff wolff_examples glut GL GLU)
-  target_link_libraries(wolff_ising_2d_no-field wolff wolff_examples glut GL GLU)
-  target_link_libraries(wolff_random-field_ising wolff wolff_examples glut GL GLU)
-endif()
-
-install(TARGETS wolff_ising wolff_ising_2d wolff_ising_2d_no-field wolff_random-field_ising DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
-
diff --git a/examples/src/models/ising/ising.hpp b/examples/src/models/ising/ising.hpp
deleted file mode 100644
index 73b06ed..0000000
--- a/examples/src/models/ising/ising.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#pragma once
-
-#include <cmath>
-#include <stdio.h>
-
-#include <wolff/types.h>
-
-// all that is required to use wolff.hpp is a default constructor
-class ising_t {
-  public:
-    bool x;
-
-    ising_t() : x(false) {}
-
-    // optional constructors for syntactic sugar
-    ising_t(bool x) : x(x) {} 
-    ising_t(int x) : x((bool)x) {}
-
-    /* below this comment is code required only for using measure.hpp in the
-     * examples folder, which provides an interface for measuring several
-     * generic features of models. these require
-     *
-     *  - an M_t, representing the magnetization or sum of all spins
-     *  - an F_t, representing a double-weighted version of the magnetization
-     *  - the overloaded operator *, which takes a v_t (unsigned int) and returns an M_t
-     *  - the overloaded operator *, which takes a double and returns an F_t
-     *  - the overloaded operator -, which takes another X_t and returns an M_t
-     */
-
-    typedef int M_t;
-    typedef double F_t;
-
-    inline int operator*(v_t a) const {
-      if (x) {
-        return -(int)a;
-      } else {
-        return (int)a;
-      }
-    }
-
-    inline double operator*(double a) const {
-      if (x) {
-        return -a;
-      } else {
-        return a;
-      }
-    }
-
-    inline int operator-(const ising_t &s) const {
-      if (x == s.x) {
-        return 0;
-      } else {
-        if (x) {
-          return -2;
-        } else {
-          return 2;
-        }
-      }
-    }
-};
-
-/* using measure.hpp additionally requires a norm_squared function which takes
- * an F_t to a double, and a write_magnetization function, which takes an M_t
- * and a FILE pointer and appropriately records the contents of the former to
- * the latter.
- */
-
-double norm_squared(double s) {
-  return pow(s, 2);
-}
-
-void write_magnetization(int M, FILE *outfile) {
-  fwrite(&M, sizeof(int), 1, outfile);
-}
-
-/* these definitions allow wolff/finite_states.hpp to be invoked and provide
- * much faster performance for models whose number of possible spin
- * configurations is finite.
- */
-
-#define N_STATES 2
-const ising_t states[2] = {ising_t(0), ising_t(1)};
-q_t state_to_ind(ising_t state) { return (q_t)state.x; }
-
diff --git a/examples/src/models/ising/wolff_ising.cpp b/examples/src/models/ising/wolff_ising.cpp
deleted file mode 100644
index de04f32..0000000
--- a/examples/src/models/ising/wolff_ising.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-
-#include <getopt.h>
-#include <stdio.h>
-
-// if you have GLUT installed, you can see graphics!
-#ifdef HAVE_GLUT
-#include <GL/glut.h>
-#endif
-
-// include your group and spin space
-#include "z2.hpp"
-#include "ising.hpp"
-
-// finite_states.h can be included for spin types that have special variables
-// defined, and it causes wolff execution to use precomputed bond probabilities
-#include <wolff/finite_states.hpp>
-
-#include <randutils/randutils.hpp>
-
-// measure.hpp contains useful functions for saving timeseries to files
-#include <measure.hpp>
-
-// include wolff.hpp
-#include <wolff.hpp>
-
-int main(int argc, char *argv[]) {
-
-  count_t N = (count_t)1e4;
-
-  D_t D = 2;
-  L_t L = 128;
-  double T = 2.26918531421;
-  double H = 0.0;
-
-  bool silent = false;
-  bool draw = false;
-  bool N_is_sweeps = false;
-  unsigned int window_size = 512;
-
-  // don't measure anything by default
-  unsigned char measurement_flags = 0;
-
-  int opt;
-
-  while ((opt = getopt(argc, argv, "N:D:L:T:H:sdw:M:S")) != -1) {
-    switch (opt) {
-    case 'N': // number of steps
-      N = (count_t)atof(optarg);
-      break;
-    case 'D': // dimension
-      D = atoi(optarg);
-      break;
-    case 'L': // linear size
-      L = atoi(optarg);
-      break;
-    case 'T': // temperature 
-      T = atof(optarg);
-      break;
-    case 'H': // external field
-      H = atof(optarg);
-      break;
-    case 's': // don't print anything during simulation. speeds up slightly
-      silent = true;
-      break;
-    case 'S':
-      N_is_sweeps = true;
-      break;
-    case 'd':
-#ifdef HAVE_GLUT
-      draw = true;
-      break;
-#else
-      printf("You didn't compile this with the glut library installed!\n");
-      exit(EXIT_FAILURE);
-#endif
-    case 'w':
-      window_size = atoi(optarg);
-      break;
-    case 'M':
-      measurement_flags ^= 1 << atoi(optarg);
-      break;
-    default:
-      exit(EXIT_FAILURE);
-    }
-  }
-
-  // get nanosecond timestamp for unique run id
-  unsigned long timestamp;
-
-  {
-    struct timespec spec;
-    clock_gettime(CLOCK_REALTIME, &spec);
-    timestamp = spec.tv_sec*1000000000LL + spec.tv_nsec;
-  }
-
-  // initialize random number generator
-  randutils::auto_seed_128 seeds;
-  std::mt19937 rng{seeds};
-
-  // define spin-spin coupling
-  std::function <double(const ising_t&, const ising_t&)> Z = [] (const ising_t& s1, const ising_t& s2) -> double {
-    if (s1.x == s2.x) {
-      return 1.0;
-    } else {
-      return -1.0;
-    }
-  };
-
-  // define spin-field coupling
-  std::function <double(const ising_t&)> B = [=] (const ising_t& s) -> double {
-    if (s.x) {
-      return -H;
-    } else {
-      return H;
-    }
-  };
-
-  // initialize state object
-#ifndef NOFIELD
-  state_t <z2_t, ising_t> s(D, L, T, Z, B);
-#else
-  state_t <z2_t, ising_t> s(D, L, T, Z);
-#endif
-
-  // define function that generates self-inverse rotations
-  std::function <z2_t(std::mt19937&, ising_t)> gen_R = [] (std::mt19937&, const ising_t& s) -> z2_t {
-    return z2_t(true);
-  };
-
-  std::function <void(const state_t<z2_t, ising_t>&, const wolff_research_measurements<z2_t, ising_t>&)> other_f;
-  uint64_t sum_of_clusterSize = 0;
-
-  if (N_is_sweeps) {
-    other_f = [&] (const state_t<z2_t, ising_t>& s, const wolff_research_measurements<z2_t, ising_t>& meas) {
-      sum_of_clusterSize += meas.last_cluster_size;
-    };
-  } else if (draw) {
-#ifdef HAVE_GLUT
-    // initialize glut
-    glutInit(&argc, argv);
-    glutInitDisplayMode(GLUT_SINGLE | GLUT_RGB);
-    glutInitWindowSize(window_size, window_size);
-    glutCreateWindow("wolff");
-    glClearColor(0.0,0.0,0.0,0.0);
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    gluOrtho2D(0.0, L, 0.0, L);
-
-    other_f = [] (const state_t <z2_t, ising_t>& s, const wolff_research_measurements<z2_t, ising_t>& meas) {
-      glClear(GL_COLOR_BUFFER_BIT);
-      for (v_t i = 0; i < pow(s.L, 2); i++) {
-#ifdef NOFIELD
-        if (s.spins[i].x == false) {
-#else
-        if (s.spins[i].x == s.R.x) {
-#endif
-          glColor3f(0.0, 0.0, 0.0);
-        } else {
-          glColor3f(1.0, 1.0, 1.0);
-        }
-        glRecti(i / s.L, i % s.L, (i / s.L) + 1, (i % s.L) + 1);
-      }
-      glFlush();
-    };
-#endif
-  } else {
-    other_f = [] (const state_t<z2_t, ising_t>& s, const wolff_research_measurements<z2_t, ising_t>& meas) {};
-  }
-
-  wolff_research_measurements<z2_t, ising_t> m(measurement_flags, timestamp, other_f, s, silent);
-
-  // add line to metadata file with run info
-  {
-    FILE *outfile_info = fopen("wolff_metadata.txt", "a");
-
-    fprintf(outfile_info, "<| \"ID\" -> %lu, \"MODEL\" -> \"ISING\", \"q\" -> 2, \"D\" -> %" PRID ", \"L\" -> %" PRIL ", \"NV\" -> %" PRIv ", \"NE\" -> %" PRIv ", \"T\" -> %.15f, \"H\" -> %.15f |>\n", timestamp, s.D, s.L, s.nv, s.ne, T, H);
-
-    fclose(outfile_info);
-  }
-
-  // run wolff for N cluster flips
-  if (N_is_sweeps) {
-    count_t N_rounds = 0;
-    printf("\n");
-    while (sum_of_clusterSize < N * s.nv) {
-      printf("\033[F\033[J\033[F\033[JWOLFF: sweep %" PRIu64 " / %" PRIu64 ": E = %.2f, S = %" PRIv "\n", (count_t)((double)sum_of_clusterSize / (double)s.nv), N, m.E, m.last_cluster_size);
-      wolff(N, s, gen_R, m, rng);
-      N_rounds++;
-    }
-    printf("\033[F\033[J\033[F\033[JWOLFF: sweep %" PRIu64 " / %" PRIu64 ": E = %.2f, S = %" PRIv "\n\n", (count_t)((double)sum_of_clusterSize / (double)s.nv), N, m.E, m.last_cluster_size);
-  } else {
-    wolff(N, s, gen_R, m, rng);
-  }
-
-  return 0;
-}
-
diff --git a/examples/src/models/ising/wolff_random-field_ising.cpp b/examples/src/models/ising/wolff_random-field_ising.cpp
deleted file mode 100644
index ce26b88..0000000
--- a/examples/src/models/ising/wolff_random-field_ising.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-
-#define SITE_DEPENDENCE
-
-#include <getopt.h>
-#include <stdio.h>
-
-// if you have GLUT installed, you can see graphics!
-#ifdef HAVE_GLUT
-#include <GL/glut.h>
-#endif
-
-// include your group and spin space
-#include "z2.hpp"
-#include "ising.hpp"
-
-#include <randutils/randutils.hpp>
-
-// measure.hpp contains useful functions for saving timeseries to files
-#include <measure.hpp>
-
-// include wolff.hpp
-#include <wolff.hpp>
-
-int main(int argc, char *argv[]) {
-
-  count_t N = (count_t)1e4;
-
-  D_t D = 2;
-  L_t L = 128;
-  double T = 2.26918531421;
-  double H = 0.0;
-
-  bool silent = false;
-  bool draw = false;
-  bool N_is_sweeps = false;
-  unsigned int window_size = 512;
-
-  // don't measure anything by default
-  unsigned char measurement_flags = 0;
-
-  int opt;
-
-  while ((opt = getopt(argc, argv, "N:D:L:T:H:sdw:M:S")) != -1) {
-    switch (opt) {
-    case 'N': // number of steps
-      N = (count_t)atof(optarg);
-      break;
-    case 'D': // dimension
-      D = atoi(optarg);
-      break;
-    case 'L': // linear size
-      L = atoi(optarg);
-      break;
-    case 'T': // temperature 
-      T = atof(optarg);
-      break;
-    case 'H': // external field
-      H = atof(optarg);
-      break;
-    case 's': // don't print anything during simulation. speeds up slightly
-      silent = true;
-      break;
-    case 'S':
-      N_is_sweeps = true;
-      break;
-    case 'd':
-#ifdef HAVE_GLUT
-      draw = true;
-      break;
-#else
-      printf("You didn't compile this with the glut library installed!\n");
-      exit(EXIT_FAILURE);
-#endif
-    case 'w':
-      window_size = atoi(optarg);
-      break;
-    case 'M':
-      measurement_flags ^= 1 << atoi(optarg);
-      break;
-    default:
-      exit(EXIT_FAILURE);
-    }
-  }
-
-  // get nanosecond timestamp for unique run id
-  unsigned long timestamp;
-
-  {
-    struct timespec spec;
-    clock_gettime(CLOCK_REALTIME, &spec);
-    timestamp = spec.tv_sec*1000000000LL + spec.tv_nsec;
-  }
-
-  // initialize random number generator
-  randutils::auto_seed_128 seeds;
-  std::mt19937 rng{seeds};
-
-  // define spin-spin coupling
-  std::function <double(const ising_t&, const ising_t&)> Z = [] (const ising_t& s1, const ising_t& s2) -> double {
-    if (s1.x == s2.x) {
-      return 1.0;
-    } else {
-      return -1.0;
-    }
-  };
-
-  // create random field
-  std::vector<double> random_field_values(pow(L, D));
-  std::normal_distribution<double> distribution(0.0, H);
-  for (v_t i = 0; i < pow(L, D); i++) {
-    random_field_values[i] = distribution(rng);
-  }
-
-  // define spin-field coupling
-  std::function <double(v_t, const ising_t&)> B = [&] (v_t v, const ising_t& s) -> double {
-    if (s.x) {
-      return -random_field_values[v];
-    } else {
-      return random_field_values[v];
-    }
-  };
-
-  // initialize state object
-#ifndef NOFIELD
-  state_t <z2_t, ising_t> s(D, L, T, Z, B);
-#else
-  state_t <z2_t, ising_t> s(D, L, T, Z);
-#endif
-
-  // define function that generates self-inverse rotations
-  std::function <z2_t(std::mt19937&, ising_t)> gen_R = [] (std::mt19937&, const ising_t& s) -> z2_t {
-    return z2_t(true);
-  };
-
-  FILE **outfiles = measure_setup_files(measurement_flags, timestamp);
-
-  std::function <void(const state_t<z2_t, ising_t>&)> other_f;
-  uint64_t sum_of_clusterSize = 0;
-
-  if (N_is_sweeps) {
-    other_f = [&] (const state_t<z2_t, ising_t>& s) {
-      sum_of_clusterSize += s.last_cluster_size;
-    };
-  } else if (draw) {
-#ifdef HAVE_GLUT
-    // initialize glut
-    glutInit(&argc, argv);
-    glutInitDisplayMode(GLUT_SINGLE | GLUT_RGB);
-    glutInitWindowSize(window_size, window_size);
-    glutCreateWindow("wolff");
-    glClearColor(0.0,0.0,0.0,0.0);
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    gluOrtho2D(0.0, L, 0.0, L);
-
-    other_f = [] (const state_t <z2_t, ising_t>& s) {
-      glClear(GL_COLOR_BUFFER_BIT);
-      for (v_t i = 0; i < pow(s.L, 2); i++) {
-#ifdef NOFIELD
-        if (s.spins[i].x == false) {
-#else
-        if (s.spins[i].x == s.R.x) {
-#endif
-          glColor3f(0.0, 0.0, 0.0);
-        } else {
-          glColor3f(1.0, 1.0, 1.0);
-        }
-        glRecti(i / s.L, i % s.L, (i / s.L) + 1, (i % s.L) + 1);
-      }
-      glFlush();
-    };
-#endif
-  } else {
-    other_f = [] (const state_t<z2_t, ising_t>& s) {};
-  }
-
-  std::function <void(const state_t<z2_t, ising_t>&)> measurements = measure_function_write_files(measurement_flags, outfiles, other_f);
-
-  // add line to metadata file with run info
-  {
-    FILE *outfile_info = fopen("wolff_metadata.txt", "a");
-
-    fprintf(outfile_info, "<| \"ID\" -> %lu, \"MODEL\" -> \"ISING\", \"q\" -> 2, \"D\" -> %" PRID ", \"L\" -> %" PRIL ", \"NV\" -> %" PRIv ", \"NE\" -> %" PRIv ", \"T\" -> %.15f, \"H\" -> %.15f |>\n", timestamp, s.D, s.L, s.nv, s.ne, T, H);
-
-    fclose(outfile_info);
-  }
-
-  // run wolff for N cluster flips
-  if (N_is_sweeps) {
-    count_t N_rounds = 0;
-    printf("\n");
-    while (sum_of_clusterSize < N * s.nv) {
-      printf("\033[F\033[J\033[F\033[JWOLFF: sweep %" PRIu64 " / %" PRIu64 ": E = %.2f, S = %" PRIv "\n", (count_t)((double)sum_of_clusterSize / (double)s.nv), N, s.E, s.last_cluster_size);
-      wolff(N, s, gen_R, measurements, rng, silent);
-      N_rounds++;
-    }
-    printf("\033[F\033[J\033[F\033[JWOLFF: sweep %" PRIu64 " / %" PRIu64 ": E = %.2f, S = %" PRIv "\n\n", (count_t)((double)sum_of_clusterSize / (double)s.nv), N, s.E, s.last_cluster_size);
-  } else {
-    wolff(N, s, gen_R, measurements, rng, silent);
-  }
-
-  measure_free_files(measurement_flags, outfiles);
-
-  return 0;
-
-}
-
diff --git a/examples/src/models/ising/z2.hpp b/examples/src/models/ising/z2.hpp
deleted file mode 100644
index 19b6c05..0000000
--- a/examples/src/models/ising/z2.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-
-#pragma once
-
-#include <wolff/types.h>
-#include "ising.hpp"
-
-/* The minimum definition for a group type R_t to act on a spin type X_t is
- * given by the following.
- *
- * void init(R_t *p);
- * void free_spin(R_t r);
- * R_t copy(R_t r);
- * X_t act(R_t r, X_t x);
- * R_t act(R_t r, R_t r);
- * X_t act_inverse(R_t r, X_t x);
- * R_t act_inverse(R_t r, R_t r);
- *
- */
-
-class z2_t {
-  public:
-  bool x;
-
-  z2_t() : x(false) {}
-
-  z2_t(bool x) : x(x) {}
-
-  ising_t act(const ising_t& s) const {
-    if (x) {
-      return ising_t(!s.x);
-    } else {
-      return ising_t(s.x);
-    }
-  }
-
-  z2_t act(const z2_t& r) const {
-    if (x) {
-      return z2_t(!r.x);
-    } else {
-      return z2_t(r.x);
-    }
-  }
-
-  ising_t act_inverse(const ising_t& s) const {
-    return this->act(s);
-  }
-
-  z2_t act_inverse(const z2_t& r) const {
-    return this->act(r);
-  }
-};
-
-