meerkat
/
meerkat-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new benes code passes tests

mixer
Tal Moran 2017-01-19 01:18:21 +02:00
parent 37d1857f9c
commit 78f823f31e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mixer/src/main/java/meerkat/mixer/mixing/BenesNetwork.java
View File

@ -40,7 +40,7 @@ public class BenesNetwork implements PermutationNetwork
*/ */
public static int getOutputIdxInPreviousLayer(int logN, int layer, int inputIdx) { public static int getOutputIdxInPreviousLayer(int logN, int layer, int inputIdx) {
assert (layer >= 0) && (layer < 2*logN - 1); assert (layer >= 0) && (layer < 2*logN - 1);
assert (inputIdx >= 0) && (inputIdx < 1 << inputIdx); assert (inputIdx >= 0) && (inputIdx < 1 << logN);
if ((layer == 0) || (inputIdx & 1) == 0) { if ((layer == 0) || (inputIdx & 1) == 0) {
// layer 0 inputs and all even inputs // layer 0 inputs and all even inputs
@ -145,7 +145,7 @@ public class BenesNetwork implements PermutationNetwork
/** /**
* Where the set of switches for this level and index actually starts in switchValues * Where the set of switches for this level and index actually starts in switchValues
*/ */
int blockStart = idx << level; int blockStart = idx << (logN - level - 1);
int numSwitches = 1 << (logN - level - 1); int numSwitches = 1 << (logN - level - 1);
while (!unmatchedIndices.isEmpty()) { while (!unmatchedIndices.isEmpty()) {
@ -189,11 +189,11 @@ public class BenesNetwork implements PermutationNetwork
if ((((j & 1) == 0) && (jSwitchNum < numSwitches / 2)) || ((j & 1) == 1) && (jSwitchNum >= numSwitches / 2)) { if ((((j & 1) == 0) && (jSwitchNum < numSwitches / 2)) || ((j & 1) == 1) && (jSwitchNum >= numSwitches / 2)) {
// Even output in the upper half, or odd output in the lower half // Even output in the upper half, or odd output in the lower half
// so switch needs to be "straight" to get j to the upper half // so switch needs to be "straight" to get j to the upper half
switchValues[level][blockStart + switchNum] = false; switchValues[level][blockStart + jSwitchNum] = false;
jSwitched = j; jSwitched = j;
} else { } else {
// Otherwise switch needs to be "crossed" to get j to upper half // Otherwise switch needs to be "crossed" to get j to upper half
switchValues[level][blockStart + switchNum] = true; switchValues[level][blockStart + jSwitchNum] = true;
jSwitched = j ^ 1; jSwitched = j ^ 1;
} }

2
mixer/src/test/java/meerkat/mixer/mixing/BenesNetworkTest.java
View File

@ -11,7 +11,7 @@ import static org.junit.Assert.*;
* Tests for Benes Network topology * Tests for Benes Network topology
*/ */
public class BenesNetworkTest extends PermutationNetworkTest { public class BenesNetworkTest extends PermutationNetworkTest {
final static int logN = 3; final static int logN = 8;
@Override @Override
protected PermutationNetwork getNewNetwork() { protected PermutationNetwork getNewNetwork() {