merged Dev -> default

.hgignore

@@ -14,6 +14,15 @@ build.conf
 /_NetworKit.cpp$
 src/python/NetworKit.egg-info/
 NetworKit-Tests-D
+lamg-2.2-2
+CMG_101014
+instances
+bench*
+.cproject
+.project
+.settings*
+Benchmark*
+plots
 \.out$
 \.egg$
 \~$
@@ -30,6 +39,8 @@ scripts/SparsificationEvaluation/output/
 scripts/SparsificationEvaluation/figures
 input/backbones/
 build/
+Doc/Website
+Doc/Documentation
 
 syntax: regexp
 ^output$

Doc/Notebooks/NetworKit_Tutorial_Part_1.ipynb

@@ -111,7 +111,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "/Users/cls/workspace/NetworKit\n"
+      "[Errno 2] No such file or directory: '/Users/Henning/workspace/NetworKit/'\n",
+      "/Users/Henning/Documents/workspace/NetworKit/Doc/Notebooks\n"
      ]
     }
    ],
@@ -129,13 +130,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "ename": "TypeError",
+     "evalue": "readGraph() missing 1 required positional argument: 'fileformat'",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[0;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
+      "\u001b[0;32m<ipython-input-5-43be59d72eed>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mG\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mreadGraph\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"input/PGPgiantcompo.graph\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
+      "\u001b[0;31mTypeError\u001b[0m: readGraph() missing 1 required positional argument: 'fileformat'"
+     ]
+    }
+   ],
    "source": [
-    "G = readGraph(\"input/PGPgiantcompo.graph\", Format.METIS)"
+    "G = readGraph(\"input/PGPgiantcompo.graph\")"
    ]
   },
   {
@@ -153,19 +166,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "10680 24316\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "n = G.numberOfNodes()\n",
     "m = G.numberOfEdges()\n",
@@ -174,22 +179,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "b'Graph(name=PGPgiantcompo, n=10680, m=24316)'"
-      ]
-     },
-     "execution_count": 6,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "G.toString()"
    ]
@@ -203,20 +197,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]\n",
-      "[(42, 11), (101, 28), (111, 92), (128, 87), (141, 0), (165, 125), (169, 111), (176, 143), (187, 38), (192, 105)]\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "V = G.nodes()\n",
     "print(V[:10])\n",
@@ -233,20 +218,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Weight of existing edge: 1.0\n",
-      "Weight of nonexisting edge: 0.0\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "edgeExists = G.hasEdge(42,11)\n",
     "if edgeExists:\n",
@@ -263,19 +239,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Number of nodes with more than 100 neighbors:  6\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "count = 0 # counts number of nodes with more than 100 neighbors\n",
     "for v in G.nodes():\n",
@@ -317,7 +285,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
@@ -343,7 +311,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.4.3"
+   "version": "3.4.2"
   }
  },
  "nbformat": 4,

Doc/docs/c++/Doxyfile → Doc/doc/Doxyfile

@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ../../../NetworKit-Doc/
+OUTPUT_DIRECTORY       = ../Website/html/api/
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -755,8 +755,8 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ../../networkit/cpp \
-						 c++/mainpage.dox \
-						 c++/modules.dox
+						 mainpage.dox \
+						 modules.dox
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1048,7 +1048,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            = c++/doxystyle/doxygen_header.html
+HTML_HEADER            = doxystyle/doxygen_header.html
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1058,7 +1058,7 @@ HTML_HEADER            = c++/doxystyle/doxygen_header.html
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            = c++/doxystyle/doxygen_footer.html
+HTML_FOOTER            = doxystyle/doxygen_footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1070,7 +1070,7 @@ HTML_FOOTER            = c++/doxystyle/doxygen_footer.html
 # obsolete.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_STYLESHEET        = c++/doxystyle/doxygen.css
+HTML_STYLESHEET        = doxystyle/doxygen.css
 
 # The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
 # defined cascading style sheet that is included after the standard style sheets
@@ -1081,7 +1081,7 @@ HTML_STYLESHEET        = c++/doxystyle/doxygen.css
 # see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = c++/doxystyle/doxygen-extra.css
+HTML_EXTRA_STYLESHEET  = doxystyle/doxygen-extra.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note