diff options
author | Lester Solbakken <lesters@yahoo-inc.com> | 2017-07-06 10:32:59 +0200 |
---|---|---|
committer | Lester Solbakken <lesters@yahoo-inc.com> | 2017-07-06 10:32:59 +0200 |
commit | 062a98252aed733b3f081de9dc73ff54a3939b1d (patch) | |
tree | c7825e660bfaf80d7db4fc8339f1167efc39ed47 /vespajlib | |
parent | b2ea86592479a78a35e58151d8f9f51a5baa300c (diff) |
Rename variable
Diffstat (limited to 'vespajlib')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java index 95e3c444c1b..8c4dbfb0acb 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java @@ -295,8 +295,8 @@ public class Join extends PrimitiveTensorFunction { return mappedGeneralJoin(a, b, joinedType); // fallback } - boolean switchTensors = a.size() > b.size(); - if (switchTensors) { + boolean swapTensors = a.size() > b.size(); + if (swapTensors) { Tensor temp = a; a = b; b = temp; @@ -326,7 +326,7 @@ public class Join extends PrimitiveTensorFunction { TensorAddress combinedAddress = joinAddresses(aCell.getKey(), aIndexesInJoined, bCell.getKey(), bIndexesInJoined, joinedType); if (combinedAddress == null) continue; // not combinable - double combinedValue = switchTensors ? + double combinedValue = swapTensors ? combinator.applyAsDouble(bCell.getValue(), aCell.getValue()) : combinator.applyAsDouble(aCell.getValue(), bCell.getValue()); builder.cell(combinedAddress, combinedValue); |