Merge b72221b into 985a3df

GiulioRossetti · Aug 19, 2017 · ae66122 · ae66122
2 parents 985a3df + b72221b
commit ae66122
Show file tree

Hide file tree

Showing 10 changed files with 274 additions and 319 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -3,6 +3,7 @@ omit =
  setup.py
  rdyn/__main__.py
  rdyn/test/*
+ rdyn/alg/RDyn.py
 
 [report]
 exclude_lines =

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: python
 python:
   - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
 
 before_install:
   - pip install pytest pytest-cov

diff --git a/README.md b/README.md
@@ -72,7 +72,6 @@ In order to generate a dynamic graph of 1000 nodes for 1000 iterations applying
 ```bash
 python rdyn 1000 1000 True
 ```
-The minimum number of nodes allowed is 1000.
 
 ## As python library
 
@@ -149,5 +148,6 @@ RDyn is written in python and requires the following package to run:
 - python>=2.7.11
 - networkx==1.11
 - numpy==1.11.1
-- scipy==0.17.0
 - tqdm
+- six
+- future
diff --git a/rdyn/__init__.py b/rdyn/__init__.py
@@ -1 +1 @@
-from rdyn.alg.RDyn import RDyn
+from rdyn.alg.RDyn_v2 import RDynV2 as RDyn
diff --git a/rdyn/__main__.py b/rdyn/__main__.py
@@ -1,3 +1,3 @@
-from rdyn.alg.RDyn import main
+from rdyn.alg.RDyn_v2 import main
 
 main()