Merge 3842320 into 607704f

adrn · Feb 28, 2019 · 237a809 · 237a809
2 parents 607704f + 3842320
commit 237a809
Show file tree

Hide file tree

Showing 8 changed files with 240 additions and 240 deletions.
diff --git a/thejoker/sampler/fast_likelihood.pyx b/thejoker/sampler/fast_likelihood.pyx
@@ -66,8 +66,9 @@ cdef void design_matrix(double P, double phi0, double ecc, double omega,
                        P, 1., ecc, omega, phi0, t0,
                        anomaly_tol, anomaly_maxiter)
 
-    for j in range(n_times):
-        A_T[1, j] = 1.
+    if n_trend > 0: # only needed if we are fitting for a constant trend
+        for j in range(n_times):
+            A_T[1, j] = 1.
 
     if n_trend > 1: # only needed if more than constant trend
         for i in range(1, n_trend):

diff --git a/thejoker/sampler/likelihood.py b/thejoker/sampler/likelihood.py
@@ -57,8 +57,7 @@ def design_matrix(nonlinear_p, data, joker_params):
                                joker_params.anomaly_tol,
                                joker_params.anomaly_maxiter)
 
-    # here we only support a constant N=1 velocity trend!
-    A1 = np.vander(t, N=1, increasing=True)
+    A1 = np.vander(t - t0, N=joker_params.poly_trend, increasing=True)
     A = np.hstack((zdot[:, None], A1))
 
     return A