Skip to content

Commit

Permalink
revert to 2edc788da493 to fix broken merge
Browse files Browse the repository at this point in the history
  • Loading branch information
clstaudt committed Aug 19, 2015
1 parent a8689b4 commit 0a89c94
Show file tree
Hide file tree
Showing 352 changed files with 2,686,940 additions and 7,628 deletions.
6 changes: 6 additions & 0 deletions .hgignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ build.conf
src/python/NetworKit.egg-info/
NetworKit-Tests-D

scripts/SparsificationEvaluation/input/
scripts/SparsificationEvaluation/output/
scripts/SparsificationEvaluation/figures
input/backbones/
build/

syntax: regexp
^output$
syntax: regexp
Expand Down
2 changes: 1 addition & 1 deletion Doc/DevGuide.mdown
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ This command will compile the _NetworKit extension and then run all test cases o

### Test-driven development

If you implement a new feature for NetworKit, we encourage you to adapt your development process to test driven development. This means that you start with a one ore ideally several test-cases for your feature and then write the feature for the test case(s). If your feature is mostly implemented in C++, you should write your test cases there. If you expose your feature to Python, you should also write a test case for the extension module on the Python layer. The same applies for features in Pyton.
If you implement a new feature for NetworKit, we encourage you to adapt your development process to test driven development. This means that you start with a one or ideally several test-cases for your feature and then write the feature for the test case(s). If your feature is mostly implemented in C++, you should write your test cases there. If you expose your feature to Python, you should also write a test case for the extension module on the Python layer. The same applies for features in Pyton.


### Code Style
Expand Down
371 changes: 371 additions & 0 deletions Doc/Notebooks/Link Prediction.ipynb

Large diffs are not rendered by default.

Empty file modified Doc/Notebooks/NetworKit_Tutorial_Part_1.ipynb
100755 → 100644
Empty file.
Empty file modified Doc/Notebooks/NetworKit_Tutorial_Part_2.ipynb
100755 → 100644
Empty file.
Empty file modified Doc/Notebooks/NetworKit_Tutorial_Part_3.ipynb
100755 → 100644
Empty file.
Empty file modified Doc/Notebooks/NetworKit_Tutorial_Part_4.ipynb
100755 → 100644
Empty file.
593 changes: 201 additions & 392 deletions Doc/Notebooks/NetworKit_UserGuide.ipynb

Large diffs are not rendered by default.

Empty file modified Doc/Notebooks/Tutorial_Solutions_Part_4.ipynb
100755 → 100644
Empty file.
16 changes: 8 additions & 8 deletions Doc/docs/c++/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -754,9 +754,9 @@ WARN_LOGFILE =
# spaces.
# Note: If this tag is empty the current directory is searched.

INPUT = ../../src/cpp \
c++/mainpage \
c++/modules
INPUT = ../../networkit/cpp \
c++/mainpage.dox \
c++/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
Expand Down Expand Up @@ -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 =
HTML_HEADER = c++/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
Expand All @@ -1058,7 +1058,7 @@ HTML_HEADER =
# that doxygen normally uses.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_FOOTER =
HTML_FOOTER = c++/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
Expand All @@ -1070,7 +1070,7 @@ HTML_FOOTER =
# obsolete.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_STYLESHEET =
HTML_STYLESHEET = c++/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
Expand All @@ -1081,7 +1081,7 @@ HTML_STYLESHEET =
# see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET =
HTML_EXTRA_STYLESHEET = c++/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
Expand Down Expand Up @@ -1137,7 +1137,7 @@ HTML_TIMESTAMP = YES
# The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_DYNAMIC_SECTIONS = NO
HTML_DYNAMIC_SECTIONS = YES

# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
# shown in the various tree structured indices initially; the user can expand
Expand Down
Loading

0 comments on commit 0a89c94

Please sign in to comment.