Skip to content

1.2.2 #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 26, 2022
Merged

1.2.2 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b58d958
get rid of final
hkulyc Apr 26, 2022
1b654fe
Update README.md
hkulyc Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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
View file
Open in desktop
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