Skip to content

Commit 81ffd82

Browse files
committed
Adding tensor.__radd__. Making formatting of data in tensors of difference sizes consistent. Closes #18.
1 parent 3904fce commit 81ffd82

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

TensorToolbox/tensor.py

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,6 @@ def end(self, k=None):
265265
----------
266266
k: int
267267
dimension for subscripted indexing
268-
n: int
269-
dimensions to index
270268
271269
Returns
272270
-------
@@ -1380,6 +1378,21 @@ def tensor_add(x, y):
13801378

13811379
return ttb.tt_tenfun(tensor_add, self, other)
13821380

1381+
def __radd__(self, other):
1382+
"""
1383+
Reverse binary addition (+) for tensors
1384+
1385+
Parameters
1386+
----------
1387+
other: :class:`TensorToolbox.tensor`, float, int
1388+
1389+
Returns
1390+
-------
1391+
:class:`TensorToolbox.tensor`
1392+
"""
1393+
1394+
return self.__add__(other)
1395+
13831396
def __pow__(self, power):
13841397
"""
13851398
Element Wise Power (**) for tensors
@@ -1522,15 +1535,15 @@ def __repr__(self):
15221535
s += '[:]'
15231536
s += ' = \n'
15241537
s += str(self.data)
1525-
# s += '\n'
1538+
s += '\n'
15261539
return s
15271540
for i, j in enumerate(range(0, np.prod(self.shape), self.shape[-1]*self.shape[-2])):
15281541
s += 'data'
15291542
if self.ndims == 2:
15301543
s += '[:, :]'
15311544
s += ' = \n'
15321545
s += str(self.data)
1533-
#s += '\n'
1546+
s += '\n'
15341547
elif self.ndims > 2:
15351548
idx = ttb.tt_ind2sub(self.shape[:-2], np.array([i]))
15361549
s += str(idx[0].tolist())[0:-1]

tests/test_tensor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ def test_tensor__str__(sample_tensor_2way):
10741074
s += 'data'
10751075
s += '[:] = \n'
10761076
s += data.__str__()
1077-
# s += '\n'
1077+
s += '\n'
10781078
assert s == tensorInstance.__str__()
10791079

10801080
# Test 2D
@@ -1087,7 +1087,7 @@ def test_tensor__str__(sample_tensor_2way):
10871087
s += 'data'
10881088
s += '[:, :] = \n'
10891089
s += data.__str__()
1090-
# s += '\n'
1090+
s += '\n'
10911091
assert s == tensorInstance.__str__()
10921092

10931093
# Test 3D,shape in decreasing and increasing order

0 commit comments

Comments
 (0)