-                      r9a5097c
+                      r3e6829d
 BumpsFitting module runs the bumps optimizer.
 """
+from __future__ import division
 import os
 from datetime import timedelta, datetime
 …
 class Progress(object):
     def __init__(self, history, max_step, pars, dof):
         remaining_time = int(history.time[0]*(float(max_step)/history.step[0]-1))
+        remaining_time = int(history.time[0]*(max_step/history.step[0]-1))
         # Depending on the time remaining, either display the expected
         # time of completion, or the amount of time remaining.  Use precision

src/sas/sascalc/pr/invertor.py

-                      r952ea1f
+                      r3e6829d
 FIXME: The way the Invertor interacts with its C component should be cleaned up
 """
+from __future__ import division
 import numpy as np
 …
         try:
             cov = np.linalg.pinv(inv_cov)
             err = math.fabs(chi2 / float(npts - nfunc)) * cov
+            err = math.fabs(chi2 / (npts - nfunc)) * cov
         except Exception as exc:
             # We were not able to estimate the errors

src/sas/sascalc/pr/num_term.py

-                      r2469df7
+                      r3e6829d
 from __future__ import print_function
+from __future__ import print_function, division
 import math
 …
         osc = self.sort_osc()
         dv = len(osc)
         med = float(dv) / 2.0
+        med = 0.5*dv
         odd = self.is_odd(dv)
         medi = 0
 …
             nts = self.compare_err()
             div = len(nts)
             tem = float(div) / 2.0
+            tem = 0.5*div
             if self.is_odd(div):
                 nt = nts[int(tem)]

Note: See TracChangeset for help on using the changeset viewer.