diff options
author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-12-13 16:18:03 -0500 |
---|---|---|
committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-12-13 16:18:03 -0500 |
commit | a75a3b44ffe9c99fc6d1c07ba4c4542b85f02790 (patch) | |
tree | 6281a4e84eb92105c3a4a8433d0aeef8271ec632 /examples/simple_measurement.hpp | |
parent | 4991418a416b75680737ec8f1e47b355b219728d (diff) | |
download | c++-a75a3b44ffe9c99fc6d1c07ba4c4542b85f02790.tar.gz c++-a75a3b44ffe9c99fc6d1c07ba4c4542b85f02790.tar.bz2 c++-a75a3b44ffe9c99fc6d1c07ba4c4542b85f02790.zip |
fixed some bugs due to new class in global namespace
Diffstat (limited to 'examples/simple_measurement.hpp')
-rw-r--r-- | examples/simple_measurement.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/simple_measurement.hpp b/examples/simple_measurement.hpp index 140da3b..b24e9f6 100644 --- a/examples/simple_measurement.hpp +++ b/examples/simple_measurement.hpp @@ -17,7 +17,7 @@ class simple_measurement : public measurement<R_t, X_t, G_t> { double totalC; public: - simple_measurement(const system<R_t, X_t, G_t>& S) { + simple_measurement(const wolff::system<R_t, X_t, G_t>& S) { n = 0; M = S.nv * S.s[0]; E = 0; @@ -47,22 +47,22 @@ class simple_measurement : public measurement<R_t, X_t, G_t> { totalC = 0; } - void pre_cluster(unsigned, unsigned, const system<R_t, X_t, G_t>&, const typename G_t::vertex&, const R_t&) override { + void pre_cluster(unsigned, unsigned, const wolff::system<R_t, X_t, G_t>&, const typename G_t::vertex&, const R_t&) override { C = 0; } - void plain_bond_visited(const system<R_t, X_t, G_t>&, const typename G_t::halfedge&, const X_t&, double dE) override { + void plain_bond_visited(const wolff::system<R_t, X_t, G_t>&, const typename G_t::halfedge&, const X_t&, double dE) override { E += dE; } #ifndef WOLFF_NO_FIELD - void ghost_bond_visited(const system<R_t, X_t, G_t>&, const typename G_t::vertex&, const X_t& s_old, const X_t& s_new, double dE) override { + void ghost_bond_visited(const wolff::system<R_t, X_t, G_t>&, const typename G_t::vertex&, const X_t& s_old, const X_t& s_new, double dE) override { E += dE; M += s_new - s_old; } #endif - void plain_site_transformed(const system<R_t, X_t, G_t>& S, const typename G_t::vertex& v, const X_t& si_new) override { + void plain_site_transformed(const wolff::system<R_t, X_t, G_t>& S, const typename G_t::vertex& v, const X_t& si_new) override { C++; #ifdef WOLFF_NO_FIELD @@ -70,7 +70,7 @@ class simple_measurement : public measurement<R_t, X_t, G_t> { #endif } - void post_cluster(unsigned, unsigned, const system<R_t, X_t, G_t>&) override { + void post_cluster(unsigned, unsigned, const wolff::system<R_t, X_t, G_t>&) override { totalE += E; totalM += M; totalC += C; |