# HG changeset patch
# User Joseph Turian <turian@gmail.com>
# Date 1215496782 14400
# Node ID 344d1f874af7fa4592e9897fbc5a8bec0741a883
# Parent  b4efd192d880d40dd73f3787dcd2b8f46666cef1
Small fix

diff -r b4efd192d880 -r 344d1f874af7 nnet_ops.py
--- a/nnet_ops.py	Tue Jul 08 01:58:16 2008 -0400
+++ b/nnet_ops.py	Tue Jul 08 01:59:42 2008 -0400
@@ -386,4 +386,4 @@
     @note: We do not sum, crossentropy is computed by component.
     @todo: Rewrite as a scalar, and then broadcast to tensor.
     """
-    return -(target * t.log(output) + (1 - target) * t.log(1 - output))
+    return -(target * tensor.log(output) + (1 - target) * tensor.log(1 - output))
diff -r b4efd192d880 -r 344d1f874af7 sparse_random_autoassociator/graph.py
--- a/sparse_random_autoassociator/graph.py	Tue Jul 08 01:58:16 2008 -0400
+++ b/sparse_random_autoassociator/graph.py	Tue Jul 08 01:59:42 2008 -0400
@@ -6,7 +6,7 @@
 
 from globals import MARGIN
 
-from pylearn.nnet_ops import sigmoid, crossentropy_softmax_1hot
+from pylearn.nnet_ops import sigmoid, binary_crossentropy
 from theano import tensor as t
 from theano.tensor import dot
 xnonzero    = t.dvector()
@@ -29,9 +29,9 @@
 # xnonzero sensitive loss:
 #nonzeroloss = hingeloss(ynonzero - t.max(yzero) - MARGIN - xnonzero)
 #zeroloss = hingeloss(-t.max(-(ynonzero - xnonzero)) - yzero - MARGIN)
-loss = t.sum(nonzeroloss) + t.sum(zeroloss)
+#loss = t.sum(nonzeroloss) + t.sum(zeroloss)
 
-#loss = t.sum(binary_crossentropy(ynonzero, xnonzero)) + t.sum(binary_crossentropy(yzero, t.constant(0)))
+loss = t.sum(binary_crossentropy(ynonzero, xnonzero)) + t.sum(binary_crossentropy(yzero, t.constant(0)))
 
 (gw1nonzero, gb1, gw2nonzero, gw2zero, gb2nonzero, gb2zero) = t.grad(loss, [w1nonzero, b1, w2nonzero, w2zero, b2nonzero, b2zero])