Merge pull request #8 from GiulioRossetti/ndlib-rest-2.0

Ndlib-rest v2.0.0 Bored Blackbird

Author: GiulioRossetti

.gitignore

@@ -0,0 +1,97 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# dotenv
+.env
+
+# virtualenv
+.venv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+

.travis.yml

@@ -2,7 +2,7 @@ sudo: required
 
 language: python
 python:
-  - "2.7"
+  - "3.6"
 
 before_install:
   - pip install gunicorn

CHANGELOG.md

@@ -1,11 +1,28 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [Unrealeased]
+## [To Add]
+- Dynamic Graph generator
+- Dynamic Graph upload/load
+
+## [2.0.0]
+### Added
+- Python 3 support
+- Dynamic Network Support
+	- Models
+		- Dynamic SI
+		- Dynamic SIS
+		- Dynamic SIR
+     
+## [1.0.0]
 ### Added
-- Website
-    - REST tutorial
-    - Python client tutorial
+- Models
+	- SEIS
+	- SEIR
+
+### Updated
+- Diffusion Library update: ndlib 2.x.x
+
 
 ## [0.9.2]
 ### Added

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:2.7-slim
+FROM python:3.6-slim
 MAINTAINER Salvo Rinzivillo <rinzivillo@isti.cnr.it>
 
 

README.md

@@ -11,16 +11,17 @@ This project offers a REST interface for the [ndlib](https://github.com/GiulioRo
 * Python REST client: ndlib-rest/client
 
 
-Python 2.7 required dependencies:
-
-- [ndlib](https://github.com/GiulioRossetti/ndlib)
-- flask 
-- flask-cors
-- flask_restful
-- flask_apidoc
-- networkx
-- numpy
-- scipy
+Python 3.6 required dependencies:
+
+- [ndlib](https://github.com/GiulioRossetti/ndlib)=3.0.0
+- flask==0.12
+- flask-cors==3.0.2
+- flask_restful==0.3.5
+- flask_apidoc==1.0.0
+- networkx==1.11
+- numpy==1.12.0
+- scipy==0.18.1
+- [dynetx](https://github.com/GiulioRossetti/dynetx)==0.1.6
 
 #### REST service setup
 Local testing

apidoc.json

@@ -1,6 +1,6 @@
 {
   "name": "(N)etwork (D)iffusion library REST service",
-  "version": "0.9.2",
+  "version": "2.0.0",
   "description": "REST service for the simulation of diffusion models over networks.",
   "title": "NDlib REST",
   "url": "http://127.0.0.1:5000",
@@ -35,6 +35,8 @@
     "si",
     "sir",
     "sis",
+    "seis",
+    "seir",
     "threshold",
     "KerteszThreshold",
     "profile",
@@ -44,6 +46,9 @@
     "qvoter",
     "majority",
     "sznajd",
+    "dsi",
+    "dsis",
+    "dsis",
     "Iterators",
     "iterator",
     "iteratorbunch"

client/NDlibClient.py

@@ -111,11 +111,21 @@ def add_SIS(self, infected, beta, lbd):
                   data={'infected': infected, 'beta': beta, 'lambda': lbd, 'token': self.token})
         return res.status_code
 
+    def add_SEIS(self, infected, beta, alpha, lbd):
+        res = put('%s/api/SEIS' % self.base,
+                  data={'infected': infected, 'beta': beta, 'lambda': lbd, 'alpha': alpha, 'token': self.token})
+        return res.status_code
+
     def add_SIR(self, infected, beta, gamma):
         res = put('%s/api/SIR' % self.base,
                   data={'infected': infected, 'beta': beta, 'gamma': gamma, 'token': self.token})
         return res.status_code
 
+    def add_SEIR(self, infected, beta, gamma, alpha):
+        res = put('%s/api/SEIR' % self.base,
+                  data={'infected': infected, 'beta': beta, 'gamma': gamma, 'alpha': alpha, 'token': self.token})
+        return res.status_code
+
     def add_independent_cascades(self, infected):
         res = put('%s/api/IndependentCascades' % self.base, data={'infected': infected, 'token': self.token})
         return res.status_code
@@ -212,7 +222,7 @@ def load_exploratory(self, name):
         res = post('%s/api/Exploratory' % self.base, data={'exploratory': name, 'token': self.token})
         return res.status_code
 
-    def upload_graph(self, directed, graph):
+    def upload_graph(self, directed, graph, dynamic=False):
         res = post('%s/api/UploadNetwork' % self.base,
-                   data={'directed': directed, 'graph': json.dumps(graph), 'token': self.token})
+                   data={'directed': directed, 'graph': json.dumps(graph), 'dynamic': dynamic, 'token': self.token})
         return res.status_code

client/example.py

@@ -6,37 +6,37 @@
 e = NDlibClient("http://127.0.0.1:5000")
 
 
-print "indipendent cascades"
-e.create_experiment()
-x = e.add_erdos_renyi_graph(300, 0.01)
-e.add_independent_cascades(0.1)
-tot = 0
-for it in xrange(0, 10):
-    ex = e.get_iteration()
-    for m in ex:
-        print it, len(ex[m]['status'])
-
-e.destroy_experiment()
-
+# print "indipendent cascades"
+# e.create_experiment()
+# x = e.add_erdos_renyi_graph(300, 0.01)
+# e.add_independent_cascades(0.1)
+# tot = 0
+# for it in xrange(0, 10):
+#     ex = e.get_iteration()
+#     for m in ex:
+#         print it, len(ex[m]['status'])
+#
+# e.destroy_experiment()
 
-e.create_experiment()
-x = e.add_erdos_renyi_graph(300, 0.01)
-e.add_cognitiveopdyn(0.15, 0, 1, 0, 1, 1/3.0, 1/3.0, 1/3.0)
-tot = 0
-for it in xrange(0, 10):
-    ex = e.get_iteration()
-    for m in ex:
-        print it, len(ex[m]['status'])
 
-e.destroy_experiment()
+# e.create_experiment()
+# x = e.add_erdos_renyi_graph(300, 0.01)
+# e.add_cognitiveopdyn(0.15, 0, 1, 0, 1, 1/3.0, 1/3.0, 1/3.0)
+# tot = 0
+# for it in xrange(0, 10):
+#     ex = e.get_iteration()
+#     for m in ex:
+#         print it, len(ex[m]['status'])
+#
+# e.destroy_experiment()
 
 # rivedere i parametri del modello
 
 #
 print "ClusteredBA_bottom"
 e.create_experiment()
 e.load_exploratory("ClusteredBA_bottom")
-e.add_kertesz_model(0.1, threshold=0.1, blocked=0.1, adopter_rate=0.1)
+e.add_kertesz_model(0.01, threshold=1, blocked=0.1, adopter_rate=0)
 tot = 0
 for it in xrange(0, 10):
     ex = e.get_iteration()
@@ -51,6 +51,8 @@
 
 e.destroy_experiment()
 
+exit()
+
 # rivedere i parametri del modello
 print "ClusteredBA_top"
 e.create_experiment()