From a27797e1f2edcceb0ab3ae57c400978b9bcc51ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Hu=C5=A1ek?= <PitelVonSacek@gmail.com> Date: Thu, 10 Dec 2015 08:09:11 +0100 Subject: [PATCH] Move nextForb --- group-connectivity.h | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/group-connectivity.h b/group-connectivity.h index eac1fd0..f7950ac 100644 --- a/group-connectivity.h +++ b/group-connectivity.h @@ -77,7 +77,22 @@ struct Tester : public AbstractTester { } } -#if !USE_NEXT_FORB + +#if USE_NEXT_FORB + bool nextForb(Mapping& forb) { + for (size_t i = 0; i < edges; i++) { + T v = forb[i] + 1; + if (v >= Ring::size) { + forb.assign(i, 1); + } else { + forb.assign(i, v); + return true; + } + } + + return false; + } +#else // !USE_NEXT_FORB Mapping& unpack(size_t index, Mapping& ret) { size_t m = Ring::size - 1; @@ -90,6 +105,7 @@ struct Tester : public AbstractTester { } #endif + Mapping& cannonize(Mapping& map) { for (const auto &i : nonClassEdges) { #if OPTIMIZE_COMBINE @@ -123,21 +139,7 @@ struct Tester : public AbstractTester { #endif } -#if USE_NEXT_FORB - bool nextForb(Mapping& forb) { - for (size_t i = 0; i < edges; i++) { - T v = forb[i] + 1; - if (v >= Ring::size) { - forb.assign(i, 1); - } else { - forb.assign(i, v); - return true; - } - } - return false; - } -#endif virtual bool run() { # if SAVE_MEMORY -- GitLab