version 2.3.0

cran · May 15, 2018 · 3b3a700 · 3b3a700
1 parent d352c51
commit 3b3a700
Show file tree

Hide file tree

Showing 31 changed files with 58 additions and 43 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,8 +2,7 @@ Package: qdap
 Type: Package
 Title: Bridging the Gap Between Qualitative Data and Quantitative
         Analysis
-Version: 2.2.9
-Date: 2017-11-17
+Version: 2.3.0
 Authors@R: c(person("Bryan", "Goodrich", role = "ctb"), person("Dason", "Kurkiewicz", role =
           "ctb"), person("Tyler", "Rinker", email = "tyler.rinker@gmail.com", role = c("aut",
           "cre")))
@@ -32,9 +31,9 @@ URL: http://trinker.github.com/qdap/
 BugReports: http://github.com/trinker/qdap/issues
 RoxygenNote: 6.0.1
 NeedsCompilation: no
-Packaged: 2017-11-20 02:06:02 UTC; Tyler
+Packaged: 2018-05-15 06:07:06 UTC; Tyler
 Author: Bryan Goodrich [ctb],
   Dason Kurkiewicz [ctb],
   Tyler Rinker [aut, cre]
 Repository: CRAN
-Date/Publication: 2017-11-20 11:40:14 UTC
+Date/Publication: 2018-05-15 06:59:03 UTC
diff --git a/MD5 b/MD5
@@ -1,6 +1,6 @@
-b2a8a296cbfc4f04158bee44f9bc75f7 *DESCRIPTION
+2fc975b39244493465c35901481bf5f7 *DESCRIPTION
 408a1d25b8afed576e28327a60b8ebb9 *NAMESPACE
-14398d31e11bb1a752b8959393940160 *NEWS
+9cc6b8bac003bdaf320583b212933e58 *NEWS
 112d1e2e9661fbae28096f405f3065e0 *R/Animate.R
 32d6fae7b28e64f55a697183213991fa *R/Animate.character.R
 7c355cb8755e5e7d1fb77433ba4d4570 *R/Ldist.R
@@ -35,7 +35,7 @@ a690f00cce7e6d10e7d46848a8a3de18 *R/cm_code.blank.R
 46d1b25db871b11ad10965a69b9082e0 *R/cm_code.transform.R
 11c303c65686a4b8d21ac8decaea0dcd *R/cm_combine.dummy.R
 4706b2fe3539f4901fd7d24b889121fd *R/cm_d2l.R
-a1f40cbdd76d9c29aa82daf430aca16f *R/cm_debug.R
+5bec7785f97cefa3ae86c0d5dd6182f5 *R/cm_debug.R
 837bd540990424d0381eae46d3719665 *R/cm_debug2.R
 5a2341c5364dc8cb63e05455a6fad3e1 *R/cm_describe.R
 91fe3913ece00476d6db0be99209948c *R/cm_df.fill.R
@@ -155,7 +155,7 @@ df299c0e076f894caf336d94271b140a *R/space_fill.R
 e1111195d1125b0a347f78fbb7e2d83b *R/syllable_sum.R
 f022e4c36700904713f3ee31ec6b24de *R/synonyms.R
 7c4f5c8012da38d08356d4ac22f1c80a *R/table_methods.R
-c0b6ccfb4cb6d1a6bb8a7958a83a7cd6 *R/term.count.R
+84187247f1cfadb3ba4f4f0b977147d2 *R/term.count.R
 e367ef7aa69ab94a93c91049bf5224be *R/term.find.R
 caad5aec142347bbe89141f6e65de07c *R/termco.R
 814de6724c1e2f1501009a20a7e458ec *R/termco.h.R
@@ -189,30 +189,30 @@ b144833210279ce7e1d874b83d3c6820 *R/word_list.R
 f436845f9f5f927bf64412fcd9113e37 *R/word_stats.R
 4157b80b62f62c497a281ba635dceeba *R/words.R
 0a702b7fdf15c6dba89c2e5fc251a936 *R/xnoy.R
