Merge branch 'keras-1' of https://github.com/fchollet/keras into keras-1

This commit is contained in:
Francois Chollet 2016-04-06 17:23:21 -07:00
commit 88a86f7e45

@ -1155,7 +1155,7 @@ class Model(Container):
sample_weight=sample_weight, sample_weight=sample_weight,
check_batch_dim=True) check_batch_dim=True)
if self.uses_learning_phase: if self.uses_learning_phase:
ins = x + y + sample_weights + [1.] ins = x + y + sample_weights + [0.]
else: else:
ins = x + y + sample_weights ins = x + y + sample_weights
self._make_test_function() self._make_test_function()
@ -1170,7 +1170,7 @@ class Model(Container):
x = standardize_input_data(x, self.input_names, x = standardize_input_data(x, self.input_names,
self.internal_input_shapes) self.internal_input_shapes)
if self.uses_learning_phase: if self.uses_learning_phase:
ins = x + [1.] ins = x + [0.]
else: else:
ins = x ins = x
self._make_predict_function() self._make_predict_function()