diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-01-09 22:37:34 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-01-09 22:37:34 +0100 |
commit | a6a23d5e1d07aad3f0c88f7a70539fcf15fa1029 (patch) | |
tree | ca3c0dce58419842ab408961c8251255ef490445 /eval | |
parent | 9c3c783b9101ee21471ef5a5ce659a2d6746eff9 (diff) |
Rename to indicate it refers to right side.
Diffstat (limited to 'eval')
-rw-r--r-- | eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp | 4 | ||||
-rw-r--r-- | eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp index 5ad4181bbf5..58f1d35dc48 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp @@ -14,7 +14,7 @@ DenseTensorAddressCombiner::DenseTensorAddressCombiner(const eval::ValueType &lh _combinedAddress(), _rightCells(rhsCells), _rightAddress(rhs.dimensions().size(), 0), - _accumulatedSize(_rightAddress.size()), + _rightAccumulatedSize(_rightAddress.size()), _left(), _commonRight(), _right() @@ -43,7 +43,7 @@ DenseTensorAddressCombiner::DenseTensorAddressCombiner(const eval::ValueType &lh _combinedAddress.resize(numDimensions); size_t multiplier = 1; for (int32_t i(_rightAddress.size() - 1); i >= 0; i--) { - _accumulatedSize[i] = multiplier; + _rightAccumulatedSize[i] = multiplier; multiplier *= _rightType.dimensions()[i].size; } } diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h index fdd8da467cc..a45944ef9bf 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h @@ -29,7 +29,7 @@ private: Address _combinedAddress; CellsRef _rightCells; Address _rightAddress; - std::vector<size_t> _accumulatedSize; + std::vector<size_t> _rightAccumulatedSize; Mapping _left; Mapping _commonRight; Mapping _right; @@ -42,7 +42,7 @@ private: size_t rightIndex(const Address &address) const { size_t cellIdx(0); for (uint32_t i(0); i < address.size(); i++) { - cellIdx += address[i]*_accumulatedSize[i]; + cellIdx += address[i]*_rightAccumulatedSize[i]; } return cellIdx; } @@ -70,26 +70,26 @@ public: void for_each(Func && func) { const int32_t lastDimension = _right.size() - 1; int32_t curDimension = lastDimension; - size_t cellIdx = rightIndex(_rightAddress); + size_t rightCellIdx = rightIndex(_rightAddress); while (curDimension >= 0) { const uint32_t rdim = _right[curDimension].second; const uint32_t cdim = _right[curDimension].first; size_type & cindex = _combinedAddress[cdim]; if (curDimension == lastDimension) { for (cindex = 0; cindex < _rightType.dimensions()[rdim].size; cindex++) { - func(_combinedAddress, rightCell(cellIdx)); - cellIdx += _accumulatedSize[rdim]; + func(_combinedAddress, rightCell(rightCellIdx)); + rightCellIdx += _rightAccumulatedSize[rdim]; } cindex = 0; - cellIdx -= _accumulatedSize[rdim] * _rightType.dimensions()[rdim].size; + rightCellIdx -= _rightAccumulatedSize[rdim] * _rightType.dimensions()[rdim].size; curDimension--; } else { if (cindex < _rightType.dimensions()[rdim].size) { cindex++; - cellIdx += _accumulatedSize[rdim]; + rightCellIdx += _rightAccumulatedSize[rdim]; curDimension++; } else { - cellIdx -= _accumulatedSize[rdim] * _rightType.dimensions()[rdim].size; + rightCellIdx -= _rightAccumulatedSize[rdim] * _rightType.dimensions()[rdim].size; cindex = 0; curDimension--; } |