Skip to content

Commit

Permalink
Merge pull request #57 from clojure-finance/main
Browse files Browse the repository at this point in the history
1.2.2
  • Loading branch information
hkulyc authored Apr 26, 2022
2 parents ceec3fc + 1b654fe commit bea59e4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ com.github.clojure-finance/clojask {:mvn/version "1.2.1"}
6. Output the resultant dataset to "result.csv" (Use 8 threads)

```clojure
(ck/compute df 8 "result.csv" :select ["Employee" "EmployeeName" "Department" "newSalary" "UpdateDate"])
(ck/compute df 8 "result.csv" :select ["Employee" "EmployeeName" "Department" "NewSalary" "UpdateDate"])
```

See [`compute`](https://clojure-finance.github.io/clojask-website/posts-output/API/#compute)
Expand Down
7 changes: 0 additions & 7 deletions src/main/clojure/clojask/dataframe.clj
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
(sort [a b] "sort the dataframe based on columns")
(addFormatter [a b] "format the column as the last step of the computation")
(preview [sample-size output-size format] "quickly return a vector of maps about the resultant dataframe")
(final [] "prepare the dataframe for computation")
(previewDF [] "preview function used for error predetection")
(errorPredetect [msg] "prints exception with msg if error is detected in preview")
)
Expand Down Expand Up @@ -248,11 +247,6 @@
(throw (Clojask_TypeException. "Input includes non-existent column name(s).")))
(.setFormatter col-info format col))

(final
[this]
(doseq [tmp (.getFormatter (:col-info this))]
(.operate this (nth tmp 1) (get (.getIndexKey col-info) (nth tmp 0)))))

(preview
[this sample-size return-size format]
(cond (not (and (integer? sample-size) (integer? return-size)))
Expand All @@ -277,7 +271,6 @@
(assert (or (= (count select) (count index)) (= select [nil]))(Clojask_OperationException. "Must select existing columns. You may check it using"))
(if (<= num-worker 8)
(do
;; (.final this)
(if (= ifheader nil) (.printCol this output-dir index))
(let [res (start-onyx num-worker batch-size this output-dir exception order index melt)]
(if (= res "success")
Expand Down

0 comments on commit bea59e4

Please sign in to comment.