Skip to content

Commit

Permalink
ISSUE 96: (in liebke's branch) The clojure compiler was confusing the
Browse files Browse the repository at this point in the history
'filter' parameter with the clojure.core filter fn. I simply renamed the
argument to 'filter-fn' and updated the code using it.
  • Loading branch information
Mark Swanson authored and Mark Swanson committed Nov 5, 2012
1 parent 1a2f7a4 commit 76dbaaa
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions modules/incanter-core/src/incanter/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@


(defmethod sel [incanter.Matrix true]
([^Matrix mat & {:keys [rows cols except-rows except-cols filter]}]
([^Matrix mat & {:keys [rows cols except-rows except-cols filter-fn]}]
(let [rows (cond
rows rows
except-rows (except-for (.rows mat) except-rows)
Expand All @@ -292,7 +292,7 @@
cols cols
except-cols (except-for (.columns mat) except-cols)
:else true)
^Matrix mat (if (nil? filter) mat (matrix (filter filter mat)))
^Matrix mat (if (nil? filter-fn) mat (matrix (filter filter-fn mat)))
all-rows? (or (true? rows) (= rows :all))
all-cols? (or (true? cols) (= cols :all))]
(cond
Expand Down

0 comments on commit 76dbaaa

Please sign in to comment.