From 157128a8c7fbdfc9219d8cace75418e270d4139c Mon Sep 17 00:00:00 2001 From: Chris Fournier Date: Fri, 5 Jul 2013 20:53:00 -0600 Subject: [PATCH] Corrected testes for Python 2.6. --- segeval/agreement/kappa_test.py | 2 +- segeval/agreement/pi_test.py | 2 +- segeval/similarity/boundary_test.py | 14 +++++++------- segeval/similarity/test.py | 2 +- segeval/similarity/weight_test.py | 7 ++++--- segeval/test.py | 4 ++-- segeval/window/pk_test.py | 8 ++++---- segeval/window/windowdiff_test.py | 10 +++++----- 8 files changed, 25 insertions(+), 24 deletions(-) diff --git a/segeval/agreement/kappa_test.py b/segeval/agreement/kappa_test.py index 623cc34..17d29da 100644 --- a/segeval/agreement/kappa_test.py +++ b/segeval/agreement/kappa_test.py @@ -84,7 +84,7 @@ def test_fleiss_kappa_complete(self): ''' data_complete = COMPLETE_AGREEMENT kappa = fleiss_kappa_linear(data_complete) - self.assertEqual(kappa, 1.0) + self.assertEqual(kappa, Decimal('1.0')) def test_exception_coders(self): ''' diff --git a/segeval/agreement/pi_test.py b/segeval/agreement/pi_test.py index 7b5f106..059f9d0 100644 --- a/segeval/agreement/pi_test.py +++ b/segeval/agreement/pi_test.py @@ -83,7 +83,7 @@ def test_fleiss_pi_complete(self): data_complete = COMPLETE_AGREEMENT pi = fleiss_pi_linear(data_complete) - self.assertEqual(pi, 1.0) + self.assertEqual(pi, Decimal('1')) def test_exception_coders(self): ''' diff --git a/segeval/similarity/boundary_test.py b/segeval/similarity/boundary_test.py index 6206311..e409282 100644 --- a/segeval/similarity/boundary_test.py +++ b/segeval/similarity/boundary_test.py @@ -25,7 +25,7 @@ def test_fn(self): Test false negative. ''' value = boundary_similarity([2, 3, 6], [5, 6]) - self.assertEqual(0.5, value) + self.assertEqual(Decimal('0.5'), value) def test_fp(self): ''' @@ -39,7 +39,7 @@ def test_near_miss(self): Test near miss. ''' value = boundary_similarity([2, 3, 6], [2, 2, 7]) - self.assertEqual(0.75, value) + self.assertEqual(Decimal('0.75'), value) def test_one_minus(self): ''' @@ -60,7 +60,7 @@ def test_clustered_fps(self): Test clustered fps. ''' value = boundary_similarity([2, 3, 6], [1, 1, 3, 1, 5]) - self.assertEqual(0.5, value) + self.assertEqual(Decimal('0.5'), value) def test_positions(self): ''' @@ -70,7 +70,7 @@ def test_positions(self): b = [1,1,1,1,2,2,2,2,3,3,3,3,3] value = boundary_similarity(a, b, boundary_format= BoundaryFormat.position) - self.assertEqual(0, value) + self.assertEqual(Decimal('0'), value) def test_format_exception(self): ''' @@ -104,9 +104,9 @@ def test_multiple_boundary_types(self): Test false negative. ''' value = summarize(boundary_similarity(MULTIPLE_BOUNDARY_TYPES)) - self.assertEqual((0.375, - 0.125, - 0.015625, + self.assertEqual((Decimal('0.375'), + Decimal('0.125'), + Decimal('0.015625'), Decimal('0.08838834764831844055010554528'), 2), value) diff --git a/segeval/similarity/test.py b/segeval/similarity/test.py index e94a33d..4c765fe 100644 --- a/segeval/similarity/test.py +++ b/segeval/similarity/test.py @@ -33,7 +33,7 @@ def test_boundary_confusion_matrix(self): self.assertEqual(cm[2][None], 0) self.assertEqual(cm[2][1], 1) self.assertEqual(cm[1][2], 0) - self.assertEqual(cm[1][1], 1.5) + self.assertEqual(cm[1][1], Decimal('1.5')) self.assertEqual(cm[2][2], 0) def test_boundary_statistics(self): diff --git a/segeval/similarity/weight_test.py b/segeval/similarity/weight_test.py index 5e0a193..b2cf3ce 100644 --- a/segeval/similarity/weight_test.py +++ b/segeval/similarity/weight_test.py @@ -4,6 +4,7 @@ .. moduleauthor:: Chris Fournier ''' import unittest +from decimal import Decimal from . import (weight_s_scale, weight_t_scale) @@ -20,7 +21,7 @@ def test_weight_t_scale(self): ''' transpositions = [[1,2], [1,3], [1,4]] weight = weight_t_scale(transpositions, 4) - self.assertEqual(weight, 1.5) + self.assertEqual(weight, Decimal('1.5')) def test_weight_s_scale(self): ''' @@ -29,6 +30,6 @@ def test_weight_s_scale(self): ''' substitutions = [[1,2], [1,3], [1,4]] weight = weight_s_scale(substitutions, 4) - self.assertEqual(weight, 1.5) + self.assertEqual(weight, Decimal('1.5')) weight = weight_s_scale(substitutions, 5, 2) - self.assertEqual(weight, 1.5) + self.assertEqual(weight, Decimal('1.5')) diff --git a/segeval/test.py b/segeval/test.py index b9336e6..860e8f2 100644 --- a/segeval/test.py +++ b/segeval/test.py @@ -196,5 +196,5 @@ def test_convert_masses_to_positions(self): Test convert_masses_to_positions. ''' - self.assertAlmostEquals((1,1,1,1,2,2), - convert_masses_to_positions((4,2))) + self.assertEquals((1,1,1,1,2,2), + convert_masses_to_positions((4,2))) diff --git a/segeval/window/pk_test.py b/segeval/window/pk_test.py index ea313b0..4abe4af 100644 --- a/segeval/window/pk_test.py +++ b/segeval/window/pk_test.py @@ -52,8 +52,8 @@ def test_identical(self): b = [1,1,1,1,1,2,2,2,3,3,3,3,3] one_minus_kwargs = dict(TestPk.kwargs) one_minus_kwargs['one_minus'] = True - self.assertEqual(pk(a, b, **self.kwargs), 0.0) - self.assertEqual(pk(a, b, **one_minus_kwargs), 1.0) + self.assertEqual(pk(a, b, **self.kwargs), Decimal('0.0')) + self.assertEqual(pk(a, b, **one_minus_kwargs), Decimal('1.0')) def test_no_boundaries(self): ''' @@ -87,8 +87,8 @@ def test_all_and_no_boundaries(self): a = [1,2,3,4,5,6,7,8,9,10,11,12,13] b = [1,1,1,1,1,1,1,1,1,1,1,1,1] - self.assertEqual(pk(a, b, **self.kwargs), 1.0) - self.assertEqual(pk(b, a, **self.kwargs), 1.0) + self.assertEqual(pk(a, b, **self.kwargs), Decimal('1.0')) + self.assertEqual(pk(b, a, **self.kwargs), Decimal('1.0')) def test_translated_boundary(self): ''' diff --git a/segeval/window/windowdiff_test.py b/segeval/window/windowdiff_test.py index 57f9761..fba1554 100644 --- a/segeval/window/windowdiff_test.py +++ b/segeval/window/windowdiff_test.py @@ -37,7 +37,7 @@ def test_identical(self): a = [1,1,1,1,1,2,2,2,3,3,3,3,3] b = [1,1,1,1,1,2,2,2,3,3,3,3,3] - self.assertEqual(window_diff(a, b, **self.kwargs), 0.0) + self.assertEqual(window_diff(a, b, **self.kwargs), Decimal('0.0')) def test_no_boundaries(self): ''' @@ -82,9 +82,9 @@ def test_translated_boundary(self): a = [1,1,1,1,1,2,2,2,3,3,3,3,3] b = [1,1,1,1,2,2,2,2,3,3,3,3,3] self.assertAlmostEqual(window_diff(a, b, **self.kwargs), # k = 2 - Decimal(2.0 / 11.0)) + Decimal('2.0') / Decimal('11.0')) self.assertAlmostEqual(window_diff(b, a, **self.kwargs), - Decimal(2.0 / 11.0)) + Decimal('2.0') / Decimal('11.0')) def test_extra_boundary(self): ''' @@ -94,9 +94,9 @@ def test_extra_boundary(self): a = [1,1,1,1,1,2,2,2,3,3,3,3,3] b = [1,1,1,1,1,2,3,3,4,4,4,4,4] self.assertAlmostEqual(window_diff(a, b, **self.kwargs), - Decimal(2.0 / 11.0)) + Decimal('2.0') / Decimal('11.0')) self.assertAlmostEqual(window_diff(b, a, **self.kwargs), - Decimal(2.0 / 11.0)) + Decimal('2.0') / Decimal('11.0')) def test_full_miss_and_misaligned(self): '''