From 3b8e7ea25f0c23ca596c1c4e3e4f71d12c5fc065 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Fri, 19 Oct 2018 13:23:23 -0400 Subject: added more examples and cleaned up the model headers --- lib/include/wolff/models/dihedral.hpp | 4 ++++ lib/include/wolff/models/dihedral_inf.hpp | 4 ++++ lib/include/wolff/models/height.hpp | 14 ++++++++++++++ lib/include/wolff/models/potts.hpp | 17 ++++++++++++++++- lib/include/wolff/models/symmetric.hpp | 4 ++++ 5 files changed, 42 insertions(+), 1 deletion(-) (limited to 'lib/include') diff --git a/lib/include/wolff/models/dihedral.hpp b/lib/include/wolff/models/dihedral.hpp index cbc5687..50272e3 100644 --- a/lib/include/wolff/models/dihedral.hpp +++ b/lib/include/wolff/models/dihedral.hpp @@ -4,6 +4,8 @@ #include #include "potts.hpp" +namespace wolff { + template class dihedral_t { public: @@ -46,3 +48,5 @@ class dihedral_t { } }; +} + diff --git a/lib/include/wolff/models/dihedral_inf.hpp b/lib/include/wolff/models/dihedral_inf.hpp index bded387..b88e91b 100644 --- a/lib/include/wolff/models/dihedral_inf.hpp +++ b/lib/include/wolff/models/dihedral_inf.hpp @@ -3,6 +3,8 @@ #include #include "height.hpp" +namespace wolff { + template class dihedral_inf_t { public: @@ -45,3 +47,5 @@ class dihedral_inf_t { } }; +} + diff --git a/lib/include/wolff/models/height.hpp b/lib/include/wolff/models/height.hpp index bd0ceb6..9d7e87c 100644 --- a/lib/include/wolff/models/height.hpp +++ b/lib/include/wolff/models/height.hpp @@ -4,6 +4,8 @@ #include #include +namespace wolff { + template struct height_t { T x; @@ -27,6 +29,16 @@ struct height_t { } }; +template +inline typename height_t::M_t operator*(v_t a, height_t h) { + return h * a; +} + +template +inline typename height_t::F_t operator*(double a, height_t h) { + return h * a; +} + template inline T& operator+=(T& M, const height_t &h) { M += h.x; @@ -41,3 +53,5 @@ inline T& operator-=(T& M, const height_t &h) { return M; } +} + diff --git a/lib/include/wolff/models/potts.hpp b/lib/include/wolff/models/potts.hpp index 10b440e..ce419ce 100644 --- a/lib/include/wolff/models/potts.hpp +++ b/lib/include/wolff/models/potts.hpp @@ -6,6 +6,8 @@ #include "../types.h" #include "vector.hpp" +namespace wolff { + template class potts_t { public: @@ -44,7 +46,20 @@ class potts_t { } }; -const potts_t states[256] = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {11}, {12}, {13}, {14}, {15}, {16}, {17}, {18}, {19}, {20}, {21}, {22}, {23}, {24}, {25}, {26}, {27}, {28}, {29}, {30}, {31}, {32}, {33}, {34}, {35}, {36}, {37}, {38}, {39}, {40}, {41}, {42}, {43}, {44}, {45}, {46}, {47}, {48}, {49}, {50}, {51}, {52}, {53}, {54}, {55}, {56}, {57}, {58}, {59}, {60}, {61}, {62}, {63}, {64}, {65}, {66}, {67}, {68}, {69}, {70}, {71}, {72}, {73}, {74}, {75}, {76}, {77}, {78}, {79}, {80}, {81}, {82}, {83}, {84}, {85}, {86}, {87}, {88}, {89}, {90}, {91}, {92}, {93}, {94}, {95}, {96}, {97}, {98}, {99}, {100}, {101}, {102}, {103}, {104}, {105}, {106}, {107}, {108}, {109}, {110}, {111}, {112}, {113}, {114}, {115}, {116}, {117}, {118}, {119}, {120}, {121}, {122}, {123}, {124}, {125}, {126}, {127}, {128}, {129}, {130}, {131}, {132}, {133}, {134}, {135}, {136}, {137}, {138}, {139}, {140}, {141}, {142}, {143}, {144}, {145}, {146}, {147}, {148}, {149}, {150}, {151}, {152}, {153}, {154}, {155}, {156}, {157}, {158}, {159}, {160}, {161}, {162}, {163}, {164}, {165}, {166}, {167}, {168}, {169}, {170}, {171}, {172}, {173}, {174}, {175}, {176}, {177}, {178}, {179}, {180}, {181}, {182}, {183}, {184}, {185}, {186}, {187}, {188}, {189}, {190}, {191}, {192}, {193}, {194}, {195}, {196}, {197}, {198}, {199}, {200}, {201}, {202}, {203}, {204}, {205}, {206}, {207}, {208}, {209}, {210}, {211}, {212}, {213}, {214}, {215}, {216}, {217}, {218}, {219}, {220}, {221}, {222}, {223}, {224}, {225}, {226}, {227}, {228}, {229}, {230}, {231}, {232}, {233}, {234}, {235}, {236}, {237}, {238}, {239}, {240}, {241}, {242}, {243}, {244}, {245}, {246}, {247}, {248}, {249}, {250}, {251}, {252}, {253}, {254}, {255}}; +template +inline typename potts_t::M_t operator*(v_t a, const potts_t& s) { + return s * a; +} + +template +inline typename potts_t::F_t operator*(double a, const potts_t& s) { + return s * a; +} + +#define WOLFF_FINITE_STATES_N WOLFF_POTTSQ +const potts_t finite_states_possible[256] = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {11}, {12}, {13}, {14}, {15}, {16}, {17}, {18}, {19}, {20}, {21}, {22}, {23}, {24}, {25}, {26}, {27}, {28}, {29}, {30}, {31}, {32}, {33}, {34}, {35}, {36}, {37}, {38}, {39}, {40}, {41}, {42}, {43}, {44}, {45}, {46}, {47}, {48}, {49}, {50}, {51}, {52}, {53}, {54}, {55}, {56}, {57}, {58}, {59}, {60}, {61}, {62}, {63}, {64}, {65}, {66}, {67}, {68}, {69}, {70}, {71}, {72}, {73}, {74}, {75}, {76}, {77}, {78}, {79}, {80}, {81}, {82}, {83}, {84}, {85}, {86}, {87}, {88}, {89}, {90}, {91}, {92}, {93}, {94}, {95}, {96}, {97}, {98}, {99}, {100}, {101}, {102}, {103}, {104}, {105}, {106}, {107}, {108}, {109}, {110}, {111}, {112}, {113}, {114}, {115}, {116}, {117}, {118}, {119}, {120}, {121}, {122}, {123}, {124}, {125}, {126}, {127}, {128}, {129}, {130}, {131}, {132}, {133}, {134}, {135}, {136}, {137}, {138}, {139}, {140}, {141}, {142}, {143}, {144}, {145}, {146}, {147}, {148}, {149}, {150}, {151}, {152}, {153}, {154}, {155}, {156}, {157}, {158}, {159}, {160}, {161}, {162}, {163}, {164}, {165}, {166}, {167}, {168}, {169}, {170}, {171}, {172}, {173}, {174}, {175}, {176}, {177}, {178}, {179}, {180}, {181}, {182}, {183}, {184}, {185}, {186}, {187}, {188}, {189}, {190}, {191}, {192}, {193}, {194}, {195}, {196}, {197}, {198}, {199}, {200}, {201}, {202}, {203}, {204}, {205}, {206}, {207}, {208}, {209}, {210}, {211}, {212}, {213}, {214}, {215}, {216}, {217}, {218}, {219}, {220}, {221}, {222}, {223}, {224}, {225}, {226}, {227}, {228}, {229}, {230}, {231}, {232}, {233}, {234}, {235}, {236}, {237}, {238}, {239}, {240}, {241}, {242}, {243}, {244}, {245}, {246}, {247}, {248}, {249}, {250}, {251}, {252}, {253}, {254}, {255}}; template q_t finite_states_enum(const potts_t& state) { return (q_t)state.x; } +} + diff --git a/lib/include/wolff/models/symmetric.hpp b/lib/include/wolff/models/symmetric.hpp index 7bcc9a6..71431c5 100644 --- a/lib/include/wolff/models/symmetric.hpp +++ b/lib/include/wolff/models/symmetric.hpp @@ -6,6 +6,8 @@ #include "../types.h" #include "potts.hpp" +namespace wolff { + template class symmetric_t : public std::array { public: @@ -49,3 +51,5 @@ class symmetric_t : public std::array { } }; +} + -- cgit v1.2.3-70-g09d2