Skip to content

Commit bea59e4

Browse files
authored
Merge pull request #57 from clojure-finance/main
1.2.2
2 parents ceec3fc + 1b654fe commit bea59e4

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ com.github.clojure-finance/clojask {:mvn/version "1.2.1"}
106106
6. Output the resultant dataset to "result.csv" (Use 8 threads)
107107

108108
```clojure
109-
(ck/compute df 8 "result.csv" :select ["Employee" "EmployeeName" "Department" "newSalary" "UpdateDate"])
109+
(ck/compute df 8 "result.csv" :select ["Employee" "EmployeeName" "Department" "NewSalary" "UpdateDate"])
110110
```
111111

112112
See [`compute`](https://clojure-finance.github.io/clojask-website/posts-output/API/#compute)

src/main/clojure/clojask/dataframe.clj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
(sort [a b] "sort the dataframe based on columns")
4949
(addFormatter [a b] "format the column as the last step of the computation")
5050
(preview [sample-size output-size format] "quickly return a vector of maps about the resultant dataframe")
51-
(final [] "prepare the dataframe for computation")
5251
(previewDF [] "preview function used for error predetection")
5352
(errorPredetect [msg] "prints exception with msg if error is detected in preview")
5453
)
@@ -248,11 +247,6 @@
248247
(throw (Clojask_TypeException. "Input includes non-existent column name(s).")))
249248
(.setFormatter col-info format col))
250249

251-
(final
252-
[this]
253-
(doseq [tmp (.getFormatter (:col-info this))]
254-
(.operate this (nth tmp 1) (get (.getIndexKey col-info) (nth tmp 0)))))
255-
256250
(preview
257251
[this sample-size return-size format]
258252
(cond (not (and (integer? sample-size) (integer? return-size)))
@@ -277,7 +271,6 @@
277271
(assert (or (= (count select) (count index)) (= select [nil]))(Clojask_OperationException. "Must select existing columns. You may check it using"))
278272
(if (<= num-worker 8)
279273
(do
280-
;; (.final this)
281274
(if (= ifheader nil) (.printCol this output-dir index))
282275
(let [res (start-onyx num-worker batch-size this output-dir exception order index melt)]
283276
(if (= res "success")

0 commit comments

Comments
 (0)