Skip to content

Commit

Permalink
Merge pull request #424 from jGaboardi/longest_comp
Browse files Browse the repository at this point in the history
[WIP][ENH] longest and largest network components
  • Loading branch information
jGaboardi authored Feb 24, 2020
2 parents 9aaffc8 + d84888b commit 5c6fa3e
Show file tree
Hide file tree
Showing 78 changed files with 9,644 additions and 4,222 deletions.
4 changes: 2 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ exclude_lines =

ignore_errors = True
omit =
tests/*
__init__.py
*/tests/*
*__init__.py

[html]
directory = coverage_html_report
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ script:
- python setup.py sdist >/dev/null
- echo "check_stable=False" >spaghetti/config.py
- python setup.py install
- py.test -v spaghetti --cov=spaghetti -v --doctest-modules --cov-report term-missing;
- py.test -v spaghetti --cov=spaghetti -v --doctest-modules --cov-config=.coveragerc --cov-report term-missing;

notifications:
email:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
[pysal/spaghetti](http://pysal.org/spaghetti/)
=================================

SPAtial GrapHs: nETworks, Topology, & Inference
=====================================
*SPA*tial *G*rap*H*s: n*ET*works, *T*opology, & *I*nference
============================================

Spaghetti is an open-source Python library for the analysis of network-based spatial data. Originating from the `network` module in [PySAL (Python Spatial Analysis Library)](http://pysal.org), it is under active development for the inclusion of newly proposed methods for building graph-theoretic networks and the analysis of network events. This package is part of a [refactoring of PySAL](https://github.com/pysal/pysal/wiki/PEP-13:-Refactor-PySAL-Using-Submodules).

Expand Down
2 changes: 1 addition & 1 deletion docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: e682b3b621a0b74c53d713590f69cf35
config: a0ef56d31d8ff47b1df142822f1c666c
tags: 645f666f9bcd5a90fca523b33c5a78b7
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/notebooks_network-analysis_43_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/notebooks_network-analysis_46_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/notebooks_network-analysis_49_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions docs/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Overview: module code &#8212; spaghetti v1.4.1 Manual</title>
<title>Overview: module code &#8212; spaghetti v1.4.2 Manual</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="../_static/pysal-styles.css" />
Expand Down Expand Up @@ -40,7 +40,7 @@
</button>
<a class="navbar-brand" href="../index.html">
spaghetti</a>
<span class="navbar-text navbar-version pull-left"><b>1.4.1</b></span>
<span class="navbar-text navbar-version pull-left"><b>1.4.2</b></span>
</div>

<div class="collapse navbar-collapse nav-collapse">
Expand Down
334 changes: 308 additions & 26 deletions docs/_modules/spaghetti/network.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/_sources/api.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Network feature extraction and creation
.. autosummary::
:toctree: generated/

spaghetti.extract_component
spaghetti.element_as_gdf
spaghetti.regular_lattice

Expand Down
2 changes: 1 addition & 1 deletion docs/_sources/generated/spaghetti.Network.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ spaghetti.Network
~Network.count_per_link
~Network.distancebandweights
~Network.enum_links_vertex
~Network.extract_components
~Network.extractgraph
~Network.full_distance_matrix
~Network.identify_components
~Network.loadnetwork
~Network.nearestneighbordistances
~Network.savenetwork
Expand Down
6 changes: 6 additions & 0 deletions docs/_sources/generated/spaghetti.extract_component.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
spaghetti.extract\_component
============================

.. currentmodule:: spaghetti

.. autofunction:: extract_component
47 changes: 38 additions & 9 deletions docs/_sources/index.rst.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.. documentation master file
`spaghetti`
===========

SPAtial GrapHs: nETworks, Topology, & Inference
-----------------------------------------------
**SPA**\ tial **G**\ rap\ **H**\ s: n\ **ET**\ works, **T**\ opology, & **I**\ nference
---------------------------------------------------------------------------------------

`Spaghetti` is an open-source Python library for the analysis of network-based
spatial data. Originating from the `network` module in `PySAL (Python Spatial
Expand All @@ -21,25 +22,42 @@ and usage tutorials are provided here through the links above.
<div class="col-sm-.5 col-xs-hidden">
</div>
<div class="col-md-4 col-xs-15">
<a href="https://pysal.org/spaghetti/notebooks/quickstart.html" class="thumbnail">
<img src="_static/images/net_rep.png" class="img-responsive center-block">
<a
href="https://pysal.org/spaghetti/notebooks/quickstart.html"
class="thumbnail"
>
<img
src="_static/images/net_rep.png"
class="img-responsive center-block"
>
<div class="caption text-center">
<h6>Network Representation</h6>
</div>
</a>
</div>
<div class="col-sm-4 col-xs-15">
<a href="https://pysal.org/spaghetti/notebooks/network-analysis.html" class="thumbnail">
<img src="_static/images/network_k.png" class="img-responsive center-block">
<a
href="https://pysal.org/spaghetti/notebooks/network-analysis.html"
class="thumbnail"
>
<img
src="_static/images/network_k.png"
class="img-responsive center-block"
>
<div class="caption text-center">
<h6>Spatial Network Analysis</h6>
</div>
</a>
</div>
<div class="col-sm-4 col-xs-15">
<a href="https://pysal.org/spaghetti/notebooks/facility-location.html" class="thumbnail">
<img src="_static/images/facility_location.png"
class="img-responsive center-block">
<a
href="https://pysal.org/spaghetti/notebooks/facility-location.html"
class="thumbnail"
>
<img
src="_static/images/facility_location.png"
class="img-responsive center-block"
>
<div class="caption text-center">
<h6>Optimal Facility Location</h6>
</div>
Expand Down Expand Up @@ -77,6 +95,17 @@ If you use PySAL-spaghetti in a scientific publication, we would appreciate usin
}


.. raw:: html

<img
src="_static/images/pysal_logo.png"
class="img-responsive center-block"
alt="PySAL Logo"
width="400"
height="400"
>


.. toctree::
:hidden:
:maxdepth: 3
Expand Down
Loading

0 comments on commit 5c6fa3e

Please sign in to comment.