# HG changeset patch # User Joseph Turian # Date 1233351526 18000 # Node ID 5f9ffefa9ca8040e18e1a69fdbbe34b8a19099bc # Parent 88603b2ac8f906e19697d37cc876e8ffa85606f4 pylearn/algorithms/logistic_regression.py: Added back in unsupervised softmax computation. diff -r 88603b2ac8f9 -r 5f9ffefa9ca8 pylearn/algorithms/logistic_regression.py --- a/pylearn/algorithms/logistic_regression.py Fri Jan 30 16:38:02 2009 -0500 +++ b/pylearn/algorithms/logistic_regression.py Fri Jan 30 16:38:46 2009 -0500 @@ -68,6 +68,10 @@ self.regularized_cost = self.unregularized_cost + self.l1_cost + self.l2_cost self._loss_zero_one = T.mean(T.neq(self.argmax, self.target)) + # Softmax being computed directly. + # TODO: Move somewhere else, more clean. + self.softmax_unsupervised = nnet.softmax(self.linear_output) + # METHODS if 0: #TODO: PENDING THE BETTER IMPLEMENTATION ABOVE self.predict = module.Method([self.input], self.argmax)