Skip to content

Commit

Permalink
export AbstractBasis from Bravais and add back Stastistics to Cryst…
Browse files Browse the repository at this point in the history
…alline deps (for src/compat/pyplot.jl).

- bump Bravais dep for Crystalline
- don't export `AbstractPoint` and subtypes for now... not clear if it should stick around
  • Loading branch information
thchr committed Oct 20, 2021
1 parent 8ce35d8 commit 6a7b568
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 4 additions & 2 deletions Bravais/src/Bravais.jl
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ export crystal,
primitivebasismatrix,
directbasis,
reciprocalbasis,
AbstractBasis,
DirectBasis,
ReciprocalBasis,
DirectPoint,
ReciprocalPoint,
# AbstractPoint,
# DirectPoint,
# ReciprocalPoint,
transform,
primitivize,
conventionalize
Expand Down
4 changes: 2 additions & 2 deletions Bravais/src/types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ function angles(Rs::AbstractBasis{D}) where D
end

"""
stack(Vs::AbstractBasis{D}) where D
stack(Vs::AbstractBasis)
Return a matrix `[Vs[1] Vs[2] .. Vs[D]]` from `Vs::AbstractBasis{D}`, i.e. the matrix whose
columns are the basis vectors in `Vs`.
"""
stack(Vs::AbstractBasis{D}) where D = reduce(hcat, parent(Vs))
stack(Vs::AbstractBasis) = reduce(hcat, parent(Vs))
# TODO: At some point, this should hopefully no longer be necessary to do manually (and
# `stack` may end up exported by Base): https://github.com/JuliaLang/julia/issues/21672

Expand Down
3 changes: 2 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[compat]
Bravais = "0.1"
Bravais = "0.1.1"
Combinatorics = "1.0"
DocStringExtensions = "0.8"
JLD2 = "0.2.4, 0.4"
Expand Down

0 comments on commit 6a7b568

Please sign in to comment.