diff options
| author | Haavard <havardpe@yahoo-inc.com> | 2017-02-16 15:12:44 +0000 |
|---|---|---|
| committer | Haavard <havardpe@yahoo-inc.com> | 2017-02-16 15:12:44 +0000 |
| commit | f1cf307162effa0a79b0a5e099e0924b4792451d (patch) | |
| tree | 843a1fabfaf2db03ae0150491258e2dc0da1915f /eval | |
| parent | 472b51a42688540d0c8ad27cf1cf9177987b1e3b (diff) | |
let tensor::Tensor::getType return const reference
... to make it cheaper to check tensor types in
implementation-specific code.
Diffstat (limited to 'eval')
5 files changed, 5 insertions, 5 deletions
diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp index 456cacc39bc..31e260f6f4e 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp @@ -145,7 +145,7 @@ DenseTensorView::operator==(const DenseTensorView &rhs) const return (_typeRef == rhs._typeRef) && sameCells(_cellsRef, rhs._cellsRef); } -eval::ValueType +const eval::ValueType & DenseTensorView::getType() const { return _typeRef; diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h index 4bf97267b7c..e7b135cf47c 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h @@ -47,7 +47,7 @@ public: bool operator==(const DenseTensorView &rhs) const; CellsIterator cellsIterator() const { return CellsIterator(_typeRef, _cellsRef); } - virtual eval::ValueType getType() const override; + virtual const eval::ValueType &getType() const override; virtual double sum() const override; virtual Tensor::UP add(const Tensor &arg) const override; virtual Tensor::UP subtract(const Tensor &arg) const override; diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp index e635c34887c..728aeccce65 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp @@ -97,7 +97,7 @@ SparseTensor::combineDimensionsWith(const SparseTensor &rhs) const eval::ValueType::tensor_type(std::move(result))); } -eval::ValueType +const eval::ValueType & SparseTensor::getType() const { return _type; diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h index f62b4a7b933..e5525f61b43 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h @@ -41,7 +41,7 @@ public: bool operator==(const SparseTensor &rhs) const; eval::ValueType combineDimensionsWith(const SparseTensor &rhs) const; - virtual eval::ValueType getType() const override; + virtual const eval::ValueType &getType() const override; virtual double sum() const override; virtual Tensor::UP add(const Tensor &arg) const override; virtual Tensor::UP subtract(const Tensor &arg) const override; diff --git a/eval/src/vespa/eval/tensor/tensor.h b/eval/src/vespa/eval/tensor/tensor.h index 168a6fa4d98..379dedcb2a2 100644 --- a/eval/src/vespa/eval/tensor/tensor.h +++ b/eval/src/vespa/eval/tensor/tensor.h @@ -29,7 +29,7 @@ struct Tensor : public eval::Tensor Tensor(); virtual ~Tensor() {} - virtual eval::ValueType getType() const = 0; + virtual const eval::ValueType &getType() const = 0; virtual double sum() const = 0; virtual Tensor::UP add(const Tensor &arg) const = 0; virtual Tensor::UP subtract(const Tensor &arg) const = 0; |