Commit a2c7366

committed

refactor and cleanup

1 parent cbef21c commit a2c7366Copy full SHA for a2c7366

File tree

2 files changed

+16

-14

lines changed

src/fuzzylogic
- functions.py
tests
- test_units.py

2 files changed

+16

-14

lines changed

`‎src/fuzzylogic/functions.py‎`

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@`
`39`	`39`
`40`	`40`
`41`	`41`	`try:`
`42`		`- # from numba import njit # still not ready for prime time :(`
	`42`	`+ from numba import njit as njit # ready for prime time?`
	`43`	`+`
`43`	`44`	`raise ImportError`
`44`	`45`
`45`	`46`	`except ImportError:`
`@@ -48,6 +49,8 @@ def njit(func: Membership) -> Membership:`
`48`	`49`	`return func`
`49`	`50`
`50`	`51`
	`52`	`+LOW_HIGH = "low must be less than high"`
	`53`	`+`
`51`	`54`	`#####################`
`52`	`55`	`# SPECIAL FUNCTIONS #`
`53`	`56`	`#####################`
`@@ -111,7 +114,6 @@ def alpha(`
`111`	`114`
`112`	`115`	`floor_clip = floor if floor_clip is None else floor_clip`
`113`	`116`	`ceiling_clip = ceiling if ceiling_clip is None else ceiling_clip`
`114`		`- # assert 0 <= floor_clip <= ceiling_clip <= 1, "%s <= %s"%(floor_clip, ceiling_clip)`
`115`	`117`
`116`	`118`	`def f(x: float) -> float:`
`117`	`119`	`m = func(x)`
`@@ -254,7 +256,7 @@ def bounded_linear(`
`254`	`256`	`>>> f(4)`
`255`	`257`	`1.0`
`256`	`258`	`"""`
`257`		`- assert low < high, "low must be less than high"`
	`259`	`+ assert low < high, LOW_HIGH`
`258`	`260`	`assert c_m > no_m, "core_m must be greater than unsupported_m"`
`259`	`261`
`260`	`262`	`if inverse:`
`@@ -414,7 +416,7 @@ def sigmoid(L: float, k: float, x0: float = 0) -> Membership:`
`414`	`416`
`415`	`417`	`def f(x: float) -> float:`
`416`	`418`	`if isnan(k * x):`
`417`		`- # e^(0*inf) = 1`
	`419`	`+ # e^(0*inf) == 1`
`418`	`420`	`o = 1.0`
`419`	`421`	`else:`
`420`	`422`	`try:`
`@@ -464,7 +466,7 @@ def bounded_sigmoid(low: float, high: float, inverse: bool = False) -> Membershi`
`464`	`466`	`>>> round(f(-100000), 2)`
`465`	`467`	`0.0`
`466`	`468`	`"""`
`467`		`- assert low < high, "low must be less than high"`
	`469`	`+ assert low < high, LOW_HIGH`
`468`	`470`
`469`	`471`	`if inverse:`
`470`	`472`	`low, high = high, low`
`@@ -489,7 +491,7 @@ def f(x: float) -> float:`
`489`	`491`	`except OverflowError:`
`490`	`492`	`q = float("inf")`
`491`	`493`
`492`		`- # e^(inf)*e^(-inf) = 1`
	`494`	`+ # e^(inf)*e^(-inf) == 1`
`493`	`495`	`r = p * q`
`494`	`496`	`if isnan(r):`
`495`	`497`	`r = 1`
`@@ -560,7 +562,7 @@ def triangular_sigmoid(low: float, high: float, c: float \| None = None) -> Membe`
`560`	`562`	`>>> round(g(3), 2)`
`561`	`563`	`0.9`
`562`	`564`	`"""`
`563`		`- assert low < high, "low must be less than high"`
	`565`	`+ assert low < high, LOW_HIGH`
`564`	`566`	`c = c if c is not None else (low + high) / 2.0`
`565`	`567`	`assert low < c < high, "c must be inbetween"`
`566`	`568`

`‎tests/test_units.py‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`common_settings = settings(deadline=None, suppress_health_check=cast(list[HealthCheck], list(HealthCheck)))`
`19`	`19`
`20`	`20`
`21`		`-class Test_Functions(TestCase):`
	`21`	`+class TestFunctions(TestCase):`
`22`	`22`	`@common_settings`
`23`	`23`	`@given(st.floats(allow_nan=False))`
`24`	`24`	`def test_noop(self, x: float) -> None:`
`@@ -250,7 +250,7 @@ def test_bounded_exponential(self, k: float, limit: float, x: float) -> None:`
`250`	`250`	`assert 0 <= f(x) <= limit`
`251`	`251`
`252`	`252`
`253`		`-class Test_Hedges(TestCase):`
	`253`	`+class TestHedges(TestCase):`
`254`	`254`	`@common_settings`
`255`	`255`	`@given(st.floats(min_value=0, max_value=1))`
`256`	`256`	`def test_very(self, x: float) -> None:`
`@@ -273,7 +273,7 @@ def test_plus(self, x: float) -> None:`
`273`	`273`	`assert 0 <= f(x) <= 1`
`274`	`274`
`275`	`275`
`276`		`-class Test_Combinators(TestCase):`
	`276`	`+class TestCombinators(TestCase):`
`277`	`277`	`@common_settings`
`278`	`278`	`@given(st.floats(min_value=0, max_value=1))`
`279`	`279`	`def test_MIN(self, x: float) -> None:`
`@@ -381,7 +381,7 @@ def test_simple_disjoint_sum(self, x: float) -> None:`
`381`	`381`	`assert 0 <= f(x) <= 1`
`382`	`382`
`383`	`383`
`384`		`-class Test_Domain(TestCase):`
	`384`	`+class TestDomain(TestCase):`
`385`	`385`	`def test_basics(self) -> None:`
`386`	`386`	`D = Domain("d", 0, 10)`
`387`	`387`	`assert D._name == "d" # type: ignore`
`@@ -399,7 +399,7 @@ def test_basics(self) -> None:`
`399`	`399`	`# assert d == D`
`400`	`400`
`401`	`401`
`402`		`-class Test_Set(TestCase):`
	`402`	`+class TestSet(TestCase):`
`403`	`403`	`@common_settings`
`404`	`404`	`@given(`
`405`	`405`	`st.floats(allow_nan=False, allow_infinity=False),`
`@@ -441,7 +441,7 @@ def test_complement(self) -> None:`
`441`	`441`	`assert all(np.isclose(D.s1.array(), D.s2.array()))`
`442`	`442`
`443`	`443`
`444`		`-class Test_Rules(TestCase):`
	`444`	`+class TestRules(TestCase):`
`445`	`445`	`@common_settings`
`446`	`446`	`@given(`
`447`	`447`	`st.floats(min_value=0, max_value=1),`
`@@ -462,7 +462,7 @@ def round_partial(self, x: float, res: float) -> None:`
`462`	`462`	`assert isclose(x, ru.round_partial(x, res))`
`463`	`463`
`464`	`464`
`465`		`-class Test_Truth(TestCase):`
	`465`	`+class TestTruth(TestCase):`
`466`	`466`	`@common_settings`
`467`	`467`	`@given(st.floats(min_value=0, max_value=1))`
`468`	`468`	`def test_true_and_false(self, m: float) -> None:`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a2c7366

File tree

2 files changed

2 files changed

`‎src/fuzzylogic/functions.py‎`

`‎tests/test_units.py‎`

0 commit comments