Skip to content

Commit ec3dad6

Browse files
committed
solving file name conflict
1 parent c662d5d commit ec3dad6

File tree

5 files changed

+41
-121
lines changed

5 files changed

+41
-121
lines changed

R/imports.R

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

R/imports.r

Lines changed: 0 additions & 13 deletions
This file was deleted.
File renamed without changes.

README.Rmd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ cat("#", tmp$Title)
2020
*unstable* - in wild developement with fuRiouS rEstRucturINg and biG biG pOKing
2121

2222
[![Travis-CI Build Status](https://travis-ci.org/petermeissner/diffrprojects.svg?branch=master)](https://travis-ci.org/petermeissner/diffrprojects)
23+
[![codecov](https://codecov.io/gh/petermeissner/diffrprojects/branch/master/graph/badge.svg)](https://codecov.io/gh/petermeissner/diffrprojects/tree/master/R)
24+
[![CRAN version](http://www.r-pkg.org/badges/version/diffrprojects)](https://cran.r-project.org/package=diffrprojects)
2325

2426

2527
**Version**

README.md

Lines changed: 39 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,153 +1,97 @@
1-
# README
2-
3-
4-
5-
6-
7-
8-
# Using diffr for more than two files
91

2+
Using diffr for more than two files
3+
===================================
104

115
**Status**
126

137
*unstable* - in wild developement with fuRiouS rEstRucturINg and biG biG pOKing
148

15-
[![Travis-CI Build Status](https://travis-ci.org/petermeissner/diffrprojects.svg?branch=master)](https://travis-ci.org/petermeissner/diffrprojects)
16-
9+
[![Travis-CI Build Status](https://travis-ci.org/petermeissner/diffrprojects.svg?branch=master)](https://travis-ci.org/petermeissner/diffrprojects) [![codecov](https://codecov.io/gh/petermeissner/diffrprojects/branch/master/graph/badge.svg)](https://codecov.io/gh/petermeissner/diffrprojects/tree/master/R) [![CRAN version](http://www.r-pkg.org/badges/version/diffrprojects)](https://cran.r-project.org/package=diffrprojects)
1710

1811
**Version**
1912

2013
0.1.2.90000
2114

22-
2315
**Description**
2416

25-
This is a description still to be done but to
26-
prevent checks about complaining about to short descriptions
27-
this does not simply read TBD.
28-
17+
This is a description still to be done but to prevent checks about complaining about to short descriptions this does not simply read TBD.
2918

3019
**License**
3120

32-
MIT + file LICENSE <br>Peter Meissner [aut, cre],
33-
Ulrich Sieberer [cph],
34-
University of Konstanz [cph]
35-
36-
37-
21+
MIT + file LICENSE <br>Peter Meissner \[aut, cre\], Ulrich Sieberer \[cph\], University of Konstanz \[cph\]
3822

3923
**Citation**
4024

25+
Meißner P (2016). *diffrprojects: Using diffr for more than two texts*. R package version 0.1.2.90000, &lt;URL: <https://github.com/petermeissner/diffrprojects>&gt;.
4126

42-
43-
Meißner P (2016). _diffrprojects: Using diffr for more than two texts_. R package version
44-
0.1.2.90000, <URL: https://github.com/petermeissner/diffrprojects>.
45-
46-
Sieberer U, Meißner P, Keh J and Müller W (2016). "Mapping and Explaining Parliamentary Rule
47-
Changes in Europe: A Research Program." _Legislative Studies Quarterly_, *41*(1), pp. 61-88. ISSN
48-
1939-9162, doi: 10.1111/lsq.12106 (URL: http://doi.org/10.1111/lsq.12106), <URL:
49-
http://dx.doi.org/10.1111/lsq.12106>.
27+
Sieberer U, Meißner P, Keh J and Müller W (2016). "Mapping and Explaining Parliamentary Rule Changes in Europe: A Research Program." *Legislative Studies Quarterly*, *41*(1), pp. 61-88. ISSN 1939-9162, doi: 10.1111/lsq.12106 (URL: <http://doi.org/10.1111/lsq.12106>), &lt;URL: <http://dx.doi.org/10.1111/lsq.12106>&gt;.
5028

5129
**BibTex for citing**
5230

53-
54-
```r
31+
``` r
5532
toBibtex(citation("diffrprojects"))
5633
```
5734

58-
59-
6035
**Installation**
6136

62-
63-
```r
64-
install.packages("diffrprojects", repos = "https://petermeissner.github.io/drat")
37+
``` r
38+
install.packages("diffrprojects", repos = "https://petermeissner.github.io/drat")
6539
```
6640

67-
68-
69-
7041
**Example Usage**
7142

72-
73-
```r
43+
``` r
7444
library(diffrprojects)
7545
```
7646

77-
```
78-
## Loading required package: stringb
79-
```
47+
## Loading required package: stringb
8048

81-
```
82-
## Loading required package: rtext
83-
```
49+
## Loading required package: rtext
8450

85-
```r
51+
``` r
8652
dp <- diffrproject$new()
8753

8854
testfiles <- rtext:::testfile(pattern="rc_\\d.txt", full.names = TRUE)
8955

9056
dp$text_add(testfiles)
9157
```
9258

93-
```
94-
## rtext : initializing
95-
```
59+
## rtext : initializing
9660

97-
```
98-
## rtext : initializing
99-
## rtext : initializing
100-
```
61+
## rtext : initializing
62+
## rtext : initializing
10163

102-
```r
64+
``` r
10365
names(dp$texts)
10466
```
10567

106-
```
107-
## [1] "rc_1.txt" "rc_2.txt" "rc_3.txt"
108-
```
68+
## [1] "rc_1.txt" "rc_2.txt" "rc_3.txt"
10969

110-
```r
70+
``` r
11171
dp$text_data()
11272
```
11373

114-
```
115-
## text_file character encoding sourcetype
116-
## 1 C:/Users/peter/R/win-library/3.3/rtext/testfiles/rc_1.txt 926166 UTF-8 text_file
117-
## 2 C:/Users/peter/R/win-library/3.3/rtext/testfiles/rc_2.txt 844551 UTF-8 text_file
118-
## 3 C:/Users/peter/R/win-library/3.3/rtext/testfiles/rc_3.txt 643012 UTF-8 text_file
119-
```
74+
## text_file character encoding sourcetype
75+
## 1 C:/Users/peter/R/win-library/3.3/rtext/testfiles/rc_1.txt 926166 UTF-8 text_file
76+
## 2 C:/Users/peter/R/win-library/3.3/rtext/testfiles/rc_2.txt 844551 UTF-8 text_file
77+
## 3 C:/Users/peter/R/win-library/3.3/rtext/testfiles/rc_3.txt 643012 UTF-8 text_file
12078

121-
```r
79+
``` r
12280
dp$texts_link()
12381
dp$links
12482
```
12583

126-
```
127-
## $rc_1.txt_rc_2.txt
128-
## $rc_1.txt_rc_2.txt$from
129-
## [1] "rc_1.txt"
130-
##
131-
## $rc_1.txt_rc_2.txt$to
132-
## [1] "rc_2.txt"
133-
##
134-
##
135-
## $rc_2.txt_rc_3.txt
136-
## $rc_2.txt_rc_3.txt$from
137-
## [1] "rc_2.txt"
138-
##
139-
## $rc_2.txt_rc_3.txt$to
140-
## [1] "rc_3.txt"
141-
```
142-
143-
144-
145-
146-
147-
148-
149-
150-
151-
152-
153-
84+
## $rc_1.txt_rc_2.txt
85+
## $rc_1.txt_rc_2.txt$from
86+
## [1] "rc_1.txt"
87+
##
88+
## $rc_1.txt_rc_2.txt$to
89+
## [1] "rc_2.txt"
90+
##
91+
##
92+
## $rc_2.txt_rc_3.txt
93+
## $rc_2.txt_rc_3.txt$from
94+
## [1] "rc_2.txt"
95+
##
96+
## $rc_2.txt_rc_3.txt$to
97+
## [1] "rc_3.txt"

0 commit comments

Comments
 (0)