diff options
author | Eduardo Julian | 2019-06-20 22:32:59 -0400 |
---|---|---|
committer | Eduardo Julian | 2019-06-20 22:32:59 -0400 |
commit | b71b861008381626633bf28b033cd866d7e4e0b7 (patch) | |
tree | 3ee21cd21e6dd80f6fcdf90173bbd6162b616d8f /stdlib/source/test/lux/math/logic/fuzzy.lux | |
parent | fcee38da766a683ed5569978be153c6e7a8ae0af (diff) |
Improved the convention for using text formatters.
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/test/lux/math/logic/fuzzy.lux | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/stdlib/source/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux index 64051ffd9..3d21a1f21 100644 --- a/stdlib/source/test/lux/math/logic/fuzzy.lux +++ b/stdlib/source/test/lux/math/logic/fuzzy.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] [abstract/monad (#+ do)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] @@ -20,7 +20,7 @@ (template [<name> <desc> <hash> <gen> <triangle> <lt> <lte> <gt> <gte>] [(def: <name> Test - (<| (_.context (%name (name-of <triangle>))) + (<| (_.context (%.name (name-of <triangle>))) (do r.monad [values (r.set <hash> 3 <gen>) #let [[x y z] (case (set.to-list values) @@ -59,7 +59,7 @@ (template [<name> <desc> <hash> <gen> <trapezoid> <lt> <lte> <gt> <gte>] [(def: <name> Test - (<| (_.context (%name (name-of <trapezoid>))) + (<| (_.context (%.name (name-of <trapezoid>))) (do r.monad [values (r.set <hash> 4 <gen>) #let [[w x y z] (case (set.to-list values) @@ -116,24 +116,24 @@ right ..triangle sample r.rev] ($_ _.and - (_.test (%name (name-of /.union)) + (_.test (%.name (name-of /.union)) (let [combined (/.union left right) combined-membership (/.membership sample combined)] (and (r/>= (/.membership sample left) combined-membership) (r/>= (/.membership sample right) combined-membership)))) - (_.test (%name (name-of /.intersection)) + (_.test (%.name (name-of /.intersection)) (let [combined (/.intersection left right) combined-membership (/.membership sample combined)] (and (r/<= (/.membership sample left) combined-membership) (r/<= (/.membership sample right) combined-membership)))) - (_.test (%name (name-of /.complement)) + (_.test (%.name (name-of /.complement)) (r/= (/.membership sample left) (//.not (/.membership sample (/.complement left))))) - (_.test (%name (name-of /.difference)) + (_.test (%.name (name-of /.difference)) (r/<= (/.membership sample right) (/.membership sample (/.difference left right)))) )))) @@ -144,10 +144,10 @@ [#let [set-10 (set.from-list nat.hash (list.n/range 0 10))] sample (|> r.nat (:: @ map (n/% 20)))] ($_ _.and - (_.test (%name (name-of /.from-predicate)) + (_.test (%.name (name-of /.from-predicate)) (bit@= (r/= //.true (/.membership sample (/.from-predicate n/even?))) (n/even? sample))) - (_.test (%name (name-of /.from-set)) + (_.test (%.name (name-of /.from-set)) (bit@= (r/= //.true (/.membership sample (/.from-set set-10))) (set.member? set-10 sample))) ))) @@ -160,7 +160,7 @@ threshold r.rev #let [vip-fuzzy (/.cut threshold fuzzy) member? (/.to-predicate threshold fuzzy)]] - (<| (_.context (%name (name-of /.cut))) + (<| (_.context (%.name (name-of /.cut))) ($_ _.and (_.test "Can increase the threshold of membership of a fuzzy set." (bit@= (r/> //.false (/.membership sample vip-fuzzy)) @@ -172,7 +172,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ..rev-triangles ..rev-trapezoids |