Changeset 630aa5b in sasview for src/sas/sascalc/pr/fit

Timestamp:

Oct 30, 2018 2:15:45 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249

Children:

d742b56

Parents:

67ed543 (diff), 57e48ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (10/30/18 02:15:45)

git-committer:

GitHub <noreply@…> (10/30/18 02:15:45)

Message:

Merge pull request #190 from SasView?/simplify-c-build

simplify C build

Location:

src/sas/sascalc/pr/fit

Files:

• BumpsFitting.py (modified) (2 diffs)
• Loader.py (modified) (1 diff)

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

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

@@ +1 @@
+"""
+class Loader  to load any kind of file
+"""
+
 from __future__ import print_function
 
-# class Loader  to load any king of file
-#import wx
-#import string
 import numpy as np