Skip to content

Commit 95cb47a

Browse files
committed
v0.1.3
1 parent 2db9222 commit 95cb47a

File tree

10 files changed

+19
-16
lines changed

10 files changed

+19
-16
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
.Ruserdata
55
inst/doc
66
README.html
7+
*.o
8+
*.dll

README.Rmd

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ output: github_document
66

77

88
```{r, include=FALSE}
9-
options("width"=110)
10-
tmp <- packageDescription("diffrprojects")
9+
options("width"=101)
10+
tmp <- devtools:::read_dcf("DESCRIPTION")
1111
```
1212

1313
```{r, results='asis', echo=FALSE}
@@ -29,17 +29,20 @@ filelist.R <- list.files("R", recursive = TRUE, pattern="\\.R$", ignore.case =
2929
filelist.tests <- list.files("tests", recursive = TRUE, pattern="\\.R$", ignore.case = TRUE, full.names = TRUE)
3030
filelist.cpp <- list.files("src", recursive = TRUE, pattern="\\.cpp$", ignore.case = TRUE, full.names = TRUE)
3131
lines.R <- unlist(lapply(filelist.R, readLines))
32-
lines.tests <- unlist(lapply(filelist.cpp, readLines))
32+
lines.tests <- unlist(lapply(filelist.tests, readLines))
3333
lines.cpp <- unlist(lapply(filelist.cpp, readLines))
34-
length.R <- length(grep("(^\\s*$)|(^\\s*#)|(^\\s*//)", lines.R, value = TRUE, invert = TRUE))
35-
length.tests <- length(grep("(^\\s*$)|(^\\s*#)|(^\\s*//)", lines.tests, value = TRUE, invert = TRUE))
36-
length.cpp <- length(grep("(^\\s*$)|(^\\s*#)|(^\\s*//)", lines.cpp, value = TRUE, invert = TRUE))
34+
length.R <-
35+
length(grep("(^\\s*$)|(^\\s*#)|(^\\s*//)", lines.R, value = TRUE, invert = TRUE))
36+
length.tests <-
37+
length(grep("(^\\s*$)|(^\\s*#)|(^\\s*//)", lines.tests, value = TRUE, invert = TRUE))
38+
length.cpp <-
39+
length(grep("(^\\s*$)|(^\\s*#)|(^\\s*//)", lines.cpp, value = TRUE, invert = TRUE))
3740
```
3841

3942

4043
*unstable* - in wild developement with fuRiouS rEstRucturINg and biG biG pOKing
4144

42-
*lines of R code:* `r length.R`, *lines of C++ code:* `r length.cpp`, *lines of test code:* `r length.tests`
45+
*R code:* `r length.R`, *C++ code:* `r length.cpp`, *test code:* `r length.tests`
4346

4447

4548

@@ -61,7 +64,7 @@ cat(tmp$Description)
6164

6265
```{r, results='asis', echo=FALSE}
6366
cat(tmp$License, "<br>")
64-
cat(tmp$Author)
67+
cat(as.character(eval(parse(text=tmp$Author))))
6568
```
6669

6770

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ Using diffr for more than two files
88

99
*unstable* - in wild developement with fuRiouS rEstRucturINg and biG biG pOKing
1010

11-
*lines of R code:* 388, *lines of C++ code:* 112, *lines of test code:* 112
11+
*R code:* 619, *C++ code:* 112, *test code:* 243
1212

1313
**Version**
1414

15-
0.1.2.90000
15+
0.1.3.90000
1616

1717
**Description**
1818

1919
This is a description still to be done but to prevent checks about complaining about to short descriptions this does not simply read TBD.
2020

2121
**License**
2222

23-
MIT + file LICENSE <br>Peter Meissner \[aut, cre\], Ulrich Sieberer \[cph\], University of Konstanz \[cph\]
23+
MIT + file LICENSE <br>Peter Meissner <[email protected]> \[aut, cre\] Ulrich Sieberer <[email protected]> \[cph\] University of Konstanz <[email protected]> \[cph\]
2424

2525
**Citation**
2626

27-
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;.
27+
Meißner P (2016). *diffrprojects: Using diffr for more than two texts*. R package version 0.1.3.90000, &lt;URL: <https://github.com/petermeissner/diffrprojects>&gt;.
2828

2929
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;.
3030

autotest.Rexec

100755100644
File mode changed.

dev.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ text2 <- rtext$new(text_file=text_files[14], encoding="latin1")$text_get(2000)
1616

1717
#### ---------------------------------------------------------------------------
1818

19-
diffr(text1, text2)
19+
diff_align(text1, text2)
2020

2121

2222

src/.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
RcppExports.o
2-
rtext.dll
3-
rtext.so
4-
which_token_worker.o
2+

src/choose_options.o

-584 KB
Binary file not shown.

src/diffrprojects.so

-819 KB
Binary file not shown.

src/dist.o

-439 KB
Binary file not shown.

src/which_dist_min_absolute.o

-484 KB
Binary file not shown.

0 commit comments

Comments
 (0)