Skip to content
This repository has been archived by the owner on Jun 23, 2023. It is now read-only.

Update develop with master #152

Merged
merged 23 commits into from
Mar 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
22bba7b
Merge pull request #136 from PoisotLab/develop
tpoisot Jul 8, 2019
5c7cf19
update the null doc
tpoisot Jul 22, 2019
2e5e606
:memo: update doc
tpoisot Jul 23, 2019
9584b76
Merge pull request #142 from PoisotLab/fix-doc-null
tpoisot Jul 23, 2019
2e95f9e
Update README.md
tpoisot Jul 24, 2019
f674f7c
Merge pull request #143 from PoisotLab/fix-readme-url
tpoisot Jul 24, 2019
6e58858
:hand: start to work on #147
tpoisot Oct 16, 2019
693bf1e
:whiskey: add the spectral radius code in #147
tpoisot Oct 16, 2019
1c81743
:tada: document spectral radius
tpoisot Oct 16, 2019
24d5f66
:book: add spectral radius to doc
tpoisot Oct 16, 2019
65065fd
:book: add missing docstring
tpoisot Oct 16, 2019
7983259
:tada: add three correction schemes for the spectral radius
tpoisot Oct 16, 2019
72c5e69
:bug: correct default argument
tpoisot Oct 16, 2019
d787139
:bug: fix return line
tpoisot Oct 16, 2019
a7d7461
:bug: get the max value
tpoisot Oct 16, 2019
90c56b8
:bug: the matrix must be symmetrical
tpoisot Oct 16, 2019
6d0b39a
:white_check_mark: spectral radius tests
tpoisot Oct 16, 2019
496eb1f
Merge pull request #148 from PoisotLab/feature-spectral-radius
tpoisot Oct 17, 2019
68fff2f
Delete Manifest.toml
tpoisot Oct 17, 2019
6c655b5
Update Project.toml
tpoisot Oct 17, 2019
3010de6
:bug: spectral radius returns NaN when the nertwork is empty
tpoisot Nov 18, 2019
828935c
Install TagBot as a GitHub Action
JuliaTagBot Feb 8, 2020
da8d377
Merge pull request #151 from JuliaTagBot/master
tpoisot Mar 30, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: TagBot
on:
schedule:
- cron: 0 * * * *
jobs:
TagBot:
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ EcologicalNetwork.tar.gz
docs/build/
docs/site/
network.png
Manifest.toml
206 changes: 0 additions & 206 deletions Manifest.toml

This file was deleted.

10 changes: 8 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name = "EcologicalNetworks"
uuid = "f03a62fe-f8ab-5b77-a061-bb599b765229"
authors = ["Timothée Poisot <[email protected]>"]
repo = "https://github.com/PoisotLab/EcologicalNetworks.jl"
version = "0.2.0"
version = "0.2.2"

[deps]
Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
Expand All @@ -13,7 +14,12 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
julia = "1"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ networks. The current version is compatible with `julia` version 1.0 and 0.7.
[![](https://img.shields.io/badge/docs-dev-orange.svg)](https://PoisotLab.github.io/EcologicalNetworks.jl/dev)
[![Join the chat at https://gitter.im/PoisotLab/EcologicalNetworks.jl](https://badges.gitter.im/PoisotLab/EcologicalNetworks.jl.svg)](https://gitter.im/PoisotLab/EcologicalNetworks.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

There is a short bibliography of the methods in the [package
documentation][pdocref], and in the documentations of each function.

[pdocref]: http://poisotlab.io/EcologicalNetworks.jl/latest/#references

## Getting started

Install (from the package mode):
Expand Down
64 changes: 34 additions & 30 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Pkg

tmp_packages = ["EcologicalNetworksPlots", "Plots"]
tmp_packages = ["EcologicalNetworksPlots", "Plots", "Documenter"]

push!(LOAD_PATH,"../src/")

Expand All @@ -11,38 +11,42 @@ Pkg.add.(tmp_packages) # IMPORTANT
using Documenter
using EcologicalNetworks
using EcologicalNetworksPlots
using Random

makedocs(
sitename = "EcologicalNetworks",
authors = "Timothée Poisot",
modules = [EcologicalNetworks, EcologicalNetworksPlots],
pages = [
"Index" => "index.md",
"Interface" => [
"Types" => "interface/types.md",
"Conversions" => "interface/conversions.md",
"Core functions" => "interface/highlevel.md"
],
"Network measures" => [
"Links" => "properties/links.md",
"Modularity" => "properties/modularity.md",
"Nestedness" => "properties/nestedness.md",
"Motifs" => "properties/motifs.md",
"Centrality and paths" => "properties/paths.md",
"Overlap and similarity" => "properties/overlap.md",
"Null models" => "properties/nullmodels.md",
"Beta-diversity" => "properties/betadiversity.md",
"Resilience" => "properties/resilience.md",
"Information theory" => "properties/information.md"
],
"Plots" => "plots.md"
]
)
sitename = "EcologicalNetworks",
authors = "Timothée Poisot",
modules = [EcologicalNetworks, EcologicalNetworksPlots],
pages = [
"Index" => "index.md",
"Interface" => [
"Types" => "interface/types.md",
"Conversions" => "interface/conversions.md",
"Core functions" => "interface/highlevel.md",
"Plotting" => "var/plots.md"
],
"Network measures" => [
"Links" => "properties/links.md",
"Modularity" => "properties/modularity.md",
"Nestedness" => "properties/nestedness.md",
"Motifs" => "properties/motifs.md",
"Centrality and paths" => "properties/paths.md",
"Overlap and similarity" => "properties/overlap.md",
"Beta-diversity" => "properties/betadiversity.md",
"Resilience" => "properties/resilience.md",
"Information theory" => "properties/information.md"
],
"Random networks" => [
"Null models" => "random/null.md",
"Structural models" => "random/structure.md"
]
]
)

deploydocs(
deps = Deps.pip("pygments", "python-markdown-math"),
repo = "github.com/PoisotLab/EcologicalNetworks.jl.git",
devbranch = "master"
)
deps = Deps.pip("pygments", "python-markdown-math"),
repo = "github.com/PoisotLab/EcologicalNetworks.jl.git",
devbranch = "master"
)

Pkg.rm.(tmp_packages) # IMPORTANT
Loading