← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/python-scipy/oneiric-proposed

« back to all changes in this revision

Viewing changes to scipy/special/c_misc/fsolve.c

  • Committer: Bazaar Package Importer
  • Author(s): Sameer Morar
  • Date: 2011-02-03 04:28:09 UTC
  • mfrom: (9.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110203042809-qs95kuod7723re62
Tags: 0.8.0+dfsg1-1ubuntu1
https://launchpad.net/bugs/696403
* Merge from debian experimental (LP: #696403). Remaining changes:
  - debian/patches/stdc_format_macros.patch: Fix FTBFS issue with python 2.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
scipy/special/c_misc/fsolve.c
48
48
false_position(double *a, double *fa, double *b, double *fb,
49
49
               objective_function f, void *f_extra,
50
50
               double abserr, double relerr, double bisect_til,
51
 
               double *best_x, double *best_f)
 
51
               double *best_x, double *best_f, double *errest)
52
52
{
53
53
    double x1=*a, f1=*fa, x2=*b, f2=*fb;
54
54
    fsolve_result_t r = FSOLVE_CONVERGED;
163
163
    r = FSOLVE_EXACT;
164
164
finish:
165
165
    *a = x1; *fa = f1; *b = x2; *fb = f2;
 
166
    *errest = w;
166
167
    return r;
167
168
}