Bump RCSR archive version

coudertlab · Jul 20, 2023 · fe9cf92 · fe9cf92 · Liozou · Jul 20, 2023
1 parent bb60af1
commit fe9cf92
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/Artifacts.toml b/Artifacts.toml
@@ -1,10 +1,10 @@
 [archives]
-git-tree-sha1 = "c2d10c9faf059fd72bc4336e56af4f1c6e140a36"
+git-tree-sha1 = "86e6f9d5d97dd6763a877bec8632fc171686dd3b"
 
     [[archives.download]]
-    url = "https://github.com/Liozou/CrystalNetsArchive/releases/download/V2.2/archives.tar.xz"
-    sha256 = "770ad8d1d0a47d75f7106cda952d525c1bb55756ea94037899b43e3bb2ba70cc"
+    url = "https://github.com/Liozou/CrystalNetsArchive/releases/download/V2.4/archives.tar.xz"
+    sha256 = "b4866f45330aa69b7a4fe9cb084978a7ae37eb2c12cceb19a3b40815eeb3e3f0"
 
     [[archives.download]]
-    url = "https://github.com/Liozou/CrystalNetsArchive/releases/download/V2.2/archives.zip"
-    sha256 = "e141bc46d166075916d902bc841a355be993770a5a75dc2f93d7c130a0514e69"
+    url = "https://github.com/Liozou/CrystalNetsArchive/releases/download/V2.4/archives.zip"
+    sha256 = "d68e8219c905f624f72bd9426127586a3261953a06c31a24c258ee26e9813e29"
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "CrystalNets"
 uuid = "7952bbbe-a946-4118-bea0-081a0932faa9"
 authors = ["Lionel Zoubritzky lionel.zoubritzky@gmail.com"]
-version = "0.4.0"
+version = "0.4.1"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"

diff --git a/src/archive.jl b/src/archive.jl
@@ -1,7 +1,7 @@
 ## Handling of the topological archive internally used to recognize topologies.
 using Pkg.Artifacts
 
-const CRYSTALNETS_ARCHIVE_VERSION = "2.2"
+const CRYSTALNETS_ARCHIVE_VERSION = "2.4"
 const arc_location = artifact"archives"
 
 """

diff --git a/src/types.jl b/src/types.jl
@@ -1213,6 +1213,14 @@ function Base.keys(x::TopologyResult)
     end
     return samenet
 end
+Base.values(x::TopologyResult) = ValuesTopologyResult(x)
+Base.valtype(::Type{TopologyResult}) = TopologicalGenome
+
+struct ValuesTopologyResult <: AbstractVector{TopologicalGenome}
+    x::TopologyResult
+end
+Base.size(vx::ValuesTopologyResult) = (length(vx.x),)
+Base.getindex(vx::ValuesTopologyResult, i::Int) = vx.x[i]
 
 function Base.show(io::IO, ::MIME"text/plain", x::TopologyResult)
     samenet = keys(x)
@@ -1231,14 +1239,6 @@ function Base.show(io::IO, ::MIME"text/plain", x::TopologyResult)
 end
 Base.show(io::IO, x::TopologyResult) = show(io, MIME"text/plain"(), x)
 
-struct ValuesTopologyResult <: AbstractVector{TopologicalGenome}
-    x::TopologyResult
-end
-Base.values(x::TopologyResult) = ValuesTopologyResult(x)
-Base.valtype(::Type{TopologyResult}) = TopologicalGenome
-Base.size(vx::ValuesTopologyResult) = (length(vx.x),)
-Base.getindex(vx::ValuesTopologyResult, i::Int) = vx.x[i]
-
 function Base.iterate(x::TopologyResult, (p, i)=(pairs(x), nothing))
     next = i isa Nothing ? iterate(p) : iterate(p, i)
     next isa Nothing && return nothing

diff --git a/test/cif/results/data b/test/cif/results/data