wirawan0/wpylib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Rebase fit_result on result_base.

Browse Source
This commit is contained in:
Wirawan Purwanto
2012-10-15 16:01:46 -04:00
parent 348c204699
commit 908a4e0682
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
math/fitting/__init__.py
View File

@@ -13,6 +13,7 @@
import numpy import numpy
import scipy.optimize import scipy.optimize
from wpylib.db.result_base import result_base
last_fit_rslt = None last_fit_rslt = None
last_chi_sqr = None last_chi_sqr = None
@@ -117,7 +118,7 @@ class Poly_order4(Poly_base):
for i in xrange(len(x)) ]) for i in xrange(len(x)) ])
class fit_result(dict): class fit_result(result_base):
pass pass
def fit_func(Funct, Data=None, Guess=None, x=None, y=None, def fit_func(Funct, Data=None, Guess=None, x=None, y=None,
@@ -235,5 +236,6 @@ def fit_func(Funct, Data=None, Guess=None, x=None, y=None,
for (k, v) in zip(keys, rslt): for (k, v) in zip(keys, rslt):
rec[k] = v rec[k] = v
rec['chi_square'] = chi_sqr rec['chi_square'] = chi_sqr
rec['fit_method'] = method
return rec return rec