-739eb62385f1bdb33fb6910cfdf2d2b1 *README.md
-862f72e2262681ad14185e607d99a2a2 *build/vignette.rds
-382ef08298cb806f12c68e47b96982f6 *data/DATA.SPLIT.rda
-8c4a6c3de03f807c2f4fc8ee2e458254 *data/DATA.rda
-de9da0bb76ddb72bfea557be016284a0 *data/DATA2.rda
-48d798bfc3574432e28b5420a9b25f74 *data/env.syl.rda
-3ff16cd8c3e12b8c3a3134a54ebc7e20 *data/hamlet.rda
-2d2881259d656b85a914c743a169b50d *data/mraja1.rda
-b57cffc0615baf0e38af3d15426c8d0e *data/mraja1spl.rda
-48820efb2b3fabd973be10c2b15116fb *data/pres_debate_raw2012.rda
-f6d9ef32aaf2e713fd0d2bdf1b5b3fe2 *data/pres_debates2012.rda
-037226b6fe3a882a2434e66696cc6145 *data/raj.act.1.rda
-59533957a74ea48cfe9d2b2bb18cb077 *data/raj.act.1POS.rda
-a088f1992f447a63f24e4f20dca3af57 *data/raj.act.2.rda
-ed6ecfc3a1bf530f72e7fafa7be8fa0f *data/raj.act.3.rda
-18dc66c2b06efb79e5dfe55dc69e464e *data/raj.act.4.rda
-7d07c45d608b68e82e8e3602bfe06fcd *data/raj.act.5.rda
-ef68fc713aa00d4cf6d93e294314e5d6 *data/raj.demographics.rda
-fa78c8fdf9a1e4bba4dde375ac04c8ce *data/raj.rda
-c26d77d0caab2719981cc8e40f66a0f1 *data/rajPOS.rda
-9645a1acc98623ce40bfa74ec7072f9e *data/rajSPLIT.rda
-448bfafa815d9ae8ac81261e060a29ce *data/raw.time.span.rda
-22de049dfca75454f04ab7b92854511f *data/sample.time.span.rda
-3ed806e814556bae384292ff999e1035 *inst/CITATION
+fec6f0ae815cb9930c561a37863e2d4d *README.md
+30a9a61a8bb752f5a52f2d2a8431e77c *build/vignette.rds
+f0875de9a99b3414a3a70b65aa262586 *data/DATA.SPLIT.rda
+043954765a7bda03f997996f717edf21 *data/DATA.rda
+5b6bd8d01369fdcd3afe46c75cbb00e1 *data/DATA2.rda
+4703b210f78d677dd0fc65c0ab05e803 *data/env.syl.rda
+5988268d71fc7f3e8882a544de1f3051 *data/hamlet.rda
+73b475d2402dbe6e17d2c41a6ea375c5 *data/mraja1.rda
+4d8ed351d45675948a68a39ada84dce5 *data/mraja1spl.rda
+99953fb4144b25046eceb5a61e9f45fc *data/pres_debate_raw2012.rda
+8352dd01a1245da4769889e504d48096 *data/pres_debates2012.rda
+e6df42ac16554b3e47611c89768e3e8a *data/raj.act.1.rda
+ce374527b55dffdbd295b815fafb3bc2 *data/raj.act.1POS.rda
+3ef6d2b3cfcee7612ae7b361c5657da3 *data/raj.act.2.rda
+8a184b6dc8491f2ea38b13795f55c6ad *data/raj.act.3.rda
+ad418ca26f7e5830a629bf625f690c58 *data/raj.act.4.rda
+f05bf6bbc98301abae9db5846d6bbdce *data/raj.act.5.rda
+fa7663f83a0d33b8709f65235051ab58 *data/raj.demographics.rda
+5ae98d6831002edb3967d511fbadcb05 *data/raj.rda
+1e8e95fc559f9b83b284c43bcc84318d *data/rajPOS.rda
+a266cb500dd8acb3ba6f70ce95b50920 *data/rajSPLIT.rda
+829af388caab1dcdddaf89251675308d *data/raw.time.span.rda
+92e05615114b9da9f1b87c57ef7d6b10 *data/sample.time.span.rda
+12529287b3500ea7f4d92c50695e4330 *inst/CITATION
 e36673a08848add40828eb6f93f035d0 *inst/Rmd_vignette/css/style.css
 51c1c53d02c25f9daa799452cb5dead0 *inst/Rmd_vignette/data/polarity.example.rds
 05381332243dd8174921dd0d01273484 *inst/Rmd_vignette/data/poldat4.rds
