From f6b3169740a3bdc18ecf67ddca7a79e09d8037e8 Mon Sep 17 00:00:00 2001
From: Benjamin Christoffersen <boennecd@gmail.com>
Date: Wed, 15 Apr 2020 08:33:37 +0200
Subject: [PATCH] simplify asDouble and avoid the need for WITH_LIBTMB with by
 using inline change loop order in asSEXP and asMatrix (R matrices a in column
 major order) fix https://github.com/kaskr/adcomp/issues/309

---
 TMB/inst/include/convert.hpp  | 31 ++++++++++++++-----------------
 TMB/inst/include/tmb_core.hpp |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/TMB/inst/include/convert.hpp b/TMB/inst/include/convert.hpp
index 1b9cd73e8..3347ae607 100644
--- a/TMB/inst/include/convert.hpp
+++ b/TMB/inst/include/convert.hpp
@@ -5,19 +5,16 @@
   \brief  Convert vector/matrix-Types to double SEXP types 
 */
 
-#ifdef WITH_LIBTMB
-double asDouble(int x);
-double asDouble(double x);
-double asDouble(AD<double> x);
-double asDouble(AD<AD<double> > x);
-double asDouble(AD<AD<AD<double> > > x);
-#else
-double asDouble(int x){return double(x);}
-double asDouble(double x){return x;}
-double asDouble(AD<double> x){return CppAD::Value(x);}
-double asDouble(AD<AD<double> > x){return CppAD::Value(CppAD::Value(x));}
-double asDouble(AD<AD<AD<double> > > x){return CppAD::Value(CppAD::Value(CppAD::Value(x)));}
-#endif
+inline double asDouble(double const x){
+  return x;
+}
+inline double asDouble(int const x){
+  return x;
+}
+template<class T>
+double asDouble(AD<T> const x){
+  return asDouble(CppAD::Value(x));
+}
 
 /** \brief Convert TMB matrix, vector, scalar or int to R style */
 template<class Type>
@@ -28,8 +25,8 @@ SEXP asSEXP(const matrix<Type> &a)
    SEXP val;
    PROTECT(val = Rf_allocMatrix(REALSXP, nr, nc));
    double *p = REAL(val);
-   for(R_xlen_t i=0; i<nr; i++)
-     for(R_xlen_t j=0; j<nc; j++)
+   for(R_xlen_t j=0; j<nc; j++)
+     for(R_xlen_t i=0; i<nr; i++)
        p[i + j * nr] = asDouble(a(i,j));
    UNPROTECT(1);
    return val;
@@ -118,8 +115,8 @@ matrix<Type> asMatrix(SEXP x)
    R_xlen_t nr = Rf_nrows(x); // nrows is int
    R_xlen_t nc = Rf_ncols(x); // ncols is int
    matrix<Type> y(nr, nc);
-   for(R_xlen_t i=0; i<nr; i++)
-     for(R_xlen_t j=0; j<nc; j++)
+   for(R_xlen_t j=0; j<nc; j++)
+     for(R_xlen_t i=0; i<nr; i++)
        y(i, j) = Type(REAL(x)[i + nr * j]);
    return y;
 }
diff --git a/TMB/inst/include/tmb_core.hpp b/TMB/inst/include/tmb_core.hpp
index 95f68ac85..25afef474 100644
--- a/TMB/inst/include/tmb_core.hpp
+++ b/TMB/inst/include/tmb_core.hpp
@@ -1033,7 +1033,7 @@ SEXP EvalADFunObjectTemplate(SEXP f, SEXP theta, SEXP control)
   SEXP hessianrows; // Hessian rows
   PROTECT(hessianrows=getListElement(control,"hessianrows"));
   int nrows=Rf_length(hessianrows);
-  if((nrows>0)&(nrows!=ncols))Rf_error("hessianrows and hessianrows must have same length");
+  if((nrows>0)&(nrows!=ncols))Rf_error("hessianrows and hessiancols must have same length");
   vector<size_t> cols(ncols);
   vector<size_t> cols0(ncols);
   vector<size_t> rows(nrows);