wirawan0/wpylib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Added prefix and suffix options for matrix_str and vector_str.

Browse Source
This commit is contained in:
Wirawan Purwanto
2012-05-23 00:25:42 -04:00
parent 140b3b699c
commit 6433e5da3c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
text_tools.py
View File

@@ -40,20 +40,21 @@ def make_matrix(Str, debug=None):
if debug: print rslt if debug: print rslt
return numpy.array(rslt) return numpy.array(rslt)
def vector_str(M, fmt="%22.15g", V=False): def vector_str(M, fmt="%22.15g", V=False, prefix="", suffix=""):
if len(M.shape) != 1: if len(M.shape) != 1:
raise ValueError, "Wrong shape: expecting a one-dimensional array." raise ValueError, "Wrong shape: expecting a one-dimensional array."
if V: if V:
return "\n".join([ fmt % m for m in M ]) return prefix + (suffix + "\n" + prefix).join([ fmt % m for m in M ]) + suffix
else: else:
return " ".join([ fmt % m for m in M ]) return prefix + " ".join([ fmt % m for m in M ]) + suffix
def matrix_str(M, fmt="%22.15g"): def matrix_str(M, fmt="%22.15g", prefix="", suffix=""):
linesep = suffix + "\n" + prefix
if isinstance(M, numpy.matrix): if isinstance(M, numpy.matrix):
M = numpy.asarray(M) M = numpy.asarray(M)
if len(M.shape) != 2: if len(M.shape) != 2:
raise ValueError, "Wrong shape: expecting a two-dimensional array." raise ValueError, "Wrong shape: expecting a two-dimensional array."
return "\n".join([ " ".join([ fmt % c for c in R ] ) for R in M ]) return prefix + linesep.join([ " ".join([ fmt % c for c in R ]) for R in M ]) + suffix
def str_unindent(S, amount=None): def str_unindent(S, amount=None):
@@ -66,7 +67,7 @@ def str_unindent(S, amount=None):
nindent = amount nindent = amount
indent_whsp = " " * nindent indent_whsp = " " * nindent
strs = S.split("\n") strs = S.splitlines()
rslt = [] rslt = []
for s in strs: for s in strs:
if s.strip() != "": if s.strip() != "":