diff --git a/pac_encoder.hh b/pac_encoder.hh index 9622a01..6f5de42 100644 --- a/pac_encoder.hh +++ b/pac_encoder.hh @@ -20,21 +20,12 @@ class PACEncoder } static bool conv(int *state, bool input) { -#if 0 // 1011011 bool b1 = (*state >> 1) & 1; bool b3 = (*state >> 3) & 1; bool b4 = (*state >> 4) & 1; bool b6 = (*state >> 6) & 1; bool output = input ^ b1 ^ b3 ^ b4 ^ b6; -#else - // 1101101 - bool b2 = (*state >> 2) & 1; - bool b3 = (*state >> 3) & 1; - bool b5 = (*state >> 5) & 1; - bool b6 = (*state >> 6) & 1; - bool output = input ^ b2 ^ b3 ^ b5 ^ b6; -#endif *state = ((*state & 126) << 1) | (input ? 2 : 0) | (output ? 1 : 0); return output; } diff --git a/pac_list_decoder.hh b/pac_list_decoder.hh index 321bae8..9aef402 100644 --- a/pac_list_decoder.hh +++ b/pac_list_decoder.hh @@ -19,21 +19,12 @@ struct PACListLeaf typedef typename PH::MAP MAP; static bool conv(int *state, bool input) { -#if 0 // 1011011 bool b1 = (*state >> 1) & 1; bool b3 = (*state >> 3) & 1; bool b4 = (*state >> 4) & 1; bool b6 = (*state >> 6) & 1; bool output = input ^ b1 ^ b3 ^ b4 ^ b6; -#else - // 1101101 - bool b2 = (*state >> 2) & 1; - bool b3 = (*state >> 3) & 1; - bool b5 = (*state >> 5) & 1; - bool b6 = (*state >> 6) & 1; - bool output = input ^ b2 ^ b3 ^ b5 ^ b6; -#endif *state = ((*state & 126) << 1) | (input ? 2 : 0) | (output ? 1 : 0); return output; }