Commit 4a43ffde authored by Chris Jewell's avatar Chris Jewell
Browse files

Merge branch 'fix-geodata-filter' into 'master'

Fix geodata filter

See merge request !41
parents 078e75b2 7c552eba
...@@ -15,7 +15,7 @@ import covid.data as data ...@@ -15,7 +15,7 @@ import covid.data as data
tfd = tfp.distributions tfd = tfp.distributions
VERSION = "0.7.0" VERSION = "0.7.1"
DTYPE = np.float64 DTYPE = np.float64
STOICHIOMETRY = np.array([[-1, 1, 0, 0], [0, -1, 1, 0], [0, 0, -1, 1]]) STOICHIOMETRY = np.array([[-1, 1, 0, 0], [0, -1, 1, 0], [0, 0, -1, 1]])
...@@ -46,6 +46,7 @@ def gather_data(config): ...@@ -46,6 +46,7 @@ def gather_data(config):
) )
geo = gp.read_file(config["geopackage"]) geo = gp.read_file(config["geopackage"])
geo = geo.sort_values("lad19cd") geo = geo.sort_values("lad19cd")
geo = geo[geo['lad19cd'].isin(locations['lad19cd'])]
area = xarray.DataArray( area = xarray.DataArray(
geo.area, geo.area,
name="area", name="area",
......
[tool.poetry] [tool.poetry]
name = "covid19uk" name = "covid19uk"
version = "0.7.1" version = "0.7.2"
description = "Spatial stochastic SEIR analysis of COVID-19 in the UK" description = "Spatial stochastic SEIR analysis of COVID-19 in the UK"
authors = ["Chris Jewell <c.jewell@lancaster.ac.uk>"] authors = ["Chris Jewell <c.jewell@lancaster.ac.uk>"]
license = "MIT" license = "MIT"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment