diff options
| -rw-r--r-- | epare/common.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epare/common.py b/epare/common.py index 7df5e28..2d3bb8c 100644 --- a/epare/common.py +++ b/epare/common.py @@ -201,16 +201,16 @@ naf_mults = [ MultIdent(BinaryNAFMultiplier, direction=ProcessingDirection.RTL) ] comb_mults = [ - MultIdent(CombMultiplier, width=2, complete=True), - MultIdent(CombMultiplier, width=3, complete=True), - MultIdent(CombMultiplier, width=4, complete=True), - MultIdent(CombMultiplier, width=5, complete=True), - MultIdent(CombMultiplier, width=6, complete=True), - MultIdent(CombMultiplier, width=2, complete=False), - MultIdent(CombMultiplier, width=3, complete=False), - MultIdent(CombMultiplier, width=4, complete=False), - MultIdent(CombMultiplier, width=5, complete=False), - MultIdent(CombMultiplier, width=6, complete=False), + MultIdent(CombMultiplier, width=2, always=True), + MultIdent(CombMultiplier, width=3, always=True), + MultIdent(CombMultiplier, width=4, always=True), + MultIdent(CombMultiplier, width=5, always=True), + MultIdent(CombMultiplier, width=6, always=True), + MultIdent(CombMultiplier, width=2, always=False), + MultIdent(CombMultiplier, width=3, always=False), + MultIdent(CombMultiplier, width=4, always=False), + MultIdent(CombMultiplier, width=5, always=False), + MultIdent(CombMultiplier, width=6, always=False), MultIdent(BGMWMultiplier, width=2, direction=ProcessingDirection.LTR), MultIdent(BGMWMultiplier, width=3, direction=ProcessingDirection.LTR), MultIdent(BGMWMultiplier, width=4, direction=ProcessingDirection.LTR), @@ -243,4 +243,4 @@ other_mults = [ ] all_mults = window_mults + naf_mults + binary_mults + other_mults + comb_mults -all_mults_with_ctr = [mult.with_countermeasure(ctr) for mult in all_mults for ctr in (None, "gsr", "additive", "multiplicative", "euclidean", "bt")]
\ No newline at end of file +all_mults_with_ctr = [mult.with_countermeasure(ctr) for mult in all_mults for ctr in (None, "gsr", "additive", "multiplicative", "euclidean", "bt")] |