Fix style issues brought up in review.
This commit is contained in:
parent
573294ba75
commit
2be8d2cd5e
@ -90,14 +90,14 @@
|
|||||||
(take 5 inputs)
|
(take 5 inputs)
|
||||||
(u/table-lookup inputs pronouns-table))))
|
(u/table-lookup inputs pronouns-table))))
|
||||||
|
|
||||||
(defn make-link [pair]
|
(defn make-link [abbrev row]
|
||||||
(let [link (str "/" (s/join "/" (second pair)))
|
(let [link (str "/" (s/join "/" row))
|
||||||
label (str (s/join "/" (first pair)))]
|
label (s/join "/" abbrev)]
|
||||||
[:li [:a {:href link} label]]))
|
[:li [:a {:href link} label]]))
|
||||||
|
|
||||||
(defn front [pronouns-table]
|
(defn front [pronouns-table]
|
||||||
(let [abbreviations (u/abbreviate (sort pronouns-table))
|
(let [abbreviations (u/abbreviate (sort pronouns-table))
|
||||||
links (map make-link abbreviations)
|
links (map (fn [entry] (make-link (first entry) (second entry))) abbreviations)
|
||||||
title "Pronoun Island"]
|
title "Pronoun Island"]
|
||||||
(html
|
(html
|
||||||
[:html
|
[:html
|
||||||
|
@ -15,10 +15,10 @@
|
|||||||
[query-key tabfile]
|
[query-key tabfile]
|
||||||
(table-lookup query-key (slurp-tabfile tabfile)))
|
(table-lookup query-key (slurp-tabfile tabfile)))
|
||||||
|
|
||||||
; given a row and its lexically-closest neighbors,
|
|
||||||
; determine the smallest abbreviation which is still
|
|
||||||
; distinct.
|
|
||||||
(defn disambiguate
|
(defn disambiguate
|
||||||
|
"given a row and its lexically-closest neighbors,
|
||||||
|
determine the smallest abbreviation which is still
|
||||||
|
distinct."
|
||||||
[prev row next]
|
[prev row next]
|
||||||
(loop [n 1]
|
(loop [n 1]
|
||||||
(let [row-n (take n row)]
|
(let [row-n (take n row)]
|
||||||
@ -28,10 +28,10 @@
|
|||||||
(= row-n (take n next)) (recur (+ n 1))
|
(= row-n (take n next)) (recur (+ n 1))
|
||||||
:else row-n))))
|
:else row-n))))
|
||||||
|
|
||||||
; given a list of pronoun rows, return a list of
|
|
||||||
; pairs, where the first item is the abbreviation
|
|
||||||
; and the second is the original pronoun row.
|
|
||||||
(defn abbreviate
|
(defn abbreviate
|
||||||
|
"given a list of pronoun rows, return a list of
|
||||||
|
pairs, where the first item is the abbreviation
|
||||||
|
and the second is the original pronoun row."
|
||||||
[sorted-table]
|
[sorted-table]
|
||||||
(loop [acc nil
|
(loop [acc nil
|
||||||
prev nil
|
prev nil
|
||||||
|
Loading…
Reference in New Issue
Block a user