refactored MeasureFormat enum

eli-b · Sep 30, 2022 · 7353600 · 7353600
1 parent 6830bd2
commit 7353600
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/static_frame/core/memory_measure.py b/static_frame/core/memory_measure.py
@@ -1,4 +1,3 @@
-import math
 import typing as tp
 from collections import abc
 from enum import Enum

diff --git a/static_frame/core/util.py b/static_frame/core/util.py
@@ -1,5 +1,6 @@
 import contextlib
 import datetime
+import math
 import operator
 import os
 import tempfile

diff --git a/static_frame/test/unit/test_memory_measure.py b/static_frame/test/unit/test_memory_measure.py
@@ -307,22 +307,22 @@ def test_measure_format_a(self) -> None:
         ma1 = MaterializedArray(a1, format=MeasureFormat.LOCAL_MATERIALIZED_DATA)
 
         self.assertEqual(getsizeof_total(mempty,
-                format=MeasureFormat.SHARED_MATERIALIZED_DATA),
+                format=MeasureFormat.REFERENCED_MATERIALIZED_DATA),
                 0)
         self.assertEqual(getsizeof_total(empty,
-                format=MeasureFormat.SHARED_MATERIALIZED_DATA),
+                format=MeasureFormat.REFERENCED_MATERIALIZED_DATA),
                 0)
 
         self.assertEqual(getsizeof_total(ma1,
-                format=MeasureFormat.SHARED_MATERIALIZED_DATA),
+                format=MeasureFormat.REFERENCED_MATERIALIZED_DATA),
                 a1.nbytes,
                 )
         self.assertEqual(getsizeof_total(a1,
-                format=MeasureFormat.SHARED_MATERIALIZED_DATA),
+                format=MeasureFormat.REFERENCED_MATERIALIZED_DATA),
                 a1.nbytes,
                 )
         self.assertEqual(getsizeof_total(a2,
-                format=MeasureFormat.SHARED_MATERIALIZED_DATA),
+                format=MeasureFormat.REFERENCED_MATERIALIZED_DATA),
                 a1.nbytes,
                 )
 
@@ -332,17 +332,17 @@ def test_measure_format_b(self) -> None:
         a2 = a1[:]
 
         self.assertEqual(getsizeof_total(empty,
-                format=MeasureFormat.SHARED_MATERIALIZED),
+                format=MeasureFormat.REFERENCED_MATERIALIZED),
                 getsizeof(None) + getsizeof(empty), # this is just the GC component
                 )
 
         self.assertEqual(getsizeof_total(a1,
-                format=MeasureFormat.SHARED_MATERIALIZED),
+                format=MeasureFormat.REFERENCED_MATERIALIZED),
                 getsizeof(None) + getsizeof(empty) + a1.nbytes,
                 )
 
         self.assertEqual(getsizeof_total(a2,
-                format=MeasureFormat.SHARED_MATERIALIZED),
+                format=MeasureFormat.REFERENCED_MATERIALIZED),
                 getsizeof(None) + getsizeof(empty) + a1.nbytes,
                 )
 
@@ -372,17 +372,17 @@ def test_measure_format_d(self) -> None:
         a2 = a1[:]
 
         self.assertEqual(getsizeof_total(empty,
-                format=MeasureFormat.SHARED),
+                format=MeasureFormat.REFERENCED),
                 getsizeof(empty),
                 )
 
         self.assertEqual(getsizeof_total(a1,
-                format=MeasureFormat.SHARED),
+                format=MeasureFormat.REFERENCED),
                 getsizeof(a1),
                 )
 
         self.assertEqual(getsizeof_total(a2,
-                format=MeasureFormat.SHARED),
+                format=MeasureFormat.REFERENCED),
                 getsizeof(a2) + getsizeof(a1),
                 )