@@ -229,13 +229,13 @@ a25e41b24960d6deccab53024df662d9 *inst/Rmd_vignette/imgs/tm_imgs/img2.png
 5e0bdfe17fc119c8029f36e5f4a60184 *inst/Rmd_vignette/qdap_vignette.Rmd
 ebe22ad72f208613078ea4a6fdb368f2 *inst/doc/cleaning_and_debugging.R
 cfc4fd7d50a0146e3e9bacd17c58b5ca *inst/doc/cleaning_and_debugging.Rnw
-7f3d8cc4e263c2212944f1c001cc0c53 *inst/doc/cleaning_and_debugging.pdf
+ed280ec79d1809e2af5f62a1fb0ca4cc *inst/doc/cleaning_and_debugging.pdf
 14c6190be87c332b0d749216063cc268 *inst/doc/qdap_vignette.R
 2967a32a8189aae7808443b9d80a9b68 *inst/doc/qdap_vignette.Rmd
 c206c2f2beb6838342408564c374a6cc *inst/doc/qdap_vignette.html
 be92e00b5c5d5e5c1288fd9083fe444c *inst/doc/tm_package_compatibility.R
 7ec7756a51c839ad306a33c9f354f75c *inst/doc/tm_package_compatibility.Rnw
-913da613cf1fba7732e1077915b9b120 *inst/doc/tm_package_compatibility.pdf
+beecc6f3af1ba31b8cc1cc2ce5eb06af *inst/doc/tm_package_compatibility.pdf
 d96c55a66e0abdc38a549992e66f27b2 *inst/extdata/docs/PROJECT_WORKFLOW_GUIDE.pdf
 8ea5dc0949fe6433d5942c29bd6f1a1a *inst/extdata/docs/Rprofile.txt
 887af5d5691c297ad427987dbaa2a7de *inst/extdata/docs/TEMP.txt

diff --git a/NEWS b/NEWS
@@ -17,7 +17,24 @@ And constructed with the following guidelines:
 * Bug fixes and misc. changes bumps the patch
 
 
-CHANGES IN qdap VERSION 2.2.5-
+CHANGES IN qdap VERSION 2.3.0 - 
+----------------------------------------------------------------
+
+
+BUG FIXES
+
+NEW FEATURES
+
+MINOR FEATURES
+
+IMPROVEMENTS
+
+CHANGES
+
+
+
+
+CHANGES IN qdap VERSION 2.2.5-2.2.9
 ----------------------------------------------------------------
 
 

