# HG changeset patch
# User James Bergstra <bergstrj@iro.umontreal.ca>
# Date 1294524884 18000
# Node ID 54b2268db0d739a0aa1f85c73a39746d4f256281
# Parent  48e8292e22e7bcebb46ecc8c621b2ce0b0ec6892
mcRBM.contrastive_grad accepts optional "consider_constant" arg

diff -r 48e8292e22e7 -r 54b2268db0d7 pylearn/algorithms/mcRBM.py
--- a/pylearn/algorithms/mcRBM.py	Fri Jan 07 11:42:38 2011 -0500
+++ b/pylearn/algorithms/mcRBM.py	Sat Jan 08 17:14:44 2011 -0500
@@ -265,7 +265,7 @@
     """
     return (free_energy_fn(pos_v) - free_energy_fn(neg_v)).sum()
 
-def contrastive_grad(free_energy_fn, pos_v, neg_v, wrt, other_cost=0):
+def contrastive_grad(free_energy_fn, pos_v, neg_v, wrt, other_cost=0, consider_constant=[]):
     """
     :param free_energy_fn: lambda (TensorType matrix MxN) ->  TensorType vector of M free energies
     :param pos_v: positive-phase sample of visible units
@@ -299,7 +299,7 @@
         cost = cost + other_cost
     return theano.tensor.grad(cost,
             wrt=wrt,
-            consider_constant=[neg_v])
+            consider_constant=consider_constant+[neg_v])
 
 ###########################################
 #