From 99b7dd6997953b4aafd534a7aebb0e5c2434dcfc Mon Sep 17 00:00:00 2001 From: Stephen Mardson McQuay Date: Mon, 1 Nov 2010 20:22:58 -0600 Subject: [PATCH] changed name of get_error func, and allowed for up to 6-th order interp. also, returning the phi multiplier for test case consumption --- interp/baker/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/interp/baker/__init__.py b/interp/baker/__init__.py index 36f5d77..a83e55d 100644 --- a/interp/baker/__init__.py +++ b/interp/baker/__init__.py @@ -103,7 +103,7 @@ def qlinear_3D(X, R): qlin = sum([q_i * phi_i for q_i, phi_i in zip(R.q, phis)]) return phis, qlin -def get_error_sauron(phi, R, S, order = 2): +def get_error(phi, R, S, order = 2): log.debug("len(phi): %d"% len(phi)) B = [] # baker eq 9 w = [] # baker eq 11 @@ -175,8 +175,8 @@ def run_baker(X, R, S, order=2): if order == 1: answer['qlin'] = qlin return answer - elif order in (2,3,4): - error_term, abc = get_error_sauron(phi, R, S, order) + elif order in (2,3,4,5,6): + error_term, abc = get_error(phi, R, S, order) else: raise Exception('unsupported order for baker method') @@ -185,6 +185,7 @@ def run_baker(X, R, S, order=2): answer['qlin' ] = qlin answer['error'] = error_term answer['final'] = q_final + answer['abc' ] = abc return answer