Skip to content

Commit

Permalink
Merge pull request #143 from scicloj/km/142-fix-2-elem-ds-creation
Browse files Browse the repository at this point in the history
Fix 2d/2-element array dataset creation
  • Loading branch information
genmeblog authored Mar 24, 2024
2 parents f0d5a79 + 42d00b7 commit cf1beaf
Show file tree
Hide file tree
Showing 12 changed files with 1,054 additions and 965 deletions.
2 changes: 1 addition & 1 deletion .dir-locals.el
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
.
((cider-clojure-cli-aliases
.
"dev"))))
"dev:test"))))
19 changes: 11 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

* `reorder-columns` can work on grouped dataset now

### Fixed

* arrays of 2 element arrays behave as expected on dataset creation ([#142](https://github.com/scicloj/tablecloth/issues/142))

## [7.021]

Deps updated
Expand All @@ -29,7 +33,7 @@ Deps updated to fix `j/left-join` issue.
* join columns should consider `nil` as missing value only, [discussion](https://clojurians.zulipchat.com/#narrow/stream/236259-tech.2Eml.2Edataset.2Edev/topic/tablecloth.20join-columns.20is.20nil-ing.20false.3F.20values)
* `:nil-missing?` in more places needed (group-by operations), [discussion](https://clojurians.zulipchat.com/#narrow/stream/236259-tech.2Eml.2Edataset.2Edev/topic/tablecloth.20group.20operations.20dropping.20a.20nil.20group-by.20column)
* changes to the `group-by` documentation [PR115](https://github.com/scicloj/tablecloth/pull/115), thanks to [Marshall](https://github.com/mars0i)
* reflection warning for `Collections/shuffle` removed
* reflection warning for `Collections/shuffle` removed

## [7.007]

Expand Down Expand Up @@ -105,15 +109,15 @@ Differences:

## [6.103]

Clojure upgraded to 1.11.1
Clojure upgraded to 1.11.1

### Added

* `separate-column` infers column names when function is used and `target-columns` is `nil`, [#78](https://github.com/scicloj/tablecloth/issues/78)

### Changed

* [breaking][minor] `separate-column` repleces source column with target on every case
* [breaking][minor] `separate-column` repleces source column with target on every case

## [6.102]

Expand Down Expand Up @@ -185,7 +189,7 @@ Version bump

### Added

* docstring for `unroll` and `fold-by` by @holyjak (#60 and #61)
* docstring for `unroll` and `fold-by` by @holyjak (#60 and #61)

## [6.051]

Expand Down Expand Up @@ -235,7 +239,7 @@ Version bump

### Fixed

* `update-columns` on grouped dataset
* `update-columns` on grouped dataset

## [6.002]

Expand Down Expand Up @@ -296,7 +300,7 @@ tech.ml.dataset version bump, this introduces the change of the order of the gro
### Added

* `split :holdout` supports any number of splits (minimum 2) [#28]
* `split` supports `split-names` to provide custom names for subdatasets
* `split` supports `split-names` to provide custom names for subdatasets
* `concat` and `concat-copying` are working with grouped datasets

### Fixed
Expand Down Expand Up @@ -438,7 +442,7 @@ t.m.d update
* version number to match t.m.dataset version
* documentation:
- gfm renderer for markdown

### Fixed

* code block language alignment fix in css
Expand Down Expand Up @@ -502,4 +506,3 @@ t.m.d update
* `pivot->wider` drops missing rows by default
* `pivto->wider` order of concatenated column names is reversed (first: colnames, last: value), was opposite.
* `pivot->longer` `:splitter` accepts string used for splitting column name

13 changes: 9 additions & 4 deletions README-source.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,17 @@ Documentation is written in the [Kindly](https://scicloj.github.io/kindly/) conv

The old documentation was written in RMarkdown and is kept under [docs/old/](./docs/old/).

Documentation contains around 600 code snippets which are run during build. There are two source files:
Documentation contains around 600 code snippets which are run during build. There are three relevant source files:

* [README-source.md](./README-source.md) for README.md
* [notebooks/index.clj](./notebooks/index.clj) for the detailed documentation
* [clay.edn](./clay.edn) for some styling options of the docs

(`notebooks/index.clj` was generated by [dev/conversion.clj](dev/conversion.clj) from the earlier Rmarkdown-based `index.Rmd` with asome additional manual editing. Starting at 2024, it will diverge from that source, that will no longer be maintained.)

### README generation

To generate `README.md`, run the `generate!` function at the [dev/readme_teneration.clj](./dev/readme_teneration.clj) script.
To generate `README.md`, run the `generate!` function at the [dev/readme_generation.clj](./dev/readme_generation.clj) script.

### Detailed documentation generation

Expand Down Expand Up @@ -117,12 +118,16 @@ To generate the detailed documentation, call the following. You will need the Qu
- usually function should working on grouped dataset as well, accept `parallel?` argument then (if applied).
3. Follow `potemkin` pattern and import functions to the API namespace using `tech.v3.datatype.export-symbols/export-symbols` function
4. Functions which are composed out of API function to cover specific case(s) should go to `tablecloth.utils` namespace.
5. Always update `README.Rmd`, `CHANGELOG.md`, `docs/index.Rmd`, tests and function docs are highly welcomed
5. Always update `README-source.md`, `CHANGELOG.md`, `notebooks/index.clj`, tests and function docs are highly welcomed.
6. Always discuss changes and PRs first

### Tests

Tests are written and run using [midje](https://github.com/marick/Midje/). To run a test, evaluate a midje form. If it passes, it will return `true`, if it fails details will be printed to the REPL.

## TODO

* tests
* elaborate on tests
* tutorials

## Licence
Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Documentation is written in the [Kindly](https://scicloj.github.io/kindly/) conv

The old documentation was written in RMarkdown and is kept under [docs/old/](./docs/old/).

Documentation contains around 600 code snippets which are run during build. There are two source files:
Documentation contains around 600 code snippets which are run during build. There are three relevant source files:

* [README-source.md](./README-source.md) for README.md
* [notebooks/index.clj](./notebooks/index.clj) for the detailed documentation
Expand Down Expand Up @@ -137,16 +137,20 @@ To generate the detailed documentation, call the following. You will need the Qu
- usually function should working on grouped dataset as well, accept `parallel?` argument then (if applied).
3. Follow `potemkin` pattern and import functions to the API namespace using `tech.v3.datatype.export-symbols/export-symbols` function
4. Functions which are composed out of API function to cover specific case(s) should go to `tablecloth.utils` namespace.
5. Always update `README.Rmd`, `CHANGELOG.md`, `docs/index.Rmd`, tests and function docs are highly welcomed
5. Always update `README-source.md`, `CHANGELOG.md`, `notebooks/index.clj`, tests and function docs are highly welcomed.
6. Always discuss changes and PRs first

### Tests

Tests are written and run using [midje](https://github.com/marick/Midje/). To run a test, evaluate a midje form. If it passes, it will return `true`, if it fails details will be printed to the REPL.

## TODO

* tests
* elaborate on tests
* tutorials

## Licence

Copyright (c) 2020 Scicloj

The MIT Licence
The MIT Licence
6 changes: 4 additions & 2 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{:extra-paths ["data"]
:deps {org.clojure/clojure {:mvn/version "1.11.1"}
techascent/tech.ml.dataset {:mvn/version "7.021"}}
techascent/tech.ml.dataset {:mvn/version "7.029"}}
:aliases {:dev {:extra-deps {org.scicloj/clay {:mvn/version "2-alpha82"}
org.scicloj/note-to-test {:mvn/version "1-alpha7"}}}
:test {:extra-deps {org.scicloj/clay {:mvn/version "2-alpha82"}
org.scicloj/note-to-test {:mvn/version "1-alpha7"}}}}}
org.scicloj/note-to-test {:mvn/version "1-alpha7"}
midje/midje {:mvn/version "1.10.10"}}
:extra-paths ["test"]}}}
Loading

0 comments on commit cf1beaf

Please sign in to comment.