Changeset b699768 in sasview for test/sasfit

Timestamp:

Feb 19, 2016 10:07:22 AM (9 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d7bb526

Parents:

792e6be

Message:

Initial commit of the refactored SasCalc? module.

Location:

test/sasfit/test

Files:

• batch_fit.py (modified) (1 diff)
• utest_fit_cylinder.py (modified) (1 diff)
• utest_fit_line.py (modified) (1 diff)
• utest_fit_smeared.py (modified) (1 diff)
• utest_multiplicative_model.py (modified) (1 diff)
• utest_small_test.py (modified) (1 diff)

test/sasfit/test/batch_fit.py

@@ -2 +2 @@
 import time
 import unittest
-from sas.dataloader.loader import Loader
-from sas.fit.Fitting import BumpsFit as Fit
+from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.fit.Fitting import BumpsFit as Fit
 from sas.models.CylinderModel import CylinderModel
 import sas.models.dispersion_models 

test/sasfit/test/utest_fit_cylinder.py

@@ -6 +6 @@
 import math
 
-from sas.fit.AbstractFitEngine import Model
-from sas.fit.BumpsFitting import BumpsFit as Fit
-from sas.dataloader.loader import Loader
+from sas.sascalc.fit.AbstractFitEngine import Model
+from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
+from sas.sascalc.dataloader.loader import Loader
 
 class TestSingleFit(unittest.TestCase):

test/sasfit/test/utest_fit_line.py

@@ -6 +6 @@
 import math
 
-from sas.fit.AbstractFitEngine import Model, FitHandler
-from sas.dataloader.loader import Loader
-from sas.fit.BumpsFitting import BumpsFit as Fit
+from sas.sascalc.fit.AbstractFitEngine import Model, FitHandler
+from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
 from sas.models.LineModel import LineModel
 from sas.models.Constant import Constant

test/sasfit/test/utest_fit_smeared.py

@@ -7 +7 @@
 
 import numpy
-from sas.fit.AbstractFitEngine import Model
-from sas.fit.BumpsFitting import BumpsFit as Fit
-from sas.dataloader.loader import Loader
+from sas.sascalc.fit.AbstractFitEngine import Model
+from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
+from sas.sascalc.dataloader.loader import Loader
 from sas.models.qsmearing import smear_selection
 from sas.models.CylinderModel import CylinderModel

test/sasfit/test/utest_multiplicative_model.py

@@ -6 +6 @@
 import math
 
-from sas.dataloader.data_info import Data1D 
-from sas.fit.AbstractFitEngine import Model,FitData1D
-from sas.fit.BumpsFitting import BumpsFit as Fit
-from sas.dataloader.loader import Loader
+from sas.sascalc.dataloader.data_info import Data1D 
+from sas.sascalc.fit.AbstractFitEngine import Model,FitData1D
+from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
+from sas.sascalc.dataloader.loader import Loader
 from sas.models.MultiplicationModel import MultiplicationModel
 from sas.models.CylinderModel import CylinderModel

test/sasfit/test/utest_small_test.py

@@ -4 +4 @@
 import unittest
 import math
-from sas.fit.BumpsFitting import BumpsFit as Fit
-from sas.dataloader.loader import Loader
+from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
+from sas.sascalc.dataloader.loader import Loader
 import bumps.fitters
 bumps.fitters.FIT_DEFAULT = 'lm'