Improved logging

lucasimi · lucasimi · commit 80f0944df564 · 2024-10-22T23:03:29.000+02:00
diff --git a/tests/setup_logging.py b/tests/setup_logging.py
@@ -0,0 +1,10 @@
+import logging
+
+
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s %(module)s %(levelname)s: %(message)s',
+    handlers=[
+        logging.StreamHandler()  # Logs to console
+    ]
+)
diff --git a/tests/test_bench_cover.py b/tests/test_bench_cover.py
@@ -1,4 +1,5 @@
 import unittest
+import logging
 import time
 
 import numpy as np
@@ -9,6 +10,7 @@
 from tdamapper.utils.vptree_flat import VPTree as FVPT
 
 from tests.ball_tree import SkBallTree
+import tests.setup_logging
 
 
 dist = euclidean()
@@ -21,57 +23,59 @@ def dataset(dim=10, num=1000):
     return [np.random.rand(dim) for _ in range(num)]
 
 
-def cover(vpt, X, r):
-    covered_ids = set()
-    for i, xi in enumerate(X):
-        if i not in covered_ids:
-            neigh = vpt.ball_search(xi, r)
-            neigh_ids = [int(x[0]) for x in neigh]
-            covered_ids.update(neigh_ids)
-            if neigh_ids:
-                yield neigh_ids
-
-
-def run(X, r, dist, vp, **kwargs):
-    XX = np.array([[i] + [xi for xi in x] for i, x in enumerate(X)])
-    d = lambda x, y: dist(x[1:], y[1:])
-    t0 = time.time()
-    vpt = vp(XX, metric=d, **kwargs)
-    list(cover(vpt, XX, r))
-    t1 = time.time()
-    print(f'time: {t1 - t0}')
-
-
 class TestVpSettings(unittest.TestCase):
 
+    logger = logging.getLogger(__name__)
+
+    def cover(self, vpt, X, r):
+        covered_ids = set()
+        for i, xi in enumerate(X):
+            if i not in covered_ids:
+                neigh = vpt.ball_search(xi, r)
+                neigh_ids = [int(x[0]) for x in neigh]
+                covered_ids.update(neigh_ids)
+                if neigh_ids:
+                    yield neigh_ids
+
+    def run_bench(self, X, r, dist, vp, **kwargs):
+        XX = np.array([[i] + [xi for xi in x] for i, x in enumerate(X)])
+        d = lambda x, y: dist(x[1:], y[1:])
+        t0 = time.time()
+        vpt = vp(XX, metric=d, **kwargs)
+        list(self.cover(vpt, XX, r))
+        t1 = time.time()
+        self.logger.info(f'time: {t1 - t0}')
+
     def test_cover_random(self):
         for r in [1.0, 10.0, 100.0]:
             for n in [100, 1000, 10000]:
-                print(f'============= n: {n}, r: {r} =============')
+                self.logger.info(f'============ Cover Bench Random ==========')
+                self.logger.info(f'[n: {n}, r: {r}]')
                 X = dataset(num=n)
-                print('>>>>>>> HVPT >>>>>>')
-                run(X, r, dist, HVPT, leaf_radius=r, pivoting='random')
-                run(X, r, dist, HVPT, leaf_radius=r, pivoting='furthest')
-                print('>>>>>>> FVPT >>>>>>')
-                run(X, r, dist, FVPT, leaf_radius=r, pivoting='random')
-                run(X, r, dist, FVPT, leaf_radius=r, pivoting='furthest')
-                print('>>>>>> SKBT >>>>>>')
-                run(X, r, dist, SkBallTree)
-                run(X, r, dist, SkBallTree, leaf_radius=r)
-                print('')
+                self.logger.info('>>>>>>> HVPT >>>>>>')
+                self.run_bench(X, r, dist, HVPT, leaf_radius=r, pivoting='random')
+                self.run_bench(X, r, dist, HVPT, leaf_radius=r, pivoting='furthest')
+                self.logger.info('>>>>>>> FVPT >>>>>>')
+                self.run_bench(X, r, dist, FVPT, leaf_radius=r, pivoting='random')
+                self.run_bench(X, r, dist, FVPT, leaf_radius=r, pivoting='furthest')
+                self.logger.info('>>>>>> SKBT >>>>>>')
+                self.run_bench(X, r, dist, SkBallTree)
+                self.run_bench(X, r, dist, SkBallTree, leaf_radius=r)
+                self.logger.info('')
 
     def test_cover_digits(self):
         X, _ = load_digits(return_X_y=True)
         #X = PCA(n_components=3).fit_transform(X)
         for r in [1.0, 10.0, 100.0]:
