Deprecate Model.cont_vars and Model.disc_vars in favor of more explicit names

Author: ricardoV94

pymc/model.py

@@ -975,6 +975,32 @@ def unobserved_value_vars(self):
 
         return vars + untransformed_vars + deterministics
 
+    @property
+    def disc_vars(self):
+        warnings.warn(
+            "Model.disc_vars has been deprecated. Use Model.discrete_value_vars instead.",
+            FutureWarning,
+        )
+        return self.discrete_value_vars
+
+    @property
+    def discrete_value_vars(self):
+        """All the discrete value variables in the model"""
+        return list(typefilter(self.value_vars, discrete_types))
+
+    @property
+    def cont_vars(self):
+        warnings.warn(
+            "Model.cont_vars has been deprecated. Use Model.continuous_value_vars instead.",
+            FutureWarning,
+        )
+        return self.continuous_value_vars
+
+    @property
+    def continuous_value_vars(self):
+        """All the continuous value variables in the model"""
+        return list(typefilter(self.value_vars, continuous_types))
+
     @property
     def basic_RVs(self):
         """List of random variables the model is defined in terms of
@@ -1019,16 +1045,6 @@ def unobserved_RVs(self):
         """
         return self.free_RVs + self.deterministics
 
-    @property
-    def disc_vars(self):
-        """All the discrete variables in the model"""
-        return list(typefilter(self.value_vars, discrete_types))
-
-    @property
-    def cont_vars(self):
-        """All the continuous variables in the model"""
-        return list(typefilter(self.value_vars, continuous_types))
-
     @property
     def test_point(self) -> Dict[str, np.ndarray]:
         """Deprecated alias for `Model.initial_point(seed=None)`."""

pymc/step_methods/hmc/base_hmc.py

@@ -88,7 +88,7 @@ def __init__(
         self._model = modelcontext(model)
 
         if vars is None:
-            vars = self._model.cont_vars
+            vars = self._model.continuous_value_vars
         else:
             vars = [self._model.rvs_to_values.get(var, var) for var in vars]
 

pymc/step_methods/metropolis.py

@@ -773,7 +773,7 @@ def __init__(
         initial_values_size = sum(initial_values[n.name].size for n in model.value_vars)
 
         if vars is None:
-            vars = model.cont_vars
+            vars = model.continuous_value_vars
         else:
             vars = [model.rvs_to_values.get(var, var) for var in vars]
         vars = pm.inputvars(vars)
@@ -924,7 +924,7 @@ def __init__(
         initial_values_size = sum(initial_values[n.name].size for n in model.value_vars)
 
         if vars is None:
-            vars = model.cont_vars
+            vars = model.continuous_value_vars
         else:
             vars = [model.rvs_to_values.get(var, var) for var in vars]
         vars = pm.inputvars(vars)

pymc/step_methods/slicer.py

@@ -63,7 +63,7 @@ def __init__(self, vars=None, w=1.0, tune=True, model=None, iter_limit=np.inf, *
         self.iter_limit = iter_limit
 
         if vars is None:
-            vars = self.model.cont_vars
+            vars = self.model.continuous_value_vars
         else:
             vars = [self.model.rvs_to_values.get(var, var) for var in vars]
         vars = inputvars(vars)

pymc/tuning/starting.py

@@ -92,7 +92,7 @@ def find_MAP(
     model = modelcontext(model)
 
     if vars is None:
-        vars = model.cont_vars
+        vars = model.continuous_value_vars
         if not vars:
             raise ValueError("Model has no unobserved continuous variables.")
     else: