Skip to content

Commit 01bae96

Browse files
authored
Merge pull request #47 from nanxstats/chores
Improve code and documentation style
2 parents 54d8b80 + 93c0b49 commit 01bae96

35 files changed

+303
-301
lines changed

.Rbuildignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
^_pkgdown\.yml$
55
^pkgdown$
66
^docs$
7-
^CONDUCT\.md$
7+
^CODE_OF_CONDUCT\.md$
88
^CONTRIBUTING\.md$
99
^\.github$

CODE_OF_CONDUCT.md

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at me@nanx.me.
63+
All complaints will be reviewed and investigated promptly and fairly.
64+
65+
All community leaders are obligated to respect the privacy and security of the
66+
reporter of any incident.
67+
68+
## Enforcement Guidelines
69+
70+
Community leaders will follow these Community Impact Guidelines in determining
71+
the consequences for any action they deem in violation of this Code of Conduct:
72+
73+
### 1. Correction
74+
75+
**Community Impact**: Use of inappropriate language or other behavior deemed
76+
unprofessional or unwelcome in the community.
77+
78+
**Consequence**: A private, written warning from community leaders, providing
79+
clarity around the nature of the violation and an explanation of why the
80+
behavior was inappropriate. A public apology may be requested.
81+
82+
### 2. Warning
83+
84+
**Community Impact**: A violation through a single incident or series of
85+
actions.
86+
87+
**Consequence**: A warning with consequences for continued behavior. No
88+
interaction with the people involved, including unsolicited interaction with
89+
those enforcing the Code of Conduct, for a specified period of time. This
90+
includes avoiding interactions in community spaces as well as external channels
91+
like social media. Violating these terms may lead to a temporary or permanent
92+
ban.
93+
94+
### 3. Temporary Ban
95+
96+
**Community Impact**: A serious violation of community standards, including
97+
sustained inappropriate behavior.
98+
99+
**Consequence**: A temporary ban from any sort of interaction or public
100+
communication with the community for a specified period of time. No public or
101+
private interaction with the people involved, including unsolicited interaction
102+
with those enforcing the Code of Conduct, is allowed during this period.
103+
Violating these terms may lead to a permanent ban.
104+
105+
### 4. Permanent Ban
106+
107+
**Community Impact**: Demonstrating a pattern of violation of community
108+
standards, including sustained inappropriate behavior, harassment of an
109+
individual, or aggression toward or disparagement of classes of individuals.
110+
111+
**Consequence**: A permanent ban from any sort of public interaction within the
112+
community.
113+
114+
## Attribution
115+
116+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
117+
version 2.1, available at
118+
<https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>.
119+
120+
Community Impact Guidelines were inspired by
121+
[Mozilla's code of conduct enforcement ladder][https://github.com/mozilla/inclusion].
122+
123+
For answers to common questions about this code of conduct, see the FAQ at
124+
<https://www.contributor-covenant.org/faq>. Translations are available at <https://www.contributor-covenant.org/translations>.
125+
126+
[homepage]: https://www.contributor-covenant.org

CONDUCT.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ Suggests:
3232
foreach,
3333
doParallel,
3434
org.Hs.eg.db
35-
RoxygenNote: 7.3.1
35+
RoxygenNote: 7.3.2

R/desc-03-TC.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,8 +930,8 @@ extractTC <- function(x) {
930930
n <- nchar(x)
931931
TC <- summary(factor(
932932
paste(paste(xSplitted[-c(n, n - 1)], xSplitted[-c(1, n)], sep = ""),
933-
xSplitted[-c(1, 2)],
934-
sep = ""
933+
xSplitted[-c(1, 2)],
934+
sep = ""
935935
),
936936
levels = TCDict
937937
), maxsum = 8001) / (n - 2)

R/desc-04-MoreauBroto.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@
101101
#' )
102102
#' )
103103
extractMoreauBroto <- function(
104-
x, props = c(
105-
"CIDH920105", "BHAR880101", "CHAM820101", "CHAM820102",
106-
"CHOC760101", "BIGC670101", "CHAM810101", "DAYM780201"
107-
),
108-
nlag = 30L, customprops = NULL) {
104+
x, props = c(
105+
"CIDH920105", "BHAR880101", "CHAM820101", "CHAM820102",
106+
"CHOC760101", "BIGC670101", "CHAM810101", "DAYM780201"
107+
),
108+
nlag = 30L, customprops = NULL) {
109109
if (protcheck(x) == FALSE) {
110110
stop("x has unrecognized amino acid type")
111111
}

R/desc-05-Moran.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@
101101
#' )
102102
#' )
103103
extractMoran <- function(
104-
x, props = c(
105-
"CIDH920105", "BHAR880101", "CHAM820101", "CHAM820102",
106-
"CHOC760101", "BIGC670101", "CHAM810101", "DAYM780201"
107-
),
108-
nlag = 30L, customprops = NULL) {
104+
x, props = c(
105+
"CIDH920105", "BHAR880101", "CHAM820101", "CHAM820102",
106+
"CHOC760101", "BIGC670101", "CHAM810101", "DAYM780201"
107+
),
108+
nlag = 30L, customprops = NULL) {
109109
if (protcheck(x) == FALSE) {
110110
stop("x has unrecognized amino acid type")
111111
}

R/desc-06-Geary.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@
101101
#' )
102102
#' )
103103
extractGeary <- function(
104-
x, props = c(
105-
"CIDH920105", "BHAR880101", "CHAM820101", "CHAM820102",
106-
"CHOC760101", "BIGC670101", "CHAM810101", "DAYM780201"
107-
),
108-
nlag = 30L, customprops = NULL) {
104+
x, props = c(
105+
"CIDH920105", "BHAR880101", "CHAM820101", "CHAM820102",
106+
"CHOC760101", "BIGC670101", "CHAM810101", "DAYM780201"
107+
),
108+
nlag = 30L, customprops = NULL) {
109109
if (protcheck(x) == FALSE) {
110110
stop("x has unrecognized amino acid type")
111111
}

R/desc-07-CTDCClass.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ extractCTDCClass <- function(x, aagroup1, aagroup2, aagroup3) {
7272
if (protcheck(x) == FALSE) stop("x has unrecognized amino acid type")
7373

7474
if ((length(aagroup1) != length(aagroup2) |
75-
length(aagroup1) != length(aagroup3)) |
76-
(length(aagroup2) != length(aagroup3))) {
75+
length(aagroup1) != length(aagroup3)) |
76+
(length(aagroup2) != length(aagroup3))) {
7777
stop("The three groups must have the same property numbers")
7878
}
7979

R/desc-08-CTDT.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ extractCTDT <- function(x) {
8888
# Combine single amino acids by a 2-length step
8989

9090
for (i in 1:7) G[[i]] <- paste(G[[i]][-n], G[[i]][-1], sep = "")
91-
G <- lapply(G, function(x)
91+
G <- lapply(G, function(x) {
9292
factor(x, levels = c(
9393
"G1G2", "G2G1", "G1G3",
9494
"G3G1", "G2G3", "G3G2",
9595
"G1G1", "G2G2", "G3G3"
96-
)))
96+
))
97+
})
9798

9899
GSummary <- lapply(G, summary)
99100

0 commit comments

Comments
 (0)