diff options
| author | Picca Frédéric-Emmanuel <picca@debian.org> | 2018-03-04 10:20:27 +0100 |
|---|---|---|
| committer | Picca Frédéric-Emmanuel <picca@debian.org> | 2018-03-04 10:20:27 +0100 |
| commit | 270d5ddc31c26b62379e3caa9044dd75ccc71847 (patch) | |
| tree | 55c5bfc851dfce7172d335cd2405b214323e3caf /silx/math/fit | |
| parent | e19c96eff0c310c06c4f268c8b80cb33bd08996f (diff) | |
New upstream version 0.7.0+dfsg
Diffstat (limited to 'silx/math/fit')
| -rw-r--r-- | silx/math/fit/fitmanager.py | 12 | ||||
| -rw-r--r-- | silx/math/fit/test/test_fit.py | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/silx/math/fit/fitmanager.py b/silx/math/fit/fitmanager.py index 4a12a24..f62dedb 100644 --- a/silx/math/fit/fitmanager.py +++ b/silx/math/fit/fitmanager.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*######################################################################### # -# Copyright (c) 2004-2017 European Synchrotron Radiation Facility +# Copyright (c) 2004-2018 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -240,15 +240,15 @@ class FitManager(object): If this parameter is provided, all other parameters, except for ``name``, are ignored. :type theory: :class:`silx.math.fit.fittheory.FitTheory` - :param function function: Mandatory argument if ``theory`` is not provided. + :param callable function: Mandatory argument if ``theory`` is not provided. See documentation for :attr:`silx.math.fit.fittheory.FitTheory.function`. - :param list[str] parameters: Mandatory argument if ``theory`` is not provided. + :param List[str] parameters: Mandatory argument if ``theory`` is not provided. See documentation for :attr:`silx.math.fit.fittheory.FitTheory.parameters`. - :param function estimate: See documentation for + :param callable estimate: See documentation for :attr:`silx.math.fit.fittheory.FitTheory.estimate` - :param function configure: See documentation for + :param callable configure: See documentation for :attr:`silx.math.fit.fittheory.FitTheory.configure` - :param function derivative: See documentation for + :param callable derivative: See documentation for :attr:`silx.math.fit.fittheory.FitTheory.derivative` :param str description: See documentation for :attr:`silx.math.fit.fittheory.FitTheory.description` diff --git a/silx/math/fit/test/test_fit.py b/silx/math/fit/test/test_fit.py index 11b53cd..372d6cb 100644 --- a/silx/math/fit/test/test_fit.py +++ b/silx/math/fit/test/test_fit.py @@ -30,7 +30,7 @@ import unittest import numpy import sys -from silx.test import utils +from silx.utils import testutils from silx.math.fit.leastsq import _logger as fitlogger @@ -241,7 +241,7 @@ class Test_leastsq(unittest.TestCase): fittedpar[i]) self.assertTrue(test_condition, msg) - @utils.test_logging(fitlogger.name, warning=2) + @testutils.test_logging(fitlogger.name, warning=2) def testBadlyShapedData(self): parameters_actual = [10.5, 2, 1000.0, 20., 15] x = numpy.arange(10000.).reshape(1000, 10) @@ -263,7 +263,7 @@ class Test_leastsq(unittest.TestCase): fittedpar[i]) self.assertTrue(test_condition, msg) - @utils.test_logging(fitlogger.name, warning=3) + @testutils.test_logging(fitlogger.name, warning=3) def testDataWithNaN(self): parameters_actual = [10.5, 2, 1000.0, 20., 15] x = numpy.arange(10000.).reshape(1000, 10) |