Skip to content

Commit 068e823

Browse files
committed
To version 0.1.4; ensure returning new object for evaluate
1 parent 0e9f76d commit 068e823

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

modelspec/BaseTypes.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ def __init__(self, **kwargs):
6565
def get_id(self):
6666
return None
6767

68+
def validate(self):
69+
# TODO...
70+
return True
71+
6872
def get_type(self):
6973
return self.__class__.__name__
7074

modelspec/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.1.3"
1+
__version__ = "0.1.4"

modelspec/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def _val_info(param_val):
174174
return pp
175175

176176

177-
def _params_info(parameters):
177+
def _params_info(parameters, multiline=False):
178178
"""
179179
Short info on names, values and types in parameter list
180180
"""
@@ -185,7 +185,7 @@ def _params_info(parameters):
185185
param_val = parameters[p]
186186
pp = _val_info(param_val)
187187

188-
pi += "%s=%s, " % (p, pp)
188+
pi += "%s=%s, %s" % (p, pp, '\n' if multiline else '')
189189
pi = pi[:-2]
190190
pi += "]"
191191
return pi
@@ -246,7 +246,7 @@ def evaluate(expr, parameters={}, rng=None, array_format=FORMAT_NUMPY, verbose=F
246246
if array_format == FORMAT_TENSORFLOW:
247247
return tf.convert_to_tensor(expr, dtype=tf.float64)
248248
else:
249-
return expr
249+
return np.array(expr)
250250

251251
if "Tensor" in type(expr).__name__:
252252
print_(

0 commit comments

Comments
 (0)