Skip to content

Commit

Permalink
Added travis build and updated readme
Browse files Browse the repository at this point in the history
  • Loading branch information
MSeal committed Jan 31, 2016
1 parent 1f4880f commit 68c1257
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
sudo: false
language: python
python:
- "2.7"

install: "python setup.py install"
script: nosetests
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ This implementation uses a heap to select the best pair to cluster at each itera
- A naive implementation considers all "n" edges in the graph (O(n))
- A heap reduces this search dramatically (O(log(n))

## Installation

pip install agglomcluster

## Dependencies
networkx -- supported graphing library

Expand Down Expand Up @@ -84,10 +88,11 @@ The clustered result from an agglomerative clustering pass. Use `.clusters()` an
## Performance

Approximate performance runs on natural graph sizes on high-end machine:
Nodes | Edges | Time | Memory
1000 | 6000 | 1.5 s | 28 MB
10000 | 80000 | 350 s | 2.5 GB
TODO More sizes

Nodes | Edges | Time | Memory
1000 | 6000 | 1.5 s | 28 MB
10000 | 80000 | 350 s | 2.5 GB
TODO More sizes

## Author
Author(s): Matthew Seal
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import os
import sys
from find_library import pkgconfig
from collections import defaultdict
from setuptools import setup, find_packages, Extension

Expand Down Expand Up @@ -56,7 +55,7 @@ def readMD(fname):
Extension(
'hac.cluster',
[os.path.join('hac', 'cluster.pyx')],
**pkgconfig('hac', language='c')
language='c'
)
], force=True)
else:
Expand All @@ -65,7 +64,7 @@ def readMD(fname):
Extension(
'hac.cluster',
[os.path.join('hac', 'cluster.c')],
**pkgconfig('hac', language='c')
language='c'
)
]

Expand Down

0 comments on commit 68c1257

Please sign in to comment.