Merge pull request #237 from sknetwork-team/develop

Release 0.12.1

Author: QLutz

.gitignore

@@ -87,6 +87,7 @@ celerybeat-schedule
 .Senv
 venv/
 ENV/
+venv-3.8/
 
 # Spyder project settings
 .spyderproject

.travis.yml

@@ -5,7 +5,7 @@ python:
 - 3.6
 install:
   - pip install -U tox-travis
-  - pip install coverage
+  - pip install codecov
 env:
   - SKNETWORK_DISABLE_NUMBA=false
   - SKNETWORK_DISABLE_NUMBA=true
@@ -23,4 +23,4 @@ deploy:
     python: 3.6
     env: $SKNETWORK_DISABLE_NUMBA=true
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - codecov

HISTORY.rst

@@ -2,6 +2,13 @@
 History
 =======
 
+0.12.1 (2020-01-20)
+-------------------
+
+* Added heat kernel based node classifier
+* Updated loaders for WikiLinks
+* Fixed file-related issues for Windows
+
 0.12.0 (2019-12-10)
 -------------------
 

docs/conf.py

@@ -174,6 +174,8 @@
      'Miscellaneous'),
 ]
 
+collapse_navigation = True
+
 
 def setup(app):
     app.add_css_file('css/custom.css')

docs/reference/classification.rst

@@ -19,3 +19,14 @@ MaxRank
     :show-inheritance:
     :inherited-members:
     :members:
+
+MaxDiff
+-------
+.. autoclass:: sknetwork.classification.MaxDiff
+    :inherited-members:
+    :members:
+
+.. autoclass:: sknetwork.classification.BiMaxDiff
+    :show-inheritance:
+    :inherited-members:
+    :members:

docs/reference/soft_classification.rst

@@ -20,3 +20,14 @@ MultiRank
     :show-inheritance:
     :inherited-members:
     :members:
+
+MultiDiff
+---------
+.. autoclass:: sknetwork.soft_classification.MultiDiff
+    :inherited-members:
+    :members:
+
+.. autoclass:: sknetwork.soft_classification.BiMultiDiff
+    :show-inheritance:
+    :inherited-members:
+    :members:

docs/tutorials/classification/index.rst

@@ -5,5 +5,6 @@ Classification
 .. toctree::
 
    maxrank
+   maxdiff
 
 

docs/tutorials/classification/maxdiff.ipynb

@@ -90,7 +90,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "seeds = {i: labels_true[i] for i in [0,33]}"
+    "seeds = {i: labels_true[i] for i in [0, 33]}"
    ]
   },
   {
@@ -183,7 +183,7 @@
    "source": [
     "# Warning: If the image does not appear, run the cell again.\n",
     "nx.draw(graph, pos, node_color=[COLORS[labels_pred[i]] for i in graph])\n",
-    "nx.draw_networkx_nodes(graph, pos, nodelist = list(seeds.keys()), node_color = 'k', node_size = 30)"
+    "nx.draw_networkx_nodes(graph, pos, nodelist=list(seeds.keys()), node_color='k', node_size=30)"
    ]
   },
   {
@@ -302,7 +302,7 @@
    "source": [
     "# Warning: If the image does not appear, run the cell again.\n",
     "nx.draw(graph, pos, node_color=[COLORS[labels[i]] for i in graph], labels=names)\n",
-    "nx.draw_networkx_nodes(graph, pos, nodelist = list(seeds.keys()), node_color = 'k', node_size = 30)"
+    "nx.draw_networkx_nodes(graph, pos, nodelist=list(seeds.keys()), node_color='k', node_size=30)"
    ]
   },
   {
@@ -425,7 +425,7 @@
    }
   },
   "toc": {
-   "base_numbering": 1,
+   "base_numbering": 1.0,
    "nav_menu": {},
    "number_sections": true,
    "sideBar": true,

docs/tutorials/classification/maxrank.ipynb

@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Loading data from existing dataset, here [Vital Wikipedia](https://graphs.telecom-paristech.fr/)."
+    "Loading data from existing dataset, here [WikiVitals](https://graphs.telecom-paristech.fr/)."
    ]
   },
   {
@@ -54,7 +54,7 @@
    },
    "outputs": [],
    "source": [
-    "data = skn.data.load_wikilinks_dataset('vital_wikipedia')"
+    "data = skn.data.load_wikilinks_dataset('wikivitals')"
    ]
   },
   {
@@ -250,7 +250,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.5"
+   "version": "3.7.4"
   },
   "pycharm": {
    "stem_cell": {