summaryrefslogtreecommitdiffstats
path: root/eval
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-01-09 19:11:45 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2018-01-09 19:11:45 +0100
commit9edd9511176d4e28d98917f2e9ddecc40815830c (patch)
tree57a91de6169fd547ccea519b7bd856fd5037c783 /eval
parentb9f281a014526050bc635e12ecd0f445dc3d2fd7 (diff)
_mutable -> _right
Diffstat (limited to 'eval')
-rw-r--r--eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.cpp2
-rw-r--r--eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h8
2 files changed, 5 insertions, 5 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 19a7038d686..1de7253e186 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
@@ -80,7 +80,7 @@ CommonDenseTensorCellsIterator::CommonDenseTensorCellsIterator(const Mapping & c
_cells(cells),
_address(type_in.dimensions().size(), 0),
_common(common),
- _mutable(right),
+ _right(right),
_accumulatedSize(_address.size())
{
size_t multiplier = 1;
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 b09bcd945af..b5e4a9bd55e 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
@@ -64,7 +64,7 @@ private:
CellsRef _cells;
Address _address;
const Mapping &_common;
- const Mapping &_mutable;
+ const Mapping &_right;
std::vector<size_t> _accumulatedSize;
double cell(size_t cellIdx) const { return _cells[cellIdx]; }
@@ -81,12 +81,12 @@ public:
~CommonDenseTensorCellsIterator();
template <typename Func>
void for_each(Address & combined, Func && func) const {
- const int32_t lastDimension = _mutable.size() - 1;
+ const int32_t lastDimension = _right.size() - 1;
int32_t curDimension = lastDimension;
size_t cellIdx = index(_address);
while (curDimension >= 0) {
- const uint32_t rdim = _mutable[curDimension].second;
- const uint32_t cdim = _mutable[curDimension].first;
+ const uint32_t rdim = _right[curDimension].second;
+ const uint32_t cdim = _right[curDimension].first;
size_type & cindex = combined[cdim];
if (curDimension == lastDimension) {
for (cindex = 0; cindex < _type.dimensions()[rdim].size; cindex++) {