Changeset 57a91fc in sasview for src/sas/sascalc/pr/fit/BumpsFitting.py

Timestamp:

Nov 20, 2018 6:20:53 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c30822c

Parents:

be7c981

Message:

cherrypicked changes from master to sascalc (except PR#190)

File:

• src/sas/sascalc/pr/fit/BumpsFitting.py (modified) (2 diffs)

src/sas/sascalc/pr/fit/BumpsFitting.py

@@ -2 +2 @@
 BumpsFitting module runs the bumps optimizer.
 """
+from __future__ import division
+
 import os
 from datetime import timedelta, datetime
@@ -34 +36 @@
 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