mbk/matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add human-readable indices (starting at 1)

Browse source
This commit is contained in:
mehbark 2023-01-15 20:31:36 -05:00
parent 3b998c060b
commit b414870e70
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/matrix/auto.clj
View file

@ -68,7 +68,6 @@
[] []
(let [steps (back-sub-column m col) (let [steps (back-sub-column m col)
new (apply-all-at-once m steps)] new (apply-all-at-once m steps)]
(println new)
(concat steps (back-sub new (dec col))))))) (concat steps (back-sub new (dec col)))))))
(defn auto-steps-and-final (defn auto-steps-and-final

2
src/matrix/core.clj
View file

@ -13,7 +13,7 @@
(println "Steps:") (println "Steps:")
;; (for [step steps] ;; (for [step steps]
;; (println (pretty-row-op step))) ;; (println (pretty-row-op step)))
(println (str/join "\n" (map pretty-row-op steps))) (println (str/join "\n" (map with-inc-row-indices steps)))
(println "Final:") (println "Final:")
(pprint-matrix final))) (pprint-matrix final)))

16
src/matrix/render.clj
View file

@ -169,11 +169,25 @@
" + " " + "
"R" (shrink-number (:to-row op))))) "R" (shrink-number (:to-row op)))))
(defn with-inc-row-indices
"Prettify a row-op with human-readable-indices"
[op]
(if-let [[op-type inner] (conform op)]
(case op-type
:swap (pretty-swap (-> inner
(update :swap + 1)
(update :with + 1)))
:add (pretty-add (-> inner
(update :add-row + 1)
(update :to-row + 1)))
:mul (pretty-mul (update inner :mul-row + 1)))))
(defn pretty-row-op (defn pretty-row-op
"Returns a pretty string of a row operation" "Returns a pretty string of a row operation"
[op] ([op]
(if-let [[op-type inner] (conform op)] (if-let [[op-type inner] (conform op)]
(case op-type (case op-type
:swap (pretty-swap inner) :swap (pretty-swap inner)
:mul (pretty-mul inner) :mul (pretty-mul inner)
:add (pretty-add inner)))) :add (pretty-add inner))))
([op _] (with-inc-row-indices op)))