Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.0.0 #69

Merged
merged 242 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
242 commits
Select commit Hold shift + click to select a range
fedf8b6
Updated manynet logo with stocnet address and colorsafe colorway
jhollway Apr 30, 2024
75dffb5
Added node_is_independent() for identifying nodes in largest independ…
jhollway May 2, 2024
0deeca3
mark_nodes functions now infer network context
jhollway May 2, 2024
4cbe7b8
Added ison_greys dataset
May 10, 2024
03a5cc9
Fixed bug in diffusion tutorial because minMSE not being declared
May 10, 2024
33483ad
Version bump and NEWS
May 10, 2024
7fedb19
Updated ison_friends to be explicitly longitudinal
jhollway May 23, 2024
c951858
Fixed bug in create_core() where the membership inferred when passing…
jhollway May 23, 2024
1a1ffbf
is_multiplex() now excludes reserved tie attribute names other than type
jhollway May 23, 2024
5e3adfd
Updated data documentation with revised multiplex definition
jhollway May 23, 2024
c26a510
Restructured graphr, graphs, and grapht code
jhollway May 23, 2024
2b7f306
Updated NEWS
jhollway May 23, 2024
d3667e3
Drop guides/legends for node size and shape where there is no variation
jhollway May 24, 2024
b6e5601
Reexported ggplot2::scale_size()
jhollway May 24, 2024
babbdb1
Better legend title where there is variation in node_size
jhollway May 24, 2024
cfbcfbb
Added internal node size rescaling step, but wip
jhollway May 24, 2024
7198219
Added `{minMSE}` to decsription since it is now explicitly imported i…
henriquesposito May 24, 2024
e3636bf
Renamed logo files to avoid test issues
henriquesposito May 24, 2024
06089b8
Commented out tests related to node attributes to avoid issues, for now
henriquesposito May 24, 2024
54d0b40
Fixed issues with tests for scales and themes
henriquesposito May 24, 2024
fd55ae5
Better scaling for node size
jhollway May 24, 2024
2363cdf
Updated NEWS
jhollway May 24, 2024
3554dae
Added more git explanation
jhollway May 24, 2024
250432d
Added population data to ison_usstates
jhollway May 24, 2024
39270bc
Some further community documentation changes
jhollway May 25, 2024
16903d0
Added more informative mesgaes for when users might have mispelled va…
henriquesposito Jun 4, 2024
6dbb864
Added tests for variable names check in `autographr()`
henriquesposito Jun 4, 2024
28a7ccc
Updated "concentric" layout to create layout even if some names are e…
henriquesposito Jun 5, 2024
3ba2a34
Updated "concentric" layout to construct layout even when node names …
henriquesposito Jun 5, 2024
e86e4f2
Added tests for new changes in concentric layout
henriquesposito Jun 5, 2024
8ac73e8
Fixed issues with default "hierarchy" layout for two mode networks
henriquesposito Jun 5, 2024
8a193a5
Added tests for "hierarchy" layout for two mode networks
henriquesposito Jun 5, 2024
905bee6
Updated NEWS for new changes
henriquesposito Jun 5, 2024
f505b2f
Updated NEWS for new changes
henriquesposito Jun 5, 2024
aa2bf02
Added more tests for node mark functions
henriquesposito Jun 5, 2024
43c8d7b
Fixed issues with additional tests for node marks
henriquesposito Jun 5, 2024
0a1c840
Added additional tests to tie mark functions
henriquesposito Jun 6, 2024
8b75e83
Added descriptions to tutorials
jhollway Jun 13, 2024
8b03305
Added to_correlation()
jhollway Jun 14, 2024
869aea7
Fixed documentation in to_correlation()
jhollway Jun 14, 2024
8daf7fa
Added diffnet methods for as_igraph(), as_network(), and as_tidygraph()
jhollway Jun 14, 2024
35c67a3
Added diff_model methods for as_igraph() and as_matrix()
jhollway Jun 14, 2024
d7de527
Added as_diffnet.diff_model() to coerce diff_model results into diffn…
jhollway Jun 14, 2024
d934966
Added as_diff_model.diffnet() to coerce diffnet objects into diff_model
jhollway Jun 14, 2024
5a26f6e
Added as_diff_model() to coercion table/figure
jhollway Jun 15, 2024
9746b53
Fixed as_diffnet documentation
jhollway Jun 17, 2024
4dbeca4
Added to_correlation() tests
jhollway Jun 17, 2024
99c1b93
Added an explicit contact argument to play_diffusion, which can be us…
jhollway Jun 17, 2024
6edb5b8
diffusion tutorial now uses graph*() instead of autograph*()
jhollway Jun 17, 2024
1fb2b07
pkg_data() renamed to table_data(), the former now defunct, split int…
jhollway Jun 17, 2024
7c4ef84
Trimmed package size by dropping old logos
jhollway Jun 17, 2024
137205b
Added top/bot/3/5 helpers for testing
jhollway Jun 17, 2024
2df1909
Migrated class_measures from migraph
jhollway Jun 17, 2024
127d987
Changed properties from mapping to measuring, functions now make_netw…
jhollway Jun 17, 2024
105cff6
Changed attributes from mapping to measuring, renamed node_mode() to …
jhollway Jun 17, 2024
5bd0b61
Filled in NAMESPACE, added globalVariable for .data
jhollway Jun 17, 2024
e9355ea
Migrated closure measures from migraph
jhollway Jun 17, 2024
cd43da3
Migrated heterogeneity measures from migraph
jhollway Jun 17, 2024
15b5fe3
Migrated hierarchy measures from migraph
jhollway Jun 17, 2024
abc9a88
Migrated holes measures from migraph
jhollway Jun 17, 2024
d688932
Migrated cohesion measures from migraph
jhollway Jun 17, 2024
edefeb6
Migrated diffusion measures from migraph
jhollway Jun 17, 2024
45ae620
Migrated all centrality measures over from migraph
jhollway Jun 17, 2024
39f785c
Migrated centrality tutorial from migraph
jhollway Jun 17, 2024
24987f6
graphr() is now the default, autographr() has been deprecated
jhollway Jun 17, 2024
ac9ab22
Renamed autographs() to graphs()
jhollway Jun 17, 2024
769b494
Renamed autographd() to grapht()
jhollway Jun 17, 2024
bf998bc
Updated pkgdown to includes measures, graph*
jhollway Jun 17, 2024
b82ab15
#major bump as manynet gains measures, grows more mature
jhollway Jun 17, 2024
d0864b6
Used node_is_mode() now within functions
jhollway Jun 18, 2024
837f128
Fixed documentation
jhollway Jun 18, 2024
6357c51
updated function names in visualisation and centrality tutorials
jaeltan Jun 18, 2024
31ddd76
re-rendered html files for centrality and visualisation tutorials
jaeltan Jun 18, 2024
95e24a5
Documentation should use graphr()
jhollway Jun 18, 2024
1ee27da
Making sure make_node_measure() uses manynet::node_is_mode()
jhollway Jun 18, 2024
c82bf93
Fixing globalVariables issue
jhollway Jun 18, 2024
ea8bac9
More renaming to graphr()
jhollway Jun 18, 2024
961dbc8
Since network_nodes() now returns a network_measure class object, tes…
jhollway Jun 18, 2024
bfa209a
Using c() to remove classing
jhollway Jun 18, 2024
309b8d7
c() to strip network_nodes of class
jhollway Jun 18, 2024
bb65862
Updated tests for measure holes' functions
henriquesposito Jun 18, 2024
2159ce6
Using manynet functions in play_diffusion() where available
jhollway Jun 18, 2024
7e996fb
Fixed non-autograph test errors
jhollway Jun 18, 2024
d526967
Fixed autographr-related test issues
jhollway Jun 18, 2024
503e505
Fixed issue with `node_closeness()` to avoid `{rlang}` warnings
henriquesposito Jun 18, 2024
39e018e
Added generate_configuration() for generating configuration models in…
jhollway Jun 18, 2024
216ef5a
Found a faster way of creating two-mode configuration models
jhollway Jun 18, 2024
0d696a3
node_exposure() now works with two-mode networks, which means play_di…
jhollway Jun 18, 2024
4444b18
node_exposure() now only follows outgoing ties, making play_diffusion…
jhollway Jun 19, 2024
995f737
More helpful documentation for table_data()
jhollway Jun 19, 2024
d78b4f1
node_exposure() now works on signed networks, which means play_diffus…
jhollway Jun 19, 2024
e169035
Added is_attributed() to check for non-name/type nodal attributes
jhollway Jun 19, 2024
4be36b2
Migrated network_change() and network_stability() from migraph
jhollway Jun 19, 2024
dc9c083
table_data() now reserves enough room for the name of the dataset whe…
jhollway Jun 19, 2024
1dbbeb4
node_attribute() and tie_attribute() return measures when the output …
jhollway Jun 19, 2024
206e69c
Updated as_ documentation
jhollway Jun 19, 2024
ca22bcb
Added prevalence argument to play_diffusion() so that endogenous glob…
jhollway Jun 19, 2024
46baa03
Added class_members
jhollway Jun 20, 2024
67587f2
Added class motifs
jhollway Jun 20, 2024
3b34b04
Migrated census measures from migraph, *_census() now renamed *_by_*(…
jhollway Jun 20, 2024
da6f961
Fixed bug in as_diff_model where events were out of order and named i…
jhollway Jun 20, 2024
dbe6702
Removed explicit reflexive dependence
jhollway Jun 20, 2024
979bd97
Exporting to namespace
jhollway Jun 20, 2024
94c4e7a
More changes to diffusion tutorial
jhollway Jun 20, 2024
bdd9139
Fixed message bug in graphs()
jhollway Jun 20, 2024
457f324
Retaining network_measure and network_motif classes
jhollway Jun 20, 2024
50b97b9
Migrated over_*() from migraph
jhollway Jun 20, 2024
c34e5cd
network_*() centrality measures renamed to net_*()
jhollway Jun 20, 2024
91a13fa
Updated centrality tests and tutorial
jhollway Jun 20, 2024
1de428b
Renamed network_*() properties functions to net_*()
jhollway Jun 20, 2024
68a7b1d
Renamed network_*() hierarchy measures with net_*()
jhollway Jun 20, 2024
016ebd3
Renamed network_*() heterogeneity measures with net_*()
jhollway Jun 20, 2024
7cf4dd1
Renamed network_*() closure measures with net_*()
jhollway Jun 20, 2024
d5744eb
Migrated k-selection functions from migraph
jhollway Jun 20, 2024
503adf5
Migrated cluster methods from migraph
jhollway Jun 20, 2024
c6c4e07
Migrated node_in_roulette() from migraph
jhollway Jun 20, 2024
cc93825
Migrated equivalence functions from migraph
jhollway Jun 20, 2024
fa8f4b1
Migrated component partitioning from migraph
jhollway Jun 20, 2024
6f0a53b
Migrated test_*() functions from migraph
jhollway Jun 20, 2024
8129a8b
Migrated node*core* functions from migraph
jhollway Jun 20, 2024
afdfb7e
Renamed network_*() diffusion measures to net_*()
jhollway Jun 20, 2024
99face1
Renamed network_*() cohesion measures net_*()
jhollway Jun 20, 2024
18e6b8e
Migrated feature measures from migraph
jhollway Jun 20, 2024
f00694a
Migrated node_in_adopter() from migraph
jhollway Jun 20, 2024
bb7e44d
Migrated community memberships from migraph
jhollway Jun 20, 2024
d99834c
Updated internals of many functions to use new net_*() syntax
jhollway Jun 20, 2024
65b97f5
Diffusion tutorial updated with new net_*() syntax
jhollway Jun 20, 2024
b8f9e73
Reverted to network_test class to retain backwards compatibility
jhollway Jun 20, 2024
b18df37
Ensured all census functions are now _by_
jhollway Jun 20, 2024
d4cc6f6
Dropped rlang dependency
jhollway Jun 20, 2024
d0aa29f
Fixed make_net_measure bug
jhollway Jun 20, 2024
dd81f0d
Fixed various test issues related to net_measure
jhollway Jun 20, 2024
d38c3f4
Dropped read_graphml testing to save space (nassau.graphml was 7.8MB+!)
jhollway Jun 20, 2024
010540b
Added remaining tutorials
jhollway Jun 20, 2024
46d5d95
Updated NEWS file
henriquesposito Jun 20, 2024
45d6407
Removed duplicated functions in measure diffusion
henriquesposito Jun 20, 2024
a5e02c9
Updated documentation
henriquesposito Jun 20, 2024
11c40fc
Minor edits to diffusion tutorial
jaeltan Jun 20, 2024
3795672
Merge branch 'develop' of https://github.com/stocnet/manynet into dev…
jaeltan Jun 20, 2024
56f8dbf
Updated pkgdown
jhollway Jun 20, 2024
734348b
Merge branch 'develop' of https://github.com/stocnet/manynet into dev…
jhollway Jun 20, 2024
f6282e6
Migrate measures of network change from migraph
jhollway Jun 20, 2024
3c14117
Fixed dependency bugs by adding some more suggests
jhollway Jun 20, 2024
2e4c143
Fixed some explicit dependence bugs
jhollway Jun 20, 2024
634059a
removed unnecessary legend code for graphs and corrected references t…
jaeltan Jun 20, 2024
daa2f53
Converted node_in_core() to node_is_core()
jhollway Jun 20, 2024
adcbb4b
Fixed various documentation issues
jhollway Jun 20, 2024
3f1effb
Rationalised member_/motif_ documentation
jhollway Jun 21, 2024
1b5814b
node_in_core() renamed to node_is_core() because it is now a mark
jhollway Jun 21, 2024
08d2d3c
network_ changed to net_ in pkgdown
jhollway Jun 21, 2024
bde4715
Fixed doc bug in member_diffusion, censuses now called motifs throughout
jhollway Jun 21, 2024
0d333a8
Added node_by_exposure() function to tabulate exposure across time
jhollway Jun 21, 2024
efc56cf
Added renamed network_*() functions to defunct list.
jaeltan Jun 21, 2024
e3187ff
Fixed ordering issues with `node_is_infected()`, `node_is_recovered()…
henriquesposito Jun 21, 2024
a2117d5
Updated NEWS and documentation for new changes with node_marks
henriquesposito Jun 21, 2024
e26a99d
Added new tests for node marks
henriquesposito Jun 21, 2024
090761a
Using colorsafe colors in diffusion plots and graphs
jhollway Jun 21, 2024
bf57998
Merge branch 'develop' of https://github.com/stocnet/manynet into dev…
jhollway Jun 21, 2024
050d542
Now that measures are in manynet, can use the main node_adoption_time…
jhollway Jun 21, 2024
081df83
Added previous versions of node_by_*(), net_by_*(), and node_in_*() f…
jaeltan Jun 21, 2024
ec3a31b
Merge branch 'develop' of https://github.com/stocnet/manynet into dev…
jaeltan Jun 21, 2024
9bcd011
Trimming manynet explicit from various internal function calls
jhollway Jun 21, 2024
d99ef5b
Merge branch 'develop' of https://github.com/stocnet/manynet into dev…
jhollway Jun 21, 2024
1b854dd
Corrected some doc
jhollway Jun 21, 2024
fba9292
plot.diff_model() now allows users to trim how many simulated steps a…
jhollway Jun 21, 2024
3834bc3
Remigrated tests to migraph to keep things consistent
jhollway Jun 21, 2024
4e43458
Added net_complete_infection() to measure how long a diffusion proces…
jhollway Jun 21, 2024
dfde729
Added %||% in case it is of utility
jhollway Jun 21, 2024
e073a03
Fixed node_adoption_time() bug in graphr()
jhollway Jun 21, 2024
2dc5652
Using magrittr pipe consistently to ensure backwards compatibility
jhollway Jun 21, 2024
38f96e6
Fixed node_is/in_core() bug
jhollway Jun 21, 2024
6134ca0
Dropped %||% for now
jhollway Jun 21, 2024
22ec75c
Inverted when graphr() complains about variable spelling
jhollway Jun 21, 2024
723d761
Closed #51 with larger nodes
jhollway Jun 21, 2024
878cc6d
play_diffusion() now accepts nodal attribute names for thresholds
jhollway Jun 21, 2024
082da53
Some more doc on thresholds
jhollway Jun 21, 2024
7b9def8
Trimmed all the setup start from the diffusion tutorial
jhollway Jun 21, 2024
d093272
Rewrote influence cascades section to hold new hands more and added f…
jhollway Jun 21, 2024
fb8e799
Rewrote linear thresholds section, including also a fun exercise with…
jhollway Jun 21, 2024
d66d0c4
Smaller diff tute and doc updates
jhollway Jun 21, 2024
368214e
plot.diff_model() now uses prettier breaks on the x-axis, and the all…
jhollway Jun 22, 2024
af5b6db
Renamed plot.diff_model argument to all_steps so that it is more obvi…
jhollway Jun 22, 2024
170bf29
play_diffusion() now accepts node names as seeds
jhollway Jun 22, 2024
977bfce
Consolidated diffusion coercion into single as_diffusion() generic
jhollway Jun 22, 2024
25a0f38
Fixed bug in diffnet coercion where s included those already infected
jhollway Jun 22, 2024
7236d3d
Made it easier to use diffusion metrics on diffnet objects directly b…
jhollway Jun 22, 2024
beb22b2
Renamed net_infection_length() to net_recovery() to avoid misundersta…
jhollway Jun 22, 2024
878e500
Added net_total_infection() to measure the proportion/number of nodes…
jhollway Jun 22, 2024
e811836
Fixed as_diffusion generic inconsistency
jhollway Jun 22, 2024
d20b08b
Corrected documentation to net_recovery()
jhollway Jun 22, 2024
6b8aa59
Corrected as_diffusion documentation
jhollway Jun 22, 2024
107caed
events needed to be explicit
jhollway Jun 22, 2024
4aed00b
Fixed issue with net_hazard() return
jhollway Jun 22, 2024
1abaa1b
Consolidated net_infection_*() functions together in own documentation
jhollway Jun 23, 2024
4742073
Added net_infection_peak() to identify when peak infection occurs in …
jhollway Jun 23, 2024
a04359f
Updated CRAN comments to explain the situation with migraph
jhollway Jun 23, 2024
13b2231
Added tests from migraph
jhollway Jun 23, 2024
23b29ee
Corrected smeg_diff doc
jhollway Jun 23, 2024
5034bcf
is_longitudinal() now recognises longitudinal networks in lists
jhollway Jun 23, 2024
ff85c91
make_diff_model now more careful with lists of networks
jhollway Jun 23, 2024
a8c3663
Updated pkg date
jhollway Jun 23, 2024
f78d098
Added list methods for is_twomode(), is_labelled(), and is_complex()
jhollway Jun 23, 2024
85ea745
node_infection_length() renamed to node_recovery()
jhollway Jun 23, 2024
d2ab3af
net_nodes() now knows what to do with lists of networks
jhollway Jun 23, 2024
03d4c6c
net_infection_total() now sums infections, not the amount that remain…
jhollway Jun 23, 2024
dbe6719
node_thresholds() handles unlabelled networks better
jhollway Jun 23, 2024
22d6c05
First half of diffusion tute has more informative titles
jhollway Jun 23, 2024
bc374f7
More discussion on seeding to diffusion tute
jhollway Jun 23, 2024
a20cf7c
Added check marks to the intro
jhollway Jun 23, 2024
2b84435
net_recovery now censors by default, this is a placeholder until a li…
jhollway Jun 23, 2024
2e1e8b8
Updates to play_diffusion and graphr to make them netlist compatible
jhollway Jun 23, 2024
f399b24
Fixed some chunk setup woes, and added LOTR free play box
jhollway Jun 23, 2024
7407cd6
Fixed chunk setup woes in back half of tute
jhollway Jun 23, 2024
ed20564
Updated DeGroot section
jhollway Jun 23, 2024
9a8f922
Added eigenvector freeplay section on networkers
jhollway Jun 23, 2024
e273f31
Added independent sets and other strategies section, added prevalence…
jhollway Jun 23, 2024
fb573f2
Added R0 section
jhollway Jun 23, 2024
50e6a90
Added herd immunity section
jhollway Jun 23, 2024
5e0825a
Added freeplay on greys
jhollway Jun 23, 2024
92759e3
Updated html
jhollway Jun 23, 2024
2cc8714
Updated how `node_is_recovered()` works to allow for node to be susce…
henriquesposito Jun 24, 2024
7a05798
Updated NEWS for latest changes
henriquesposito Jun 24, 2024
2c30170
Updated NEWS file
henriquesposito Jun 24, 2024
161199b
Attempt to fix issues with `node_exposure()` for two mode networks
henriquesposito Jun 24, 2024
05f513e
Attempt to fix `node_exposure()` issue for two mode networks
henriquesposito Jun 24, 2024
57012df
Returned tests to manynet for integrated workshop
jhollway Jun 24, 2024
16e0257
Final doc changes before workshop
jhollway Jun 24, 2024
e59c979
Updated `node_exposure()` function to work with two mode data
henriquesposito Jun 24, 2024
87dbc9a
Updated ison_southern_women with women's surnames and titles, event/t…
jhollway Jul 1, 2024
36b175e
Added arrange_ties() to help with data manipulation
jhollway Jul 1, 2024
d396819
to_named() now draws an alphabetic sequence of names to assist pedagogy
jhollway Jul 4, 2024
5eda685
Added some U and Q names to the baby_names internal data
jhollway Jul 4, 2024
c36c4f0
is_multiplex() now ignores "date", "begin", "end" tie variables, ison…
jhollway Jul 8, 2024
a2ac848
Fixed bug in node_by_quad() where it wouldn't work for multiplex netw…
jhollway Jul 8, 2024
6625953
Fixed bug in join_ties() so that it treats non-numeric tie variables …
jhollway Jul 8, 2024
7132ccc
Fixed rlang bug in to_named()
jhollway Jul 8, 2024
770c7af
Updated test results for ison_southern_women
jhollway Jul 8, 2024
9d70c75
Dropped unnecessary :::
jhollway Jul 8, 2024
825b6a9
Moved tests back over to migraph
jhollway Jul 8, 2024
5864dd1
Updated NEWS
jhollway Jul 8, 2024
151df99
Updated README with measures, motifs, and members
jhollway Jul 8, 2024
95afc26
Dropped konect link from make_read because link is unreliable
jhollway Jul 8, 2024
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
67 changes: 25 additions & 42 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,51 +1,39 @@
# Contributing

Contributions to `roctopus`,
Contributions to `manynet`,
whether in the form of issue identification, bug fixes, new code or documentation
are encouraged and welcome.

## Git and Bitbucket

The `gnevar` project is maintained using the git version control system.
`stocnet` projects are maintained using the git version control system.
A plain-English introduction to git can be found [here](https://blog.red-badger.com/2016/11/29/gitgithub-in-plain-english).
I recommend you read this before continuing.
A more recent motivation can be found [here](https://www.r-bloggers.com/2024/04/git-gud-version-control-best-practices/).
It will explain the basics of git version control, committing and repos, pulling and pushing,
branching and merging.

However, one important difference from that link is that
instead of Github or Gitlab for hosting the remote (online) git repo,
we will be using Bitbucket (which is actually very similar to Github and Gitlab in most respects).
Using git from the command line on your lap- or desktop can be intimidating,
but helpfully Atlassian (the company behind Bitbucket) have released a software interface
for Mac and Windows called [Sourcetree](https://www.sourcetreeapp.com)
that allows mostly visual management of commits, diffs, branches, etc.
There are various other git software packages available, but this one is fairly full featured.
but I recommend [Fork](https://git-fork.com) software for Mac and Windows.
This allows mostly visual management of commits, diffs, branches, etc.
There are various other git software packages available, but this one is fairly fully featured.

The Bitbucket page allows to access the issues assigned to you and check the commits.
You can also access the documents in the repository, altough this won't be necessary after you have
cloned it on your computer via Sourcetree (if you open the file via Bitbucket, Sourcetree will
not be able to identify the changes you made).
The Github page allows to access the issues assigned to you and check the commits.
You can also access the documents in the repository,
although this won't be necessary after you have cloned it on your computer via Fork.

## Sourcetree
## Style

In terms of style, we are aiming for pleasant predictability in terms of user experience.
To that end, we have a regular syntax that users can rely on producing expected effects.

## Fork

### Cloning
Once you have downloaded Sourcetree, the first thing you have to do is to
Once you have downloaded Fork, the first thing you have to do is to
clone the remote repository on your computer.
This is easily done by using point and click from Sourcetree
(file, new, clone from URL) and copying the link [clone](https://[email protected]/jhollway/gnevar.git).
Before cloning, you will be able to choose on which `branch` you want to work:
develop or master.
Working on master means you will not be altering the main workflow, whereas
creating a develop branch will separate your work from modifications
done on the master branch and be merged later on to the master branch.
Working on master is fine as long as there are not a lot of contributors.
Once more people are working, it is suitable to create local branches for each
contributor and merge them to master when controlled by the coordinator
(via the `Pull request` that will allow other contributor to check your work
and validate it for merging)
Note that you can still create a develop branch afterwards,
but make sure to pull all modifications before doing so to avoid conflicts.
You can find more information on creating a new branch on [branch](https://confluence.atlassian.com/sourcetreekb/branch-management-785325799.html).
develop or main.

### Pull
This command allows you to `pull` changes from the remote repository to your local repository on Sourcetree.
Expand All @@ -54,26 +42,23 @@ When pulling, make sure you choose master or develop,
depending on the branch you decided to work with.
Once you pulled, you have now all the new commits and files and
you can start working on your assigned tasks.
Note that you can access and open the files either from the Finder or from Sourcetree.
Some document might be stored using Large File Storage (LFS) to save space on the repository.
Sourcetree can identify them automatically by using point and click:
repository, Git LFS, Pull LFS files
Note that you can access and open the files either from the Finder or from Fork.
Some documents might be stored using Large File Storage (LFS) to save space on the repository.

### Commit and Push

Once you have made modifications on a file and saved them, it will appear in your `commit` window.
Here you can control one last time your file, write the commit message with the
issue reference (see below) and commit.
Once your commit is ready, you can `push` them to the origin/master repository.
Once your commit is ready, you can `push` them to the origin/main repository.
Note that you can click the "push immediately" box in the commit window
if you don't want to do it in two steps.

You can find more information on [commit and push](https://confluence.atlassian.com/sourcetreekb/commit-push-and-pull-a-repository-on-sourcetree-785616067.html)
If you are working on a separate branch,
it is important to select this branch when pushing to origin/master.
it is important to select this branch when pushing to origin/main.

## Issues and tests

Please use the issues tracker on Bitbucket to identify any function-related issues.
Please use the issues tracker on Github to identify any function-related issues.
You can use these issues to track progress on the issue and
to comment or continue a conversation on that issue.
Currently issue tracking is only open to those involved in the project.
Expand Down Expand Up @@ -101,9 +86,7 @@ in the commit description:
Where the issue hash (i.e. #31) is preceded by
`resolve`, `resolves`, `resolved`, `close`, `closes`, `closed`, `fix`, `fixes`, or `fixed`
(capitalised or not),
Bitbucket will automatically updated the status of the issue(s) mentioned.
More details can be found [here](https://confluence.atlassian.com/bitbucket/resolve-issues-automatically-when-users-push-code-221451126.html).
To set this up for Mac or Windows, see [this link](https://confluence.atlassian.com/sourcetreekb/link-to-bitbucket-issue-tracker-from-commits-296911608.html).
Github will automatically updated the status of the issue(s) mentioned.

Our current syntactical standard is to mention the issue first and then
provide a short description of what the committed changes do
Expand All @@ -116,7 +99,7 @@ A final way of contributing to the package is in developing the
vignettes/articles that illustrate the value added in the package.
Please contact me with any proposals here.

Please note that the `roctopus` project is released with a
Please note that the `manynet` project is released with a
[Contributor Code of Conduct](CODE_OF_CONDUCT.md).
By contributing to this project, you agree to abide by its terms.

27 changes: 17 additions & 10 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
Package: manynet
Title: Many Ways to Make, Modify, Mark, and Map Myriad Networks
Version: 0.4.4
Date: 2024-03-15
Description: A set of tools for making, modifying, marking, and mapping many different types of networks.
Version: 1.0.0
Date: 2024-06-23
Description: Many tools for making, modifying, mapping, marking, measuring,
and motifs and memberships of many different types of networks.
All functions operate with matrices, edge lists, and 'igraph', 'network', and 'tidygraph' objects,
and on one-mode, two-mode (bipartite), and sometimes three-mode networks.
The package includes functions for importing and exporting, creating and generating networks,
Expand All @@ -16,18 +17,22 @@ Language: en-GB
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.3.1
Imports:
Imports:
dplyr (>= 1.1.0),
ggplot2,
ggraph,
igraph (>= 1.6.0),
network,
pillar,
tidygraph
Suggests:
tidygraph,
minMSE
Suggests:
BiocManager,
concaveman,
future,
furrr,
gganimate,
ggdendro,
ggforce,
gifski,
graphlayouts,
Expand All @@ -36,18 +41,20 @@ Suggests:
learnr,
methods,
migraph,
minMSE,
multiplex,
netdiffuseR,
oaqc,
patchwork,
png,
readxl,
rmarkdown,
roxygen2,
RSiena,
sna,
testthat (>= 3.0.0),
xml2,
future,
furrr
tibble,
tidyr,
xml2
Enhances:
Rgraphviz
Authors@R:
Expand Down
Loading
Loading