Skip to content

Commit

Permalink
Merge branch 'master' into vector-tests
Browse files Browse the repository at this point in the history
# Conflicts:
#	raphtory/src/search/mod.rs
#	raphtory/src/vectors/mod.rs
  • Loading branch information
ricopinazo committed Oct 2, 2023
2 parents fb7c126 + c7de680 commit 45960e6
Show file tree
Hide file tree
Showing 152 changed files with 4,203 additions and 2,319 deletions.
174 changes: 86 additions & 88 deletions .environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,91 +26,89 @@ dependencies:
- xz>=5.2.5
- zlib>=1.2.12
- pip:
- accessible-pygments==0.0.4
- alabaster==0.7.13
- appnope==0.1.3
- asttokens==2.2.1
- attrs==23.1.0
- autodocsumm==0.2.11
- Babel==2.12.1
- backcall==0.2.0
- beautifulsoup4==4.12.2
- bleach==6.0.0
- certifi==2023.5.7
- charset-normalizer==3.1.0
- contourpy==1.1.0
- cycler==0.11.0
- decorator==5.1.1
- defusedxml==0.7.1
- docutils==0.19
- executing==1.2.0
- fastjsonschema==2.17.1
- fonttools==4.40.0
- idna==3.4
- imagesize==1.4.1
- ipython==8.14.0
- jedi==0.18.2
- Jinja2==3.1.2
- jsonpickle==3.0.1
- jsonschema==4.17.3
- jupyter_client==8.3.0
- jupyter_core==5.3.1
- jupyterlab-pygments==0.2.2
- kiwisolver==1.4.4
- MarkupSafe==2.1.3
- matplotlib==3.7.1
- matplotlib-inline==0.1.6
- maturin==1.1.0
- mistune==3.0.1
- nbclient==0.8.0
- nbconvert==7.6.0
- nbformat==5.9.0
- nbsphinx==0.9.2
- networkx==3.1
- numpy==1.25.0
- numpydoc==1.5.0
- packaging==23.1
- pandas==2.0.3
- pandocfilters==1.5.0
- parso==0.8.3
- pexpect==4.8.0
- pickleshare==0.7.5
- Pillow==10.0.0
- platformdirs==3.8.0
- prompt-toolkit==3.0.39
- ptyprocess==0.7.0
- pure-eval==0.2.2
- pydata-sphinx-theme==0.13.3
- Pygments==2.15.1
- pyparsing==3.1.0
- pyrsistent==0.19.3
- python-dateutil==2.8.2
- pytz==2023.3
- pyvis==0.3.2
- pyzmq==25.1.0
- requests==2.31.0
- six==1.16.0
- snowballstemmer==2.2.0
- soupsieve==2.4.1
- Sphinx==6.2.1
- sphinx-copybutton==0.5.2
- sphinx-toggleprompt==0.4.0
- sphinx_design==0.4.1
- sphinxcontrib-applehelp==1.0.4
- sphinxcontrib-devhelp==1.0.2
- sphinxcontrib-htmlhelp==2.0.1
- sphinxcontrib-jsmath==1.0.1
- sphinxcontrib-qthelp==1.0.3
- sphinxcontrib-serializinghtml==1.1.5
- stack-data==0.6.2
- tinycss2==1.2.1
- tomli==2.0.1
- tornado==6.3.2
- traitlets==5.9.0
- typing_extensions==4.7.1
- tzdata==2023.3
- urllib3==2.0.3
- wcwidth==0.2.6
- webencodings==0.5.1


