Skip to content

Commit 5d41d00

Browse files
randef1nedrandef1ned
committed
Bump version to v0.2.0
1 parent d52db2a commit 5d41d00

38 files changed

+918
-553
lines changed

‎.Rbuildignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.gitignore
66
.git
77
.idea
8+
.vscode
89
.codecov.yml
910
.lintr
1011
.clang-format
@@ -31,3 +32,5 @@ build-pkg*
3132
\.tar.gz$
3233
^appveyor\.yml$
3334
.valgrindrc
35+
^doc$
36+
^Meta$

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Makefile.in
3232
glmnet
3333
*.rda
3434
.RData
35+
.Rhistory
36+
.Rapp.history
3537
src/*.o
3638
src/*.so
3739
.Rproj.user/*
@@ -69,3 +71,5 @@ nbactions.xml
6971
.Rproj.user
7072
src/*.dll
7173
inst/doc
74+
/doc/
75+
/Meta/

‎.vscode/.env‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
LD_LIBRARY_PATH=/usr/lib64/R/lib:/usr/lib/jvm/jre/lib/server
2+
R_ARCH=
3+
R_BROWSER=/usr/bin/xdg-open
4+
R_BZIPCMD=/usr/bin/bzip2
5+
R_DOC_DIR=/usr/share/doc/R
6+
R_GZIPCMD=/usr/bin/gzip
7+
R_HOME=/usr/lib64/R
8+
R_INCLUDE_DIR=/usr/include/R
9+
R_LIBS_SITE=/usr/local/lib/R/site-library:/usr/local/lib/R/library:/usr/lib64/R/library:/usr/share/R/library
10+
R_LIBS_USER=/home/syc/R/x86_64-redhat-linux-gnu-library/4.3
11+
R_PAPERSIZE=a4
12+
R_PDFVIEWER=/usr/bin/xdg-open
13+
R_PLATFORM=x86_64-redhat-linux-gnu
14+
R_PRINTCMD=
15+
R_RD4PDF=times,inconsolata,hyper
16+
R_SESSION_TMPDIR=/tmp/RtmpMNylqA
17+
R_SHARE_DIR=/usr/share/R
18+
R_STRIP_SHARED_LIB=strip --strip-unneeded
19+
R_STRIP_STATIC_LIB=strip --strip-debug
20+
R_SYSTEM_ABI=linux,gcc,gxx,gfortran,gfortran
21+
R_TEXI2DVICMD=/usr/bin/texi2dvi
22+
R_UNZIPCMD=/usr/bin/unzip
23+
R_ZIPCMD=/usr/bin/zip

‎.vscode/c_cpp_properties.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "Linux",
5+
"includePath": [
6+
"${workspaceFolder}/**",
7+
"${env:HOME}/R/x86_64-redhat-linux-gnu-library/4.3/Rcpp/include",
8+
"${env:HOME}/R/x86_64-redhat-linux-gnu-library/4.3/RcppEigen/include",
9+
"/usr/include/R",
10+
"/opt/intel/oneapi/mkl/latest/include"
11+
],
12+
"defines": [],
13+
"compilerPath": "/usr/bin/gcc",
14+
"cStandard": "c11",
15+
"cppStandard": "c++17"
16+
},
17+
{
18+
"name": "Mac",
19+
"includePath": [
20+
"${workspaceFolder}/**",
21+
"/Library/Frameworks/R.framework/Versions/4.3/Resources/library/Rcpp/include",
22+
"/Library/Frameworks/R.framework/Resources/include",
23+
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include",
24+
"/usr/local/include"
25+
],
26+
"defines": [],
27+
"macFrameworkPath": [
28+
"/System/Library/Frameworks",
29+
"/Library/Frameworks"
30+
],
31+
"compilerPath": "/usr/bin/clang",
32+
"cStandard": "c11",
33+
"cppStandard": "c++17"
34+
}
35+
],
36+
"version": 4
37+
}

‎.vscode/debug.R‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
env <- Sys.getenv()
2+
envnames <- names(env)
3+
rnames <- envnames[startsWith(envnames, "R_")]
4+
cached_names <- rnames
5+
ld_lib_path <- Sys.getenv("LD_LIBRARY_PATH")
6+
if (ld_lib_path != "") {
7+
cached_names <- c("LD_LIBRARY_PATH", rnames)
8+
}
9+
writeLines(paste0(cached_names, "=", env[cached_names]), ".vscode/.env")

‎.vscode/launch.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "(gdb) Launch",
9+
"type": "cppdbg",
10+
"request": "launch",
11+
"program": "/usr/lib64/R/bin/exec/R",
12+
"args": [
13+
"--vanilla",
14+
"-e",
15+
"devtools::test()"
16+
],
17+
"stopAtEntry": false,
18+
"envFile": "${workspaceFolder}/.vscode/.env",
19+
"cwd": "${workspaceFolder}",
20+
"externalConsole": false,
21+
"MIMode": "gdb",
22+
"setupCommands": [
23+
{
24+
"description": "Enable pretty-printing for gdb",
25+
"text": "-enable-pretty-printing",
26+
"ignoreFailures": true
27+
}
28+
],
29+
"preLaunchTask": "debug",
30+
"osx": {
31+
"program": "/Library/Frameworks/R.framework/Resources/bin/exec/R",
32+
"MIMode": "lldb"
33+
}
34+
}
35+
]
36+
}

‎.vscode/settings.json‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"files.associations": {
3+
"array": "cpp",
4+
"atomic": "cpp",
5+
"bit": "cpp",
6+
"*.tcc": "cpp",
7+
"cctype": "cpp",
8+
"clocale": "cpp",
9+
"cmath": "cpp",
10+
"compare": "cpp",
11+
"complex": "cpp",
12+
"concepts": "cpp",
13+
"csetjmp": "cpp",
14+
"cstdarg": "cpp",
15+
"cstddef": "cpp",
16+
"cstdint": "cpp",
17+
"cstdio": "cpp",
18+
"cstdlib": "cpp",
19+
"cstring": "cpp",
20+
"ctime": "cpp",
21+
"cwchar": "cpp",
22+
"cwctype": "cpp",
23+
"deque": "cpp",
24+
"list": "cpp",
25+
"map": "cpp",
26+
"set": "cpp",
27+
"string": "cpp",
28+
"unordered_map": "cpp",
29+
"unordered_set": "cpp",
30+
"vector": "cpp",
31+
"exception": "cpp",
32+
"algorithm": "cpp",
33+
"functional": "cpp",
34+
"iterator": "cpp",
35+
"memory": "cpp",
36+
"memory_resource": "cpp",
37+
"numeric": "cpp",
38+
"optional": "cpp",
39+
"random": "cpp",
40+
"string_view": "cpp",
41+
"system_error": "cpp",
42+
"tuple": "cpp",
43+
"type_traits": "cpp",
44+
"utility": "cpp",
45+
"fstream": "cpp",
46+
"initializer_list": "cpp",
47+
"iomanip": "cpp",
48+
"iosfwd": "cpp",
49+
"iostream": "cpp",
50+
"istream": "cpp",
51+
"limits": "cpp",
52+
"new": "cpp",
53+
"numbers": "cpp",
54+
"ostream": "cpp",
55+
"sstream": "cpp",
56+
"stdexcept": "cpp",
57+
"streambuf": "cpp",
58+
"cinttypes": "cpp",
59+
"typeinfo": "cpp"
60+
}
61+
}

‎.vscode/tasks.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "debug",
8+
"type": "shell",
9+
"command": "Rscript ${workspaceFolder}/.vscode/debug.R",
10+
"problemMatcher": []
11+
}
12+
]
13+
}

‎DESCRIPTION‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: diffusr
22
Type: Package
33
Title: Network Diffusion Algorithms
4-
Version: 0.1.4
4+
Version: 0.2.0
55
Date: 2018-04-20
66
Authors@R: person("Simon", "Dirmeier",
77
email = "simon.dirmeier@gmx.de",
@@ -14,22 +14,26 @@ Description: Implementation of network diffusion algorithms such as
1414
of water, the activation of neurons in the brain, or the location of a random
1515
surfer in the internet. The information (node weights) is iteratively propagated
1616
to other nodes until a equilibrium state or stop criterion occurs.
17-
URL: https://github.com/dirmeier/diffusr
18-
BugReports: https://github.com/dirmeier/diffusr/issues
17+
URL: https://github.com/randef1ned/diffusr
18+
BugReports: https://github.com/randef1ned/diffusr/issues
1919
License: GPL (>=3)
2020
Depends: R (>= 3.4)
2121
LazyData: TRUE
2222
LinkingTo: Rcpp, RcppEigen
2323
Imports:
2424
Rcpp,
2525
igraph,
26-
methods
26+
methods,
27+
checkmate,
28+
matrixStats
2729
Suggests:
2830
knitr,
2931
rmarkdown,
3032
testthat,
3133
lintr,
3234
Matrix
3335
VignetteBuilder: knitr
34-
RoxygenNote: 6.0.1
35-
SystemRequirements: C++11
36+
RoxygenNote: 7.2.3
37+
Encoding: UTF-8
38+
Config/testthat/edition: 3
39+
SystemRequirements: C++17

‎NAMESPACE‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
# Generated by roxygen2: do not edit by hand
22

3-
S3method(hub.correction,numeric)
4-
S3method(normalize.laplacian,numeric)
5-
S3method(normalize.stochastic,numeric)
3+
export(assert_dgCMatrix)
64
export(heat.diffusion)
75
export(hub.correction)
6+
export(is.dgCMatrix)
87
export(nearest.neighbors)
98
export(normalize.laplacian)
109
export(normalize.stochastic)
1110
export(random.walk)
1211
import(Rcpp)
12+
importFrom(Rcpp,sourceCpp)
13+
importFrom(checkmate,assert)
14+
importFrom(checkmate,assert_int)
15+
importFrom(checkmate,assert_integer)
16+
importFrom(checkmate,assert_logical)
17+
importFrom(checkmate,assert_number)
18+
importFrom(checkmate,check_matrix)
19+
importFrom(checkmate,check_numeric)
20+
importFrom(checkmate,test_atomic_vector)
21+
importFrom(checkmate,test_matrix)
22+
importFrom(checkmate,test_numeric)
1323
importFrom(igraph,components)
1424
importFrom(igraph,graph_from_adjacency_matrix)
25+
importFrom(matrixStats,colSums2)
26+
importFrom(methods,is)
1527
useDynLib(diffusr)

0 commit comments

Comments
 (0)