Run update-copyright.py.

[hooke.git] / test / polymer_fit.py

diff --git a/test/polymer_fit.py b/test/polymer_fit.py
index fe5ccc76a26e09bb07c89ed84c7463de16713402..e7d34b8716c2e632859db4459e46839573f88276 100644 (file)
--- a/test/polymer_fit.py
+++ b/test/polymer_fit.py
@@ -1,20 +1,19 @@
-# Copyright (C) 2010 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2010-2012 W. Trevor King <wking@drexel.edu>
 #
 # This file is part of Hooke.
 #
-# Hooke is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Hooke is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
 #
-# Hooke is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
-# Public License for more details.
+# Hooke is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with Hooke.  If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with Hooke.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 >>> from hooke.hooke import Hooke, HookeRunner
@@ -28,8 +27,8 @@ Prepare a curve for polymer fitting.
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['zero_surface_contact_point --block retract']
-...     ) # doctest: +ELLIPSIS, +REPORT_UDIFF
-{'info':...'fitted parameters': [8.413...e-08, 2.812...e-10, 158.581...],...}
+...     ) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE, +REPORT_UDIFF
+{...'fitted parameters': [8.413...e-08, 2.812...e-10, 158.581...],...}
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['polynomial_flatten --block retract --deflection_column "surface deflection (m)" --degree 1'])
@@ -84,11 +83,11 @@ Data([[ NaN,  NaN],
        [ NaN,  NaN],
        [ NaN,  NaN]])
 >>> retract[1097:1103,-2:]  # doctest: +ELLIPSIS
-Data([[             NaN,   5.234...e-10],
-       [             NaN,   5.612...e-10],
-       [             NaN,   6.132...e-10],
-       [             NaN,   6.292...e-10],
-       [             NaN,   7.105...e-10],
+Data([[             NaN,   5.2...e-10],
+       [             NaN,   5...e-10],
+       [             NaN,   6.1...e-10],
+       [             NaN,   6.2...e-10],
+       [             NaN,   7...e-10],
        [             NaN,              NaN]])
 >>> retract[-5:,-2:]
 Data([[ NaN,  NaN],