-            print(f'============= r: {r} =============')
-            print('>>>>>>> HVPT >>>>>>')
-            run(X, r, dist, HVPT, leaf_radius=r, pivoting='random')
-            run(X, r, dist, HVPT, leaf_radius=r, pivoting='furthest')
-            print('>>>>>>> FVPT >>>>>>')
-            run(X, r, dist, FVPT, leaf_radius=r, pivoting='random')
-            run(X, r, dist, FVPT, leaf_radius=r, pivoting='furthest')
-            print('>>>>>> SKBT >>>>>>')
-            run(X, r, dist, SkBallTree)
-            run(X, r, dist, SkBallTree, leaf_radius=r)
-            print('')
+            self.logger.info(f'======= Cover Bench Digits =======')
+            self.logger.info(f'[r: {r}]')
+            self.logger.info('>>>>>>> HVPT >>>>>>')
+            self.run_bench(X, r, dist, HVPT, leaf_radius=r, pivoting='random')
+            self.run_bench(X, r, dist, HVPT, leaf_radius=r, pivoting='furthest')
+            self.logger.info('>>>>>>> FVPT >>>>>>')
+            self.run_bench(X, r, dist, FVPT, leaf_radius=r, pivoting='random')
+            self.run_bench(X, r, dist, FVPT, leaf_radius=r, pivoting='furthest')
+            self.logger.info('>>>>>> SKBT >>>>>>')
+            self.run_bench(X, r, dist, SkBallTree)
+            self.run_bench(X, r, dist, SkBallTree, leaf_radius=r)
+            self.logger.info('')
diff --git a/tests/test_bench_metrics.py b/tests/test_bench_metrics.py
@@ -1,4 +1,5 @@
 import unittest
+import logging
 import timeit
 
 import pandas as pd
@@ -8,6 +9,8 @@
 
 import tdamapper.utils.metrics as metrics
 
+import tests.setup_logging
+
 
 @numba.njit(fastmath=True)
 def euclidean_numpy(a, b):
@@ -106,7 +109,9 @@ def run_bench(X):
 
 class TestBenchMetrics(unittest.TestCase):
 
+    logger = logging.getLogger(__name__)
+
     def test_bench(self):
         X = np.random.rand(1000, 1000)
         df_bench = run_bench(X)
-        print(df_bench)
+        self.logger.info(df_bench)
diff --git a/tests/test_bench_vptree.py b/tests/test_bench_vptree.py
@@ -10,6 +10,7 @@
 from tdamapper.utils.vptree_flat import VPTree as FVPT
 
 from tests.ball_tree import SkBallTree
+import tests.setup_logging
 
 
 dist = euclidean()
@@ -30,11 +31,6 @@ class TestBenchmark(unittest.TestCase):
 
     logger = logging.getLogger(__name__)
 
-    logging.basicConfig(
-        format = '%(asctime)s %(module)s %(levelname)s: %(message)s',
-        datefmt = '%m/%d/%Y %I:%M:%S %p',
-        level = logging.INFO)
-
     def test_bench(self):
         self.logger.info('==== Dataset random =============')
         self._test_compare(dataset())
