Skip to content

Commit

Permalink
version 0.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jwijffels authored and cran-robot committed Sep 14, 2023
1 parent d62d003 commit 374b4c2
Show file tree
Hide file tree
Showing 22 changed files with 3,102 additions and 3,106 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
@@ -1,7 +1,7 @@
Package: text.alignment
Type: Package
Title: Text Alignment with Smith-Waterman
Version: 0.1.3
Version: 0.1.4
Authors@R: c(
person('Jan', 'Wijffels', role = c('aut', 'cre', 'cph'), email = 'jwijffels@bnosac.be', comment = "Rewrite of functionalities from the textreuse R package"),
person('Vrije Universiteit Brussel - DIGI: Brussels Platform for Digital Humanities', role = 'cph'),
Expand All @@ -19,11 +19,11 @@ RoxygenNote: 7.1.2
Suggests: knitr, markdown
VignetteBuilder: knitr
NeedsCompilation: yes
Packaged: 2022-08-17 08:44:52 UTC; jwijffels
Packaged: 2023-09-14 08:04:13 UTC; jwijf
Author: Jan Wijffels [aut, cre, cph] (Rewrite of functionalities from the
textreuse R package),
Vrije Universiteit Brussel - DIGI: Brussels Platform for Digital
Humanities [cph],
Lincoln Mullen [ctb, cph]
Repository: CRAN
Date/Publication: 2022-08-17 10:50:02 UTC
Date/Publication: 2023-09-14 11:50:03 UTC
4 changes: 2 additions & 2 deletions LICENSE
@@ -1,2 +1,2 @@
YEAR: 2020
COPYRIGHT HOLDER: Vrije Universiteit Brussel - DIGI: Brussels Platform for Digital Humanities; Jan Wijffels; Lincoln Mullen
YEAR: 2020
COPYRIGHT HOLDER: Vrije Universiteit Brussel - DIGI: Brussels Platform for Digital Humanities; Jan Wijffels; Lincoln Mullen
42 changes: 21 additions & 21 deletions MD5
@@ -1,24 +1,24 @@
292fa11637261b898a4af22cc1a185b1 *DESCRIPTION
0ee61c8f69bb289cddf08cbf2a4a29ce *LICENSE
4537a6427f500a05fba7baa7a807ea7c *NAMESPACE
a0071bc69bfce56edeb90753aea948bb *NEWS.md
fb4362a4207f56ce6bf4734d93e1d84b *R/RcppExports.R
56f8839c4943523bfe07516c40925cf1 *R/pkg.R
e67f53bf06399e733247cf4bb749eba0 *R/smith_waterman.R
653347a6de2a98a8dbb55bb9713ba444 *README.md
113ebcc5cee67bde5cbbf8889efdac11 *build/vignette.rds
e65dc43f6ffd9ea3ddf1234433feb18e *inst/doc/textalignment.R
68236b1edef2856fbd2585e0babb05a7 *inst/doc/textalignment.Rmd
404acfa369e647e10f4819027c339453 *inst/doc/textalignment.html
f7c3c2b77e2102bfcaf040b51a687e91 *inst/extdata/example1.txt
fcad4facab1091f5e5b1eddf98f74b0f *inst/extdata/example2.txt
33a1872c87ad3bf31159eb64c3b2a8f5 *man/smith_waterman.Rd
d00e58bb29a1704b6856bddf1ab3f55d *man/smith_waterman_misaligned.Rd
34f95147e964fab4e7529a925e604f97 *man/smith_waterman_pairwise.Rd
00ba8163d554a2f99bf9920d4e12c89c *man/tokenize_letters.Rd
79e10df4c0ed2fe117024812f4ff8ec3 *man/tokenize_spaces_punct.Rd
130494f73109e14b1f1d1c73c0530d9d *src/Makevars
6b3f97c5603b1aa9862783dab2d9524c *DESCRIPTION
3f3c8f7ad326545bc44b2519ebdc69c8 *LICENSE
a405330fbd96710d7f4ca1a5c94643e0 *NAMESPACE
af945a5c6dce063ed9965e63b81ce6ef *NEWS.md
926a77c3f671f98a1fb7dc39c08b355e *R/RcppExports.R
35e94f0017bf8bdd0527ead148fe5b6c *R/pkg.R
e3490c790cf6a770ad10c96eac09d7a5 *R/smith_waterman.R
529aa9df18c640dc8b03d77d31854e79 *README.md
4ecea6efc296cda6d0df1e6d06012dc8 *build/vignette.rds
041fe4e1f8e918ae2d313fda104ba0dc *inst/doc/textalignment.R
e6cd63b5d9e60cfe031bc6b745da467d *inst/doc/textalignment.Rmd
9a03f6c07fc85a98d6119f965ab49bee *inst/doc/textalignment.html
d035c281779877bdb73c85a8bf656549 *inst/extdata/example1.txt
3b5f602262c140968e0dbd603434e557 *inst/extdata/example2.txt
831247b1ad0743c64db1cb0ea9ae1144 *man/smith_waterman.Rd
e478eb25dd2c7ffa81470559878a1c7f *man/smith_waterman_misaligned.Rd
7900da0cd871397da7b7ba7566cb5241 *man/smith_waterman_pairwise.Rd
d6fcf5a0aed6f66e33d3f15b5f654e22 *man/tokenize_letters.Rd
33346d61c4109c82d6c96f7254fca082 *man/tokenize_spaces_punct.Rd
c287f498493cb7ddffc71aeaedfc0dc0 *src/Makevars
d5aa523da6b6eb2cc8d22e6aa924f4e5 *src/RcppExports.cpp
b9815eef539418c828b8fc7f11378729 *src/smith_waterman_matrix.cpp
fd9958a166671c962b431b35ba948396 *vignettes/logo.png
68236b1edef2856fbd2585e0babb05a7 *vignettes/textalignment.Rmd
e6cd63b5d9e60cfe031bc6b745da467d *vignettes/textalignment.Rmd
22 changes: 11 additions & 11 deletions NAMESPACE
@@ -1,11 +1,11 @@
# Generated by roxygen2: do not edit by hand

S3method(as.data.frame,smith_waterman)
S3method(print,smith_waterman)
export(smith_waterman)
export(smith_waterman_misaligned)
export(smith_waterman_pairwise)
export(tokenize_letters)
export(tokenize_spaces_punct)
importFrom(Rcpp,evalCpp)
useDynLib(text.alignment)
# Generated by roxygen2: do not edit by hand
S3method(as.data.frame,smith_waterman)
S3method(print,smith_waterman)
export(smith_waterman)
export(smith_waterman_misaligned)
export(smith_waterman_pairwise)
export(tokenize_letters)
export(tokenize_spaces_punct)
importFrom(Rcpp,evalCpp)
useDynLib(text.alignment)
40 changes: 22 additions & 18 deletions NEWS.md
@@ -1,18 +1,22 @@
### CHANGES IN text.alignment VERSION 0.1.3

- Change of maintainer email address

### CHANGES IN text.alignment VERSION 0.1.2

- Added smith_waterman_misaligned to extract the information of what is misaligned
- Allow to pass arguments to the tokenizer

### CHANGES IN text.alignment VERSION 0.1.1

- Fix mismatch between R and Rcpp version of smith_waterman in case of an alignment with 1 letter/word only
- Also return similarity score to a and b individually instead of only to the shortest string. These 2 measurements are now also returned by as.data.frame.smith_waterman
- Added smith_waterman_pairwise

### CHANGES IN text.alignment VERSION 0.1.0

- Initial version
### CHANGES IN text.alignment VERSION 0.1.4

- Drop C++11 specification in Makevars

### CHANGES IN text.alignment VERSION 0.1.3

- Change of maintainer email address

### CHANGES IN text.alignment VERSION 0.1.2

- Added smith_waterman_misaligned to extract the information of what is misaligned
- Allow to pass arguments to the tokenizer

### CHANGES IN text.alignment VERSION 0.1.1

- Fix mismatch between R and Rcpp version of smith_waterman in case of an alignment with 1 letter/word only
- Also return similarity score to a and b individually instead of only to the shortest string. These 2 measurements are now also returned by as.data.frame.smith_waterman
- Added smith_waterman_pairwise

### CHANGES IN text.alignment VERSION 0.1.0

- Initial version
54 changes: 27 additions & 27 deletions R/RcppExports.R
@@ -1,27 +1,27 @@
# Generated by using Rcpp::compileAttributes() -> do not edit by hand
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

smith_waterman_mark_chars <- function(text, edit_mark) {
.Call('_text_alignment_smith_waterman_mark_chars', PACKAGE = 'text.alignment', text, edit_mark)
}

lowercase <- function(data) {
.Call('_text_alignment_lowercase', PACKAGE = 'text.alignment', data)
}

smith_waterman_matrix <- function(a, b, score_match, score_gap, score_mismatch, x) {
.Call('_text_alignment_smith_waterman_matrix', PACKAGE = 'text.alignment', a, b, score_match, score_gap, score_mismatch, x)
}

smith_waterman_function <- function(a, b, score_gap, similarity) {
.Call('_text_alignment_smith_waterman_function', PACKAGE = 'text.alignment', a, b, score_gap, similarity)
}

smith_waterman_path <- function(m, original_a, original_b, row_i, col_i, edit_mark) {
.Call('_text_alignment_smith_waterman_path', PACKAGE = 'text.alignment', m, original_a, original_b, row_i, col_i, edit_mark)
}

smith_waterman_path_integer <- function(m, original_a, original_b, row_i, col_i, edit_mark) {
.Call('_text_alignment_smith_waterman_path_integer', PACKAGE = 'text.alignment', m, original_a, original_b, row_i, col_i, edit_mark)
}

# Generated by using Rcpp::compileAttributes() -> do not edit by hand
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

smith_waterman_mark_chars <- function(text, edit_mark) {
.Call('_text_alignment_smith_waterman_mark_chars', PACKAGE = 'text.alignment', text, edit_mark)
}

lowercase <- function(data) {
.Call('_text_alignment_lowercase', PACKAGE = 'text.alignment', data)
}

smith_waterman_matrix <- function(a, b, score_match, score_gap, score_mismatch, x) {
.Call('_text_alignment_smith_waterman_matrix', PACKAGE = 'text.alignment', a, b, score_match, score_gap, score_mismatch, x)
}

smith_waterman_function <- function(a, b, score_gap, similarity) {
.Call('_text_alignment_smith_waterman_function', PACKAGE = 'text.alignment', a, b, score_gap, similarity)
}

smith_waterman_path <- function(m, original_a, original_b, row_i, col_i, edit_mark) {
.Call('_text_alignment_smith_waterman_path', PACKAGE = 'text.alignment', m, original_a, original_b, row_i, col_i, edit_mark)
}

smith_waterman_path_integer <- function(m, original_a, original_b, row_i, col_i, edit_mark) {
.Call('_text_alignment_smith_waterman_path_integer', PACKAGE = 'text.alignment', m, original_a, original_b, row_i, col_i, edit_mark)
}

10 changes: 5 additions & 5 deletions R/pkg.R
@@ -1,5 +1,5 @@
#' @importFrom Rcpp evalCpp
#' @useDynLib text.alignment
NULL


#' @importFrom Rcpp evalCpp
#' @useDynLib text.alignment
NULL


0 comments on commit 374b4c2

Please sign in to comment.