diff options
| author | Masaya Tojo <masaya@tojo.tokyo> | 2021-01-23 05:41:50 +0900 |
|---|---|---|
| committer | Masaya Tojo <masaya@tojo.tokyo> | 2021-01-23 05:41:50 +0900 |
| commit | e282059796398716700102afd6fb2ee0945399e9 (patch) | |
| tree | d425b63974a3219c31c70be491374969700ef692 | |
| parent | 299c22af7dd6788f27685da93072792e9fdca91f (diff) | |
Rename from `filter-natp` to `filter-natp`.
| -rw-r--r-- | blackjack.lisp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/blackjack.lisp b/blackjack.lisp index 033966d..106330e 100644 --- a/blackjack.lisp +++ b/blackjack.lisp @@ -30,12 +30,12 @@ (rank-list-p (cdr x)))) (t (null x)))) -(defun filter/natp (x) +(defun filter-natp (x) (declare (xargs :guard (true-listp x))) (cond ((endp x) nil) ((natp (car x)) - (cons (car x) (filter/natp (cdr x)))) - (t (filter/natp (cdr x))))) + (cons (car x) (filter-natp (cdr x)))) + (t (filter-natp (cdr x))))) (defun nat-list-p (x) (declare (xargs :guard t)) @@ -69,7 +69,7 @@ (defun score-without-aces (rl) (declare (xargs :guard (rank-list-p rl))) - (+ (sum (filter/natp rl)) + (+ (sum (filter-natp rl)) (face-list-to-score (filter-facep rl)))) (defthm natp/score-without-aces @@ -106,7 +106,7 @@ (defthm natp/score*-1 (implies (rank-list-p rl) - (natp (+ (sum (filter/natp rl)) + (natp (+ (sum (filter-natp rl)) (* 10 (len (filter-facep rl))))))) (defthm natp/score* @@ -124,7 +124,7 @@ (defthm scorep/score-1 (implies (rank-list-p x) - (natp (+ (sum (filter/natp x)) + (natp (+ (sum (filter-natp x)) (* 10 (len (filter-facep x))))))) (defthm scorep/score |