Working on making fields 1 wide in Problem.mp

This commit is contained in:
Lindsey
2015-05-08 09:21:43 -07:00
parent 4bda4b6019
commit 24c754cea2
2 changed files with 8 additions and 8 deletions
+3 -3
View File
@@ -139,7 +139,7 @@ class Fields(object):
return self._getField(name, ind)
def _setField(self, field, val, name, ind):
if isinstance(val, np.ndarray) and (field.shape[1] == 1 or val.ndim == 1):
if isinstance(val, np.ndarray) and (field.shape[0] == field.size or val.ndim == 1):
val = Utils.mkvc(val,2)
field[:,ind] = val
@@ -160,8 +160,8 @@ class Fields(object):
assert hasattr(self, func), 'The alias field function is a string, but it does not exist in the Fields class.'
func = getattr(self, func)
out = func(self._fields[alias][:,ind], srcII)
if out.shape[0] == out.size:
out = Utils.mkvc(out)
if isinstance(out, np.ndarray) and (out.shape[0] == out.size or out.ndim == 1):
out = Utils.mkvc(out,2)
return out
def __contains__(self, other):