Skip to content

Commit

Permalink
Releases 1.0.0a3
Browse files Browse the repository at this point in the history
  • Loading branch information
songololo committed Feb 27, 2021
1 parent a454b05 commit 761471d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions cityseer/metrics/layers.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def data_map_from_dict(data_dict: dict) -> Tuple[tuple, np.ndarray]:
Converts a data dictionary into a `numpy` array for use by `DataLayer` classes.
::: warning Note
It is generally not necessary to use this function directly. This function will be called implicitly when invoking [DataLayerFromDict](#class-#datalayerfromdict)
It is generally not necessary to use this function directly. This function will be called implicitly when invoking [DataLayerFromDict](#class-datalayerfromdict)
:::
Parameters
Expand Down Expand Up @@ -515,14 +515,14 @@ def compute_aggregated(self,
on the distances from the point of computation to the nearest example of a particular land-use. It therefore
gives a locally representative indication of the intensity of mixed-uses. $d_{i}$ is a negative exponential
function where $-\beta$ controls the strength of the decay. ($-\beta$ is provided by the `Network Layer`, see
[distance_from_beta](/metrics/networks#distance-from-beta).)|
[`distance_from_beta`](/metrics/networks#distance-from-beta).)|
| hill_pairwise_wt | $\scriptstyle\big[ \sum_{i}^{S} \sum_{j\neq{i}}^{S} d_{ij} \big( \frac{p_{i} p_{j}}{Q}
\big)^{q} \big]^{1/(1-q)} \\ \scriptstyle Q = \sum_{i}^{S} \sum_{j\neq{i}}^{S} d_{ij} p_{i} p_{j}$ | This is a
pairwise-distance-weighted variant of Hill Diversity based on the respective distances between the closest
examples of the pairwise distinct land-use combinations as routed through the point of computation.
$d_{ij}$ represents a negative exponential function where $-\beta$ controls the strength of the decay.
($-\beta$ is provided by the `Network Layer`, see
[distance_from_beta](/metrics/networks#distance-from-beta).)|
[`distance_from_beta`](/metrics/networks#distance-from-beta).)|
| hill_pairwise_disparity | $\scriptstyle\big[ \sum_{i}^{S} \sum_{j\neq{i}}^{S} w_{ij} \big( \frac{p_{i}
p_{j}}{Q} \big)^{q} \big]^{1/(1-q)} \\ \scriptstyle Q = \sum_{i}^{S} \sum_{j\neq{i}}^{S} w_{ij} p_{i}
p_{j}$ | This is a disparity-weighted variant of Hill Diversity based on the pairwise disparities between
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
python setup.py sdist bdist_wheel
pip install --upgrade twine
TESTING REPO: twine upload --repository-url https://test.pypi.org/legacy/ dist/*
DOWNLOADING FROM TEST REPO: pip install --extra-index-url https://test.pypi.org/simple/ cityseer==1.0.0a1.dev8
DOWNLOADING FROM TEST REPO: pip install --extra-index-url https://test.pypi.org/simple/ cityseer==1.0.0a1
OTHERWISE: twine upload dist/*
'''

from setuptools import setup

setup(
name='cityseer',
version='1.0.0alpha1.dev8',
version='1.0.0alpha3',
packages=['cityseer', 'cityseer.algos', 'cityseer.metrics', 'cityseer.tools'],
description='Computational tools for urban analysis',
url='https://github.com/cityseer/cityseer',
Expand Down

0 comments on commit 761471d

Please sign in to comment.