pre 7.030

scicloj · Sep 3, 2024 · e89662f · e89662f
2 parents ab369f5 + 632e8bc
commit e89662f
Show file tree

Hide file tree

Showing 13 changed files with 40,311 additions and 829 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,6 @@ pom.xml.asc
 *.txt*
 .lsp/
 .clj-kondo/
-.clay.html
 *.qmd
 .quarto
+.clay*
diff --git a/deps.edn b/deps.edn
@@ -1,9 +1,9 @@
 {:extra-paths ["data"]
  :deps {org.clojure/clojure              {:mvn/version "1.11.1"}
         techascent/tech.ml.dataset       {:mvn/version "7.030"}}
- :aliases {:dev {:extra-deps {org.scicloj/clay {:mvn/version "2-beta9"}
+ :aliases {:dev {:extra-deps {org.scicloj/clay {:mvn/version "2-beta11"}
                               org.scicloj/note-to-test {:mvn/version "1-alpha7"}}}
-           :test {:extra-deps {org.scicloj/clay {:mvn/version "2-beta9"}
+           :test {:extra-deps {org.scicloj/clay {:mvn/version "2-beta11"}
                                org.scicloj/note-to-test {:mvn/version "1-alpha7"}
                                midje/midje {:mvn/version "1.10.10"}}
                   :extra-paths ["test"]}}}
diff --git a/docs/.clay.html b/docs/.clay.html
diff --git a/docs/.clay_files/bootstrap0.css b/docs/.clay_files/bootstrap0.css
diff --git a/docs/.clay_files/html-default0.js b/docs/.clay_files/html-default0.js
diff --git a/docs/.clay_files/html-default1.js b/docs/.clay_files/html-default1.js
diff --git a/docs/.clay_files/html-default2.js b/docs/.clay_files/html-default2.js
diff --git a/docs/.clay_files/html-default3.js b/docs/.clay_files/html-default3.js
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/index_files/katex2.js b/docs/index_files/katex2.js
diff --git a/notebooks/index.clj b/notebooks/index.clj
@@ -3511,7 +3511,7 @@ Let's see how many values are for each type of `wool` and `tension` groups
 
 
 (md "
-We can also calculate mean (aggreate values)
+We can also calculate mean (aggregate values)
 ")
 
 
@@ -4707,7 +4707,7 @@ Let's begin by requiring the Column API, which we suggest you alias as `tcc`:")
 
 ;; Here, we used the `odd?` operator to create a boolean array indicating all index positions in the Column that included an odd value. Then we pass that boolean Column to the `select` function using the `->>` to send it to the second argument position.
 
-;; #### Sort  
+;; #### Sort
 
 ;; Use `sort-column` to sort a column:
 

diff --git a/project.clj b/project.clj
@@ -8,6 +8,6 @@
   :lein-tools-deps/config {:config-files [:install :user :project]}
   :profiles {:dev {:cloverage    {:runner :midje}
                    :dependencies [[midje "1.10.10"]
-                                  [org.scicloj/clay "2-beta9"]]
+                                  [org.scicloj/clay "2-beta11"]]
                    :plugins      [[lein-midje "3.2.1"]
                                   [lein-cloverage "1.2.4"]]}})
diff --git a/src/tablecloth/column/api/column.clj b/src/tablecloth/column/api/column.clj
@@ -88,10 +88,10 @@
                 (fn? order-or-comparator)))
      (throw (IllegalArgumentException.
              "`order-or-comparator` must be `:asc`, `:desc`, or a function.")))
-   (let [order-fn-lookup {:asc fun/<, :desc fun/>}
-         comparator-fn (if (fn? order-or-comparator)
-                         order-or-comparator
-                         (order-fn-lookup order-or-comparator)) 
+   (let [comparator-fn (cond
+                         (fn? order-or-comparator) order-or-comparator
+                         (= :asc order-or-comparator) compare
+                         (= :desc order-or-comparator) #(compare %2 %1))
          sorted-indices (argsort comparator-fn col)]
      (col/select col sorted-indices))))