diff --git a/R/cm_debug.R b/R/cm_debug.R
@@ -27,7 +27,7 @@ function(cm.list.obj) {
         }
         tester <- function(x, y){
             p <- suppressWarnings(unlist(gregexpr(x, y, fixed = TRUE)))
-            j <- suppressWarnings(if(is.na(p) | length(p) == 1 & p<1) { 
+                j <- suppressWarnings(if(length(p) == 1 && (is.na(p) |  p < 1)) { 
                     0 
                 } else {
                     length(p)

diff --git a/R/term.count.R b/R/term.count.R
@@ -3,7 +3,7 @@ term.count <-
 function(str, mat){
     tester <- function(x, y){
         p <- suppressWarnings(unlist(gregexpr(x, y, fixed = TRUE)))
-        j <- suppressWarnings(if(is.na(str) | length(p) == 1 & p<1) { 
+        j <- suppressWarnings(if(length(p) == 1 && (is.na(str) |  p < 1)) { 
                 0 
             } else {
                 length(p)

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ qdap
 
 [![Project Status: Inactive – The project has reached a stable, usable state but is no longer being actively developed; support/maintenance will be provided as time allows.](http://www.repostatus.org/badges/latest/inactive.svg)](http://www.repostatus.org/#inactive)
 [![Build Status](https://travis-ci.org/trinker/qdap.svg?branch=master)](https://travis-ci.org/trinker/qdap) [![DOI](https://zenodo.org/badge/5398/trinker/qdap.svg)](http://dx.doi.org/10.5281/zenodo.11124)
-[![](http://cranlogs.r-pkg.org/badges/qdap)](https://cran.r-project.org/package=qdap)
+[![](https://cranlogs.r-pkg.org/badges/qdap)](https://cran.r-project.org/package=qdap)
 
 
 [qdap](http://trinker.github.com/qdap_dev/) (Quantitative Discourse Analysis Package) is an R package designed to assist in quantitative discourse analysis.  The package stands as a bridge between qualitative transcripts of dialogue and statistical analysis & visualization.

diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/data/DATA.SPLIT.rda b/data/DATA.SPLIT.rda
diff --git a/data/DATA.rda b/data/DATA.rda
diff --git a/data/DATA2.rda b/data/DATA2.rda
diff --git a/data/env.syl.rda b/data/env.syl.rda
diff --git a/data/hamlet.rda b/data/hamlet.rda
diff --git a/data/mraja1.rda b/data/mraja1.rda
diff --git a/data/mraja1spl.rda b/data/mraja1spl.rda
diff --git a/data/pres_debate_raw2012.rda b/data/pres_debate_raw2012.rda
diff --git a/data/pres_debates2012.rda b/data/pres_debates2012.rda
diff --git a/data/raj.act.1.rda b/data/raj.act.1.rda
diff --git a/data/raj.act.1POS.rda b/data/raj.act.1POS.rda
diff --git a/data/raj.act.2.rda b/data/raj.act.2.rda
diff --git a/data/raj.act.3.rda b/data/raj.act.3.rda
diff --git a/data/raj.act.4.rda b/data/raj.act.4.rda
diff --git a/data/raj.act.5.rda b/data/raj.act.5.rda
diff --git a/data/raj.demographics.rda b/data/raj.demographics.rda
diff --git a/data/raj.rda b/data/raj.rda
diff --git a/data/rajPOS.rda b/data/rajPOS.rda
diff --git a/data/rajSPLIT.rda b/data/rajSPLIT.rda
diff --git a/data/raw.time.span.rda b/data/raw.time.span.rda
diff --git a/data/sample.time.span.rda b/data/sample.time.span.rda
diff --git a/inst/CITATION b/inst/CITATION
@@ -4,13 +4,12 @@ citHeader("To cite qdap in publications, please use:")
 citEntry(entry = "manual",
     title = "{qdap}: {Q}uantitative Discourse Analysis Package",
     author = "Tyler W. Rinker",
-    organization = "University at Buffalo/SUNY",
     address = "Buffalo, New York",
-    note = "2.2.9",
-    year = "2013",
+    note = "2.3.0",
+    year = "2017",
     url = "http://github.com/trinker/qdap", 
-    textVersion  = paste("Rinker, T. W. (2013).",
+    textVersion  = paste("Rinker, T. W. (2017).",
         "qdap: Quantitative Discourse Analysis Package.",
-        "2.2.9. University at Buffalo. Buffalo, New York.",
+        "2.3.0. Buffalo, New York.",
         "http://github.com/trinker/qdap")
 )
diff --git a/inst/doc/cleaning_and_debugging.pdf b/inst/doc/cleaning_and_debugging.pdf
diff --git a/inst/doc/tm_package_compatibility.pdf b/inst/doc/tm_package_compatibility.pdf