Skip to content

Commit 1a185a6

Browse files
committed
getResidualEquation deprecation
1 parent ca4e85c commit 1a185a6

2 files changed

Lines changed: 25 additions & 6 deletions

File tree

src/diffpy/srfit/fitbase/fitcontribution.py

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@
7070
removal_version,
7171
)
7272

73+
getresidualequation_dep_msg = build_deprecation_message(
74+
base,
75+
"getResidualEquation",
76+
"get_residual_equation",
77+
removal_version,
78+
)
79+
7380

7481
class FitContribution(ParameterSet):
7582
"""FitContribution class.
@@ -397,7 +404,7 @@ def setResidualEquation(self, eqstr):
397404
self.set_residual_equation(eqstr)
398405
return
399406

400-
def getResidualEquation(self):
407+
def get_residual_equation(self):
401408
"""Get math expression string for the active residual equation.
402409
403410
Return normalized math formula or an empty string if residual
@@ -410,6 +417,18 @@ def getResidualEquation(self):
410417
rv = getExpression(self._reseq, eqskip="eq$")
411418
return rv
412419

420+
@deprecated(getresidualequation_dep_msg)
421+
def getResidualEquation(self):
422+
"""This function has been deprecated and will be removed in version
423+
4.0.0.
424+
425+
Please use
426+
diffpy.srfit.fitbase.FitContribution.get_residual_equation
427+
instead.
428+
"""
429+
430+
return self.get_residual_equation()
431+
413432
def residual(self):
414433
"""Calculate the residual for this fitcontribution.
415434

tests/test_contribution.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,23 +158,23 @@ def testReplacements(self):
158158
def test_get_residual_equation(self):
159159
"""Check getting the current formula for residual equation."""
160160
fc = self.fitcontribution
161-
self.assertEqual("", fc.getResidualEquation())
161+
self.assertEqual("", fc.get_residual_equation())
162162
fc.set_profile(self.profile)
163163
fc.set_equation("A * x + B")
164-
self.assertEqual("((eq - y) / dy)", fc.getResidualEquation())
164+
self.assertEqual("((eq - y) / dy)", fc.get_residual_equation())
165165
fc.set_residual_equation("2 * (eq - y)")
166-
self.assertEqual("(2 * (eq - y))", fc.getResidualEquation())
166+
self.assertEqual("(2 * (eq - y))", fc.get_residual_equation())
167167
return
168168

169169
def test_getResidualEquation(self):
170170
"""Check getting the current formula for residual equation."""
171171
fc = self.fitcontribution
172-
self.assertEqual("", fc.getResidualEquation())
172+
self.assertEqual("", fc.get_residual_equation())
173173
fc.set_profile(self.profile)
174174
fc.set_equation("A * x + B")
175175
self.assertEqual("((eq - y) / dy)", fc.getResidualEquation())
176176
fc.setResidualEquation("2 * (eq - y)")
177-
self.assertEqual("(2 * (eq - y))", fc.getResidualEquation())
177+
self.assertEqual("(2 * (eq - y))", fc.get_residual_equation())
178178
return
179179

180180
def test_releaseOldEquations(self):

0 commit comments

Comments
 (0)