Made the docs numpydoc compliant.

Modified inference procedure to have a method "is_rbm_compatible" that will raise a NotImplementedError if not appropriate for RBM.
Removed assert for RBM and UpDown inference.

Author: rdevon

pylearn2/models/dbm/dbm.py

@@ -21,7 +21,7 @@
 from pylearn2.models.dbm.inference_procedure import WeightDoubling
 from pylearn2.models.dbm.inference_procedure import UpDown
 from pylearn2.models.dbm.sampling_procedure import GibbsEvenOdd
-from pylearn2.models.dbm import Softmax
+from pylearn2.models.dbm.layer import Softmax
 from pylearn2.utils import safe_zip, safe_izip
 from pylearn2.utils.rng import make_np_rng
 

pylearn2/models/dbm/inference_procedure.py

@@ -1539,8 +1539,4 @@ def is_rbm_compatible(self):
         """
         Is implemented as UpDown is RBM compatible.
         """
-<<<<<<< HEAD
         return True
-=======
-        return
->>>>>>> 20fa672... Made the docs numpydoc compliant.