fix

Author: nhuurre

stan/math/prim/prob/multinomial_logit_log.hpp

@@ -12,21 +12,21 @@ namespace math {
 /** \ingroup multivar_dists
  * @deprecated use <code>multinomial_logit_lpmf</code>
  */
-template <bool propto, typename T_prob>
-return_type_t<T_prob> multinomial_logit_log(
-    const std::vector<int>& ns,
-    const Eigen::Matrix<T_prob, Eigen::Dynamic, 1>& theta) {
-  return multinomial_logit_lpmf<propto, T_prob>(ns, theta);
+template <bool propto, typename T_beta, typename T_prob = scalar_type_t<T_beta>,
+          require_eigen_col_vector_t<T_beta>* = nullptr>
+return_type_t<T_prob> multinomial_logit_log(const std::vector<int>& ns,
+                                            const T_beta& beta) {
+  return multinomial_logit_lpmf<propto, T_beta>(ns, beta);
 }
 
 /** \ingroup multivar_dists
  * @deprecated use <code>multinomial_logit_lpmf</code>
  */
-template <typename T_prob>
-return_type_t<T_prob> multinomial_logit_log(
-    const std::vector<int>& ns,
-    const Eigen::Matrix<T_prob, Eigen::Dynamic, 1>& theta) {
-  return multinomial_logit_lpmf<false>(ns, theta);
+template <typename T_beta, typename T_prob = scalar_type_t<T_beta>,
+          require_eigen_col_vector_t<T_beta>* = nullptr>
+return_type_t<T_prob> multinomial_logit_log(const std::vector<int>& ns,
+                                            const T_beta& beta) {
+  return multinomial_logit_lpmf<false>(ns, beta);
 }
 
 }  // namespace math

stan/math/prim/prob/multinomial_logit_lpmf.hpp

@@ -48,10 +48,10 @@ return_type_t<T_prob> multinomial_logit_lpmf(const std::vector<int>& ns,
   return lp;
 }
 
-template <typename T_prob>
-return_type_t<T_prob> multinomial_logit_lpmf(
-    const std::vector<int>& ns,
-    const Eigen::Matrix<T_prob, Eigen::Dynamic, 1>& beta) {
+template <typename T_beta, typename T_prob = scalar_type_t<T_beta>,
+          require_eigen_col_vector_t<T_beta>* = nullptr>
+return_type_t<T_prob> multinomial_logit_lpmf(const std::vector<int>& ns,
+                                             const T_beta& beta) {
   return multinomial_logit_lpmf<false>(ns, beta);
 }
 

test/unit/math/prim/prob/multinomial_logit_log_test.cpp

@@ -18,10 +18,4 @@ TEST(ProbMultinomialLogit, log_matches_lpmf) {
                   (multinomial_logit_log<true>(ns, theta)));
   EXPECT_FLOAT_EQ((multinomial_logit_lpmf<false>(ns, theta)),
                   (multinomial_logit_log<false>(ns, theta)));
-  EXPECT_FLOAT_EQ((multinomial_logit_lpmf<true, double>(ns, theta)),
-                  (multinomial_logit_log<true, double>(ns, theta)));
-  EXPECT_FLOAT_EQ((multinomial_logit_lpmf<false, double>(ns, theta)),
-                  (multinomial_logit_log<false, double>(ns, theta)));
-  EXPECT_FLOAT_EQ((multinomial_logit_lpmf<double>(ns, theta)),
-                  (multinomial_logit_log<double>(ns, theta)));
 }

test/unit/math/rev/prob/multinomial_logit_test.cpp

@@ -5,13 +5,15 @@
 #include <string>
 #include <vector>
 
+using stan::math::multinomial_logit_lpmf;
+
 template <typename T_prob>
 void expect_propto(std::vector<int>& ns1, T_prob beta1, std::vector<int>& ns2,
                    T_prob beta2, std::string message) {
-  expect_eq_diffs(stan::math::multinomial_logit_lpmf<false>(ns1, beta1),
-                  stan::math::multinomial_logit_lpmf<false>(ns2, beta2),
-                  stan::math::multinomial_logit_lpmf<true>(ns1, beta1),
-                  stan::math::multinomial_logit_lpmf<true>(ns2, beta2), message);
+  expect_eq_diffs(multinomial_logit_lpmf<false>(ns1, beta1),
+                  multinomial_logit_lpmf<false>(ns2, beta2),
+                  multinomial_logit_lpmf<true>(ns1, beta1),
+                  multinomial_logit_lpmf<true>(ns2, beta2), message);
 }
 
 using Eigen::Dynamic;
@@ -39,6 +41,6 @@ TEST(AgradDistributionsMultinomialLogit, check_varis_on_stack) {
   Matrix<var, Dynamic, 1> beta(3, 1);
   beta << log(0.3), log(0.5), log(0.2);
 
-  test::check_varis_on_stack(stan::math::multinomial_logit_lpmf<false>(ns, beta));
-  test::check_varis_on_stack(stan::math::multinomial_logit_lpmf<true>(ns, beta));
+  test::check_varis_on_stack(multinomial_logit_lpmf<false>(ns, beta));
+  test::check_varis_on_stack(multinomial_logit_lpmf<true>(ns, beta));
 }