- aiohttp==3.8.5
- aiosignal==1.3.1
- appnope==0.1.3
- asttokens==2.4.0
- async-timeout==4.0.3
- attrs==23.1.0
- autodocsumm==0.2.11
- backcall==0.2.0
- backoff==2.2.1
- bleach==6.0.0
- botocore==1.31.53
- certifi==2023.7.22
- contourpy==1.1.1
- cycler==0.11.0
- decorator==5.1.1
- defusedxml==0.7.1
- docopt==0.6.2
- exceptiongroup==1.1.3
- executing==1.2.0
- fastjsonschema==2.18.0
- fonttools==4.42.1
- frozenlist==1.4.0
- gql==3.4.1
- graphql-core==3.2.3
- ipython==8.15.0
- jedi==0.19.0
- jmespath==1.0.1
- jsonpickle==3.0.2
- jsonschema==4.19.1
- jsonschema-specifications==2023.7.1
- jupyter_client==8.3.1
- jupyter_core==5.3.1
- jupyterlab-pygments==0.2.2
- kiwisolver==1.4.5
- matplotlib==3.8.0
- matplotlib-inline==0.1.6
- maturin==1.2.3
- mistune==3.0.1
- multidict==6.0.4
- nbclient==0.8.0
- nbconvert==7.8.0
- nbformat==5.9.2
- nbsphinx==0.9.3
- networkx==3.1
- numpy==1.26.0
- numpydoc==1.5.0
- pandas==2.1.1
- pandocfilters==1.5.0
- parso==0.8.3
- pexpect==4.8.0
- pickleshare==0.7.5
- Pillow==10.0.1
- pipreqs==0.4.13
- platformdirs==3.10.0
- prompt-toolkit==3.0.39
- ptyprocess==0.7.0
- pure-eval==0.2.2
- pyarrow==13.0.0
- pydata-sphinx-theme==0.14.1
- pyparsing==3.1.1
- python-dateutil==2.8.2
- pyvis==0.3.2
- pyzmq==25.1.1
- referencing==0.30.2
- requests-toolbelt==0.10.1
- rpds-py==0.10.3
- six==1.16.0
- sphinx-automodapi==0.16.0
- sphinx-autosummary-accessors==2023.4.0
- sphinx-copybutton==0.5.2
- sphinx-favicon==1.0.1
- sphinx_design==0.5.0
- sphinx-notfound-page==1.0.0
- stack-data==0.6.2
- tinycss2==1.2.1
- tomli==2.0.1
- tornado==6.3.3
- traitlets==5.10.0
- typing_extensions==4.8.0
- tzdata==2023.3
- urllib3==1.26.16
- wcwidth==0.2.6
- webencodings==0.5.1
- websockets==10.4
- yarg==0.1.9
- yarl==1.9.2
8 changes: 4 additions & 4 deletions comparison-benchmark/rust/raphtory-rust-benchmark/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use csv::StringRecord;
use flate2::read::GzDecoder;
use raphtory::{
algorithms::{
algorithm_result::AlgorithmResult, connected_components::weakly_connected_components,
pagerank::unweighted_page_rank,
algorithm_result::AlgorithmResult, centrality::pagerank::unweighted_page_rank,
community_detection::connected_components::weakly_connected_components,
},
graph_loader::{fetch_file, source::csv_loader::CsvLoader},
prelude::{AdditionOps, Graph, GraphViewOps, VertexViewOps, NO_PROPS},
Expand Down Expand Up @@ -202,11 +202,11 @@ fn main() {
.collect();
println!("Page rank: {} seconds", now.elapsed().as_secs_f64());

// connected components with time
// connected community_detection with time
now = Instant::now();
let _cc: AlgorithmResult<String, u64> = weakly_connected_components(&g, usize::MAX, None);
println!(
"Connected components: {} seconds",
"Connected community_detection: {} seconds",
now.elapsed().as_secs_f64()
);
}
31 changes: 0 additions & 31 deletions docs/LICENSE

This file was deleted.

102 changes: 51 additions & 51 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
accessible-pygments==0.0.4
alabaster==0.7.13
aiohttp==3.8.5
aiosignal==1.3.1
appnope==0.1.3
asttokens==2.2.1
asttokens==2.4.0
async-timeout==4.0.3
attrs==23.1.0
autodocsumm==0.2.11
Babel==2.12.1
backcall==0.2.0
beautifulsoup4==4.12.2
backoff==2.2.1
bleach==6.0.0
botocore==1.31.53
certifi==2023.7.22
charset-normalizer==3.1.0
contourpy==1.1.0
contourpy==1.1.1
cycler==0.11.0
decorator==5.1.1
defusedxml==0.7.1
docutils==0.19
docopt==0.6.2
exceptiongroup==1.1.3
executing==1.2.0
fastjsonschema==2.17.1
fonttools==4.40.0
idna==3.4
imagesize==1.4.1
ipython==8.14.0
jedi==0.18.2
Jinja2==3.1.2
jsonpickle==3.0.1
jsonschema==4.17.3
jupyter_client==8.3.0
fastjsonschema==2.18.0
fonttools==4.42.1
frozenlist==1.4.0
gql==3.4.1
graphql-core==3.2.3
ipython==8.15.0
jedi==0.19.0
jmespath==1.0.1
jsonpickle==3.0.2
jsonschema==4.19.1
jsonschema-specifications==2023.7.1
jupyter_client==8.3.1
jupyter_core==5.3.1
jupyterlab-pygments==0.2.2
kiwisolver==1.4.4
MarkupSafe==2.1.3
matplotlib==3.7.1
kiwisolver==1.4.5
matplotlib==3.8.0
matplotlib-inline==0.1.6
maturin==1.1.0
maturin==1.2.3
mistune==3.0.1
multidict==6.0.4
nbclient==0.8.0
nbconvert==7.6.0
nbformat==5.9.0
nbsphinx==0.9.2
nbconvert==7.8.0
nbformat==5.9.2
nbsphinx==0.9.3
networkx==3.1
numpy==1.25.0
numpy==1.26.0
numpydoc==1.5.0
packaging==23.1
pandas==2.0.3
pandas==2.1.1
pandocfilters==1.5.0
parso==0.8.3
pexpect==4.8.0
pickleshare==0.7.5
Pillow==10.0.0
platformdirs==3.8.0
Pillow==10.0.1
pipreqs==0.4.13
platformdirs==3.10.0
prompt-toolkit==3.0.39
ptyprocess==0.7.0
pure-eval==0.2.2
pydata-sphinx-theme==0.13.3
Pygments==2.15.1
pyparsing==3.1.0
pyrsistent==0.19.3
pyarrow==13.0.0
pydata-sphinx-theme==0.14.1
pyparsing==3.1.1
python-dateutil==2.8.2
pytz==2023.3
pyvis==0.3.2
pyzmq==25.1.0
requests==2.31.0
pyzmq==25.1.1
referencing==0.30.2
requests-toolbelt==0.10.1
rpds-py==0.10.3
six==1.16.0
snowballstemmer==2.2.0
soupsieve==2.4.1
sphinx==6.2.1
sphinx-automodapi==0.16.0
sphinx-autosummary-accessors==2023.4.0
sphinx-copybutton==0.5.2
sphinx-toggleprompt==0.4.0
sphinx_design==0.4.1
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
sphinx-favicon==1.0.1
sphinx_design==0.5.0
stack-data==0.6.2
tinycss2==1.2.1
tomli==2.0.1
tornado==6.3.3
traitlets==5.9.0
typing_extensions==4.7.1
traitlets==5.10.0
typing_extensions==4.8.0
tzdata==2023.3
urllib3==2.0.3
urllib3==1.26.16
wcwidth==0.2.6
webencodings==0.5.1
websockets==10.4
yarg==0.1.9
yarl==1.9.2
sphinx-notfound-page==1.0.0
12 changes: 12 additions & 0 deletions docs/source/404.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
:orphan:
.. _notfound:

Page Not Found
==============

Sorry, the page you are looking for cannot be found.

.. image:: _static/pomegranate-mascot.png
:alt: 404 Cute Pomegranate mascot
:align: center

Loading

0 comments on commit 45960e6

Please sign in to comment.