From 5b33653dcfe4c482f8099d74286b2f320f01e1a9 Mon Sep 17 00:00:00 2001 From: XANTRONIX Industrial Date: Sun, 9 Mar 2025 13:16:25 -0400 Subject: [PATCH] Move cmp() to SeriesIntersection --- lib/xmet/series.py | 14 +++++++++++--- lib/xmet/skew_t.py | 1 - lib/xmet/util.py | 8 -------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/xmet/series.py b/lib/xmet/series.py index b8c8a9c..48cc8ec 100644 --- a/lib/xmet/series.py +++ b/lib/xmet/series.py @@ -1,7 +1,6 @@ import enum from typing import Self -from xmet.util import cmp from xmet.list import nearest class SeriesIntersection(enum.Enum): @@ -9,6 +8,15 @@ class SeriesIntersection(enum.Enum): EQUAL = 0 LESSER = 1 + @staticmethod + def cmp(a, b) -> Self: + if a > b: + return SeriesIntersection.GREATER + elif a == b: + return SeriesIntersection.EQUAL + elif a < b: + return SeriesIntersection.LESSER + class Series(dict): def __init__(self): super().__init__() @@ -24,7 +32,7 @@ class Series(dict): if pair[0] > start: continue - sign = cmp(v1, v2) + sign = SeriesIntersection.cmp(v1, v2) - if sign == intersection.value: + if sign is intersection: return v1, pair[0] diff --git a/lib/xmet/skew_t.py b/lib/xmet/skew_t.py index 9045e4e..98fc1f4 100644 --- a/lib/xmet/skew_t.py +++ b/lib/xmet/skew_t.py @@ -5,7 +5,6 @@ from typing import Callable from itertools import product from xmet.list import nearest -from xmet.util import cmp from xmet.sounding import Sounding, SoundingSample from xmet.thermo import pressure_height, loft_parcel, moist_lapse_rate, \ LAPSE_RATE_DRY, PRESSURE_MAX, PRESSURE_MIN, \ diff --git a/lib/xmet/util.py b/lib/xmet/util.py index d16372a..f6ccf12 100644 --- a/lib/xmet/util.py +++ b/lib/xmet/util.py @@ -29,11 +29,3 @@ def each_chunk(fh: io.TextIOBase, sep: str, strip=None): if ret != '': yield ret - -def cmp(a, b): - if a == b: - return 0 - elif a > b: - return -1 - elif a < b: - return 1