Changeset 10273:8840ec08b246 in orange

Timestamp:

02/17/12 13:21:30 (15 months ago)

Author:

Miha Stajdohar <miha.stajdohar@…>

Branch:

default

Message:

Added support for unittest2 in python 2.6.

Location:

Orange

Files:

• misc/testing.py (modified) (2 diffs)
• testing/unit/tests/test_association.py (modified) (8 diffs)

Orange/misc/testing.py

@@ -72 +72 @@
 """
 from __future__ import absolute_import
-import unittest
+try:
+    import unittest2 as unittest
+except:
+    import unittest
 import os, sys
 from functools import wraps
@@ -503 +506 @@
         with member_set(self.distance_constructor, "ignore_class", True):
             mat = distance_matrix(dataset, self.distance_constructor)
-            
+
         self.assertIsInstance(mat, Orange.misc.SymMatrix)
         self.assertEqual(mat.dim, len(dataset))
-        
+
         m = numpy.array(list(mat))
         self.assertTrue((m >= 0.0).all())

Orange/testing/unit/tests/test_association.py

@@ -3 +3 @@
 from Orange.misc import testing
 from Orange.misc.testing import test_on_data, datasets_driven
-import unittest
+try:
+    import unittest2 as unittest
+except:
+    import unittest
 import pickle
 
@@ -12 +15 @@
     if self.inducer.store_examples and rules:
         self.assertIsNotNone(rules[0].examples)
-        
+
     self.assertLessEqual(len(rules), self.inducer.max_item_sets)
     for r in rules:
@@ -24 +27 @@
         self.assertAlmostEqual(r.lift, r.n_examples * r.n_applies_both / (r.n_applies_left * r.n_applies_right), places=3)
 #        self.assertAlmostEqual(r.leverage, (r.n_examples * r.n_applies_both - r.n_applies_left * r.n_applies_right) / 100.0)
-    
+
     itemsets = self.inducer.get_itemsets(table)
     self.rules = rules
@@ -37 +40 @@
         self.assertEqual(r1.support, r2.support)
         self.assertEqual(r2.support, r3.support)
-        
+
         self.assertEqual(r1.confidence, r2.confidence)
         self.assertEqual(r2.confidence, r3.confidence)
-        
+
         self.assertEqual(r1.coverage, r2.coverage)
         self.assertEqual(r2.coverage, r3.coverage)
-        
+
         self.assertEqual(r1.strength, r2.strength)
         self.assertEqual(r2.strength, r3.strength)
-        
+
         for inst in table:
             self.assertEqual(r1.applies_left(inst), r2.applies_left(inst))
             self.assertEqual(r2.applies_left(inst), r3.applies_left(inst))
-            
+
             self.assertEqual(r1.applies_right(inst), r2.applies_right(inst))
             self.assertEqual(r2.applies_right(inst), r3.applies_right(inst))
-            
+
             self.assertEqual(r1.applies_both(inst), r2.applies_both(inst))
             self.assertEqual(r2.applies_both(inst), r3.applies_both(inst))
-            
-            
+
+
 @datasets_driven(datasets=["inquisition.basket"])
 class TestSparseInducer(unittest.TestCase):
@@ -63 +66 @@
         self.inducer = associate.AssociationRulesSparseInducer(support=0.5,
                                 store_examples=True, max_item_sets=2000)
-        
+
     @test_on_data
     def test_inducer_on(self, table):
@@ -72 +75 @@
     def test_pickling_on(self, table):
         test_pickling_on(self, table)
-                
+
 
 @datasets_driven(datasets=["lenses", "monks-1"])
@@ -80 +83 @@
                             confidence=0.5, store_examples=True,
                             max_item_sets=2000)
-        
+
     @test_on_data
     def test_inducer_on(self, table):
         test_inducer_on(self, table)
-        
+
     @test_on_data
     def test_pickling_on(self, table):
         test_pickling_on(self, table)
-        
-        
+
+
 @datasets_driven(datasets=["lenses", "monks-1"])
 class TestInducerClassification(unittest.TestCase):
@@ -97 +100 @@
                             max_item_sets=2000,
                             classification_rules=True)
-        
+
     @test_on_data
     def test_inducer_on(self, table):
         test_inducer_on(self, table)
-        
+
     @test_on_data
     def test_pickling_on(self, table):
         test_pickling_on(self, table)
-        
+
 
 if __name__ is "__main__":
     unittest.main()
 
-    
+