From 61d567072ad1afaf7aca8e76add26c4b6dc11d72 Mon Sep 17 00:00:00 2001
From: Brandon Stewart <bms4@soc-macbms4.princeton.edu>
Date: Fri, 3 Mar 2017 10:44:10 -0500
Subject: [PATCH 1/2] Small documentation changes

---
 DESCRIPTION     | 2 +-
 R/stm-package.R | 4 ++--
 man/gadarian.Rd | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 6dc0da45f..31d4752c4 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: stm
 Type: Package
 Title: Estimation of the Structural Topic Model
 Version: 1.2.1
-Date: 2017-03-01
+Date: 2017-03-03
 Author: Margaret Roberts [aut, cre], 
         Brandon Stewart [aut, cre],
         Dustin Tingley [aut, cre],
diff --git a/R/stm-package.R b/R/stm-package.R
index 9f7cfbbf4..2963a8e9f 100644
--- a/R/stm-package.R
+++ b/R/stm-package.R
@@ -65,11 +65,11 @@ NULL
 #' @docType data
 #' @format A data frame with 351 observations on the following 3 variables.
 #' \describe{ 
-#' \item{\code{MetaID"}}{A numeric vector containing identification
+#' \item{\code{MetaID}}{A numeric vector containing identification
 #' numbers; not used for analysis} 
 #' \item{\code{treatment}}{A numeric vector
 #' indicating treatment condition} 
-#' \item{\code{pid_rep"}}{A numeric vector of
+#' \item{\code{pid_rep}}{A numeric vector of
 #' party identification} 
 #' \item{\code{open.ended.response}}{A character vector
 #' of the subject's open ended response} 
diff --git a/man/gadarian.Rd b/man/gadarian.Rd
index c73f00126..7a5281395 100644
--- a/man/gadarian.Rd
+++ b/man/gadarian.Rd
@@ -7,11 +7,11 @@
 \title{Gadarian and Albertson data}
 \format{A data frame with 351 observations on the following 3 variables.
 \describe{ 
-\item{\code{MetaID"}}{A numeric vector containing identification
+\item{\code{MetaID}}{A numeric vector containing identification
 numbers; not used for analysis} 
 \item{\code{treatment}}{A numeric vector
 indicating treatment condition} 
-\item{\code{pid_rep"}}{A numeric vector of
+\item{\code{pid_rep}}{A numeric vector of
 party identification} 
 \item{\code{open.ended.response}}{A character vector
 of the subject's open ended response} 

From b28d44aa4ab108236a0e4abf001ea3951b479148 Mon Sep 17 00:00:00 2001
From: Brandon Stewart <bms4@soc-macbms4.princeton.edu>
Date: Fri, 3 Mar 2017 10:55:11 -0500
Subject: [PATCH 2/2] quanteda test changes

---
 R/stm.R                            |   3 +++
 man/stm.Rd                         |   3 +++
 tests/testthat/Rplots.pdf          | Bin 0 -> 4670 bytes
 tests/testthat/test-quanteda-stm.R |  27 ++++++++++++++++-----------
 4 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 tests/testthat/Rplots.pdf

diff --git a/R/stm.R b/R/stm.R
index 684854d65..96d6ef700 100644
--- a/R/stm.R
+++ b/R/stm.R
@@ -340,11 +340,14 @@
 #'                prevalence=~treatment + s(pid_rep), data=out$meta)
 #' 
 #' #The same example using quanteda instead of tm via textProcessor()
+#' #Note this example works with quanteda version 0.9.9-31 and later
 #' require(quanteda)
 #' gadarian_corpus <- corpus(gadarian, text_field = "open.ended.response")
 #' gadarian_dfm <- dfm(gadarian_corpus, 
 #'                      remove = stopwords("english"),
 #'                      stem = TRUE)
+#' stm_from_dfm <- stm(gadarian_dfm, K = 3, prevalence = ~treatment + s(pid_rep),
+#'                     data = docvars(gadarian_corpus))
 #'                      
 #' #An example of restarting a model
 #' mod.out <- stm(out$documents, out$vocab, 3, prevalence=~treatment + s(pid_rep), 
diff --git a/man/stm.Rd b/man/stm.Rd
index 58a815bc4..af6004841 100644
--- a/man/stm.Rd
+++ b/man/stm.Rd
@@ -352,11 +352,14 @@ mod.out <- stm(out$documents, out$vocab, 3,
                prevalence=~treatment + s(pid_rep), data=out$meta)
 
 #The same example using quanteda instead of tm via textProcessor()
+#Note this example works with quanteda version 0.9.9-31 and later
 require(quanteda)
 gadarian_corpus <- corpus(gadarian, text_field = "open.ended.response")
 gadarian_dfm <- dfm(gadarian_corpus, 
                      remove = stopwords("english"),
                      stem = TRUE)
+stm_from_dfm <- stm(gadarian_dfm, K = 3, prevalence = ~treatment + s(pid_rep),
+                    data = docvars(gadarian_corpus))
                      
 #An example of restarting a model
 mod.out <- stm(out$documents, out$vocab, 3, prevalence=~treatment + s(pid_rep), 
diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..05f8691482ee04f3e7f4d91da89f080c2e6b6fc6
GIT binary patch
literal 4670
zcmZ`-c|25m8=n#~Ep~D#CsAZMGh-JeCi}kcna06n%xIRZV-MMG+R2g>;<^&DMNzga
zV@shBLX<rwRPT&?>)!X?_dTD_{BgeL`905bp3i)r^L!sE3$&g*Qb7qW6)_eu9zl=j
zbs@o#00JPMISbd+goC;y2t&aU31|!j0;JIzC<Ia!p@>jKB9u`|N-}WJl<4t)pV{Cj
zc;+c9K%a#1^TuJxfH{@oN2M^2S&)bxR4hbdJyldtR6sGYtyn}BBm+Nw91amYSXrQc
zW&?mWfqoDG>S8DuJkbjPEihgX8Bk;zSOI?>Q2o~dmL1EQ1Q95InuEGT0)=@?2Gq8W
zgH{lkNF`yJ{*?aVk7e+q93~LKi{cHaDxv^T4~M5PUjWp@Gi!r}utX1tl{T5eESWDn
zApM%1DX~{u;PHn2;~cX4!2GX1vf2eOu3s+d4n-Nh9hEjU8n;-SPkl>G8!U(lZqX1`
zU-q2p&~)x%=W^<vA9Mb8i7U~E6pu4?@}88GIdU^)#i5sbP+;DF<U~gI7pPujD&6h(
z8&jtj3l&#vTv9xGE;Y=>sJ#`6R9J8nlo&QT4S%<v9I@l5q1jsBr;;-@xou<k;cHGG
zVP~WDdEetJ=7ijrEF(8JlkZ~o$3C8*Eyzh*y-=LRg__&HuTJCbYReng(*eeFFFQml
z?q@icu-`D*c{v|r!f_hE_N!u0Uc|`iV$!*BhQ!L^^6<Esxs~i;4MtqjJXE@=9RA8I
z{WhI*h0JTyoqYAt?l4$rRsQ+UiIatg3M!5mY;412St?&ij^5KQ+1TdlTuyVq_Hn(A
z=nv#JmNw)&Y$K7aGE1%fctuMp;sKk@tya<`n+!v1TCV<lsn4zRBdgh;Wf};uj8&aB
z?=ynvSG7xASA+BQAAiVidTw%*h;0bUd|f<SC*{`QvyY;)EE(I*k;08sPEkVt-sI?$
zuTtM)HIsi~p|WL1&7ki4M$x{2mjVrj7U5A}$gmqjBBzwU0TY#dmKh94@%JQuU0*k?
zXd#I`ihHp&F2B7!9=pFpT;3hi&J}25V8)|n8W(HSdOvN*GHEv<t;cFSr$VYiPIB;l
zD9_S?{3&bFA^DXGnC;@_vdSXyf|Tx8<is1+AqwnzvP;P)gQxMOt>ld^$9>-FZq2VF
zCV47O>w8fb5=-~NlE2IWwzr1TT&$<k!px<7oDPb`HOJyMPoI6ZI!Cw!!;Qh(3a6s<
zTDIYbWueq$vYb`{|95%^eL85{puya(;qOtA9gFGudcLs~*Ukuj`V*SBkTgkac6OA%
zA!T((gC0UYIE0QoXKnJbq{?<kY;ZG%-$8TYWgnZEo8?l%MLT$2{RB^Yqi_n((pAGD
zhQv}4gA+EeSjuGPpa1edIm)8o9~Ak)(LbmO8sj|3fHT0Nq!r-Gq%M)lq#zOiO(72)
zMu!*xI3t+Plo3j-pX=XP%wpjW)-js})*7M!&LFd0F(W_$6jwN?$7C>|sR`<#03^%F
zRu2GA1yJ;@DXea#smXH342dU_to<<9Ed(T6>FWT>Kg|E?8Z3wv&lxn-)z!g}ArC->
zW##&#53%lkyyHn0^9igVAR0Q4!$K^lpc%8bfPZ!fl(M?Y|7;PgoPM^5jO+e3)&oMZ
z^jg(gi_1LmSG#<?t+pHNsWnJZIEv)rF?xClCZU41@k3jt<nBaCkA~;yrj$s;U)W|@
zGP^?r-FMDUK=ityN0G?L<G}fjTO;CYp*~r)^tWE~wEk+?rOhbz1``La@ZH%C0`I08
z<B}4*+&Q=HUVyRTVWWPfr8+_kz3r*nLtZE1Q~4RfwbgrpFB?aDPbAjEzGq#na+E;A
zEN&)FEindMM1)(_wCvNRD$HANK2kF6L>P5SI7XuEu8^1HoI_SqA#U|$RJ5i@8@Y1~
zT9|lqWIRcouP!mgT|{_lC!-2gcNiN*F^th}B2JWugqW$oq%Xfwm?T?!;N`KGrBRXc
z<AJbIgVxgvJ)lE7oxhE{v9sMtflo3oPUNtQbxhI~{)BgQy6IFxV>@E6YSN)G<m*%s
zN3nM#m?wSHQ6SJ)<e|i|*J|o&2w!>MI_bVJ*Uej(*Un#eiw>I;L5nk<t=fmC?twkX
zg~|ukV|{UgFxS~_7BydEJKRB7{KGoxUfQ_>)gf+H&&TAvWDDQCaWUSO<s$=5&#!0g
z4bwdxLbs}WJO3UNuzW@BG6kvYrb_S(%0)kK=^XR>vU@TsmLbmhje0<ccT=)14!n8_
z-Ii+tm|QP+ZsCt(Pt}RhW@M!?xSxHyJ5Y7~;vj>!>$=1Cdk25f4m|*qKFSMl1$)SL
z&C_-@>9c+5Na#+znXy5S{6@2{H2KydBpH^B)kmW$`7Ap>rfoWHR{~(CwAp5~MW@;L
zpYC|{l(!PbJ<7KIq;%YlbMDB|NP$b+(15T&c=_#pS0jtukK}VuZ}Tcesrc=qL|{ji
z)HoF)+T3@%*=B{<n;9;%0B_gkiN4UnBWM*%0d!l$9$s*`Bs#&yuFGp7c6Fzeu8zTW
zLG9VwR{3HDF*Dho)6Ub<lwYc0dvq&qTYB@Y3kGo>LU85QJ3ZjVvzNM?tL;pV7Orny
zK&go<L{>b#=EoMoGZ$_C?8Yds1N=lp9&b1gug0AO1g}too=!@DBp2_&!b^O2x8t-2
zFCDlmUKMYUlGoxaz;Wsn(!%8Gt{38h7sl>f&$i1}$tkepw8+Rm-e=n<eHQ+i*Hq8v
zPDgj=G>jsrA(D}xpl5&kR@eUN(rMlmwRJ&`sBCN^GI?K^iP&Mm((R=prJ}vb>K8<s
z5;3_Y4!>#ii_OOGX(T;3gGWAs2lE8;1+yPZrbQhZqxd~iJME%r7AO1McGSu5h@ZV5
zf2GJ{zG0sEMDE7rg|<bAp%=m(y7NSG)<J3hM6TbX4RnrT<g+h#>8Tl48V8(|<og_F
z_T2AIcx8-(p(a|>TuiD?%F@77Qbi_0@}Td*Pe(E&-b&O0S6cNvxJjChCc`>}!&wJM
zjy$ovebnLT4(SB}JJ~*I%25}~fZRBHB^%}k{<oXO4%q?da|Vm|`P^C!E*3qvbh>Ag
zL$Ub~(^H1B9ne#^QP&MDB_%Aezt<O#Ym6JyeP<ajy&>%-jkSp`Fo&$G`lx++GmbNA
zdvq0Z*}JT8_sWRgQDriM@$nf(Wk#7sNiWU`%Iwb;?Pi<)u!360tW(#I*~;6R+t$q-
zeyQ?OwxIasWPV`&;!C5x!Iye{!}k^YXnnnX75Dw`kMwHeZsMYSCeD8BRx4bj?Db7<
z6PruFtR6e{raxM_L+Ox`z4u(NSXX*~PybTyi=KiWjhxRmw|@VWol#J$yAi#5cdu=;
zss8O!-Ko2s*ckY;D=D4%9xKRPiZb;pRjT@PbyT%tP*ad)(1oB+L2D~q>vCTuzwTeJ
zUAN}Y;5f*^&QZisv1c(x?wP<d*O;#{#Yu@tXA)KRQAM;+c8YruovH-oIv*XCbE=M>
zJ?^9q0qhHusp4DTpn=^grK-lrLZm1vwqt)g`(#Z=tbCV{nUGEbM}nvcU+<OFXLu;t
zsYgCaewTcWT$ZDVL!+~A=}g7Cw=Xe+@Yb8w9CL=>+uFMqyIfe5D*x(H)9RqhlFLX{
z;naCLjo?LSt{B4l_hz0IKl7x%?$x)bsGO*l><&y%_fuqdN&g~8LK7V8>zU!Nb1YE3
z=)A_{O8-E;<HwNKUxbBojnj-1+HwM$mKn>xOeIy#RFPa}UGEWgSD-6u30D5D{>i~n
z8*JP(?o9nF&Cz-Hy$YsI(!JdJ-6V?l7Qe!Kts1S$5T6gxYn}&p#g6g6xBf&Pv8SsJ
zRJ`<mK_4bw7?BAp3%m4P<-6!Mr)_V-C&TY+H$S}=K|6W(Hv7q!C%Gd#B2U$89rQDB
zZ&|%mv%F_&*OdQ-$gc3NPuXh?iO;TIpou4QaqlYT3fqU_x8&)55?<}z8hM?)SfW;<
zO=2FMiZ;9xlp~nKf9F=t>E?jutIY=3qBHhQZt=Zw{LiV)*zuh4TVr{`>vC_Z{50#2
zXREziml!`4n4lon?~q={VDL3crAz7abzekYl)pHyo}JFoxzZDUuiQAV5<jOf$Dheb
z<Ro66e*sRJOI97ec0|kQyy<YJX6jg`RmzghQz4sOnR)AZ{rBq3c9{-kt;%Q}uGM0@
zk#h5#jR9{i*9NLwaTyg`+Flx8dbch8#wQmQDL9`pq&txCu%=OIfZiAW9R1J@l{S9e
z`pWWQRgE=+Oj0I-=w3CjWZHIQiMIU2EyAhZwcGi&^Mgn3lzUSz)@{2A?iB{v&lW2<
zY1K6mJ0i-X%W*zo(q#&AU`UmMr>l92U3c1@lFy;D&Iy9?ry5mND)IS4af8yY)hcmw
zxdo=;#sN~o#zn@mMkB;YLLK8;hyAtFw86_|(1Z4DJl(F{?p^=v(3^_=()J2;P<-gX
z!&)*YR=+j*#<3e8A6sDTEh`cp7(X<25^))Dg)GX;XJ}NT&jv~Mroly?pK=FZ)dbcQ
ze_VXsYnNwh@3clJcAxJEda~ZhkrNY7yGc{uIH01Zx*FE8UR`CFbHD7vv(R^;A0pz|
zXdTHN9r9`NP?2BZUFwp1Lw(ywKv?hFCVU|=uj0mm?Xi-v2f}VKK7D?6GB)_v2gzkL
zFNUixXL-(D{u!5H^_SOrq&_9j9ytC>Kv_ley}a?@w)r*jUM)Ma%lm)<u7-<u__NF=
zv(k@Wqt1NzFwu*xH4d6jzo<nn0v{6>@LdDTQz7(>4{IM!1P*`REZNm5ob2Y|`muV#
z?>_ly=<RXN4RH;Q{T#<)#bT?$W3F=|nW`aU@f+8A?Q4rOYlQqh^|WlJyqmRrMI1J$
zJXqUW^JUs@y=ba}OrXDUBn#6jCNg_!<2TaQL_?LnmblIUTE}O!G#1?JqmE(UlpHw$
zeP0QEJbmyBrZKt`y?kg$zxgoj2zbJc5wL04e<d}q@r3MmmyPy`0skifn<#|fG39SA
zE1SK=w@&9jdHua-4w|RDUioS-Qtat=<FREJc~pMZ_j}Dve}2WP`I33r6E{PrzwBFC
zoXblz&kAK*i(cON*Ql-ja}0(5DThxHn9>tRVCrGk*!tI<J&tgaK*s$5;2;|3=?O74
zFiYe*14_!EFOEPZ1L`W^IVzC?;UP~79I2!PdJvhiolM37pce^qo;l-UuvFHli^Y+!
zR9{a#6aat}9NvQo`C_mnA^`x;kRX;J^CSj~Wy)$e=z(K~BIC#as6Zf6JRna1ByA;$
zWlsKhJmzn>H<jRpAyIwt7%Bw-iC#nk<im`H+44+gP42FL+XrmT`acHoKNbR8N&vK`
zo}p~*2Us9eVwhoknJF>V!B$=VurYw}=OGFXi-Chb>H@GT`uF`o015JhBLE~4j`(>2
zD$2@=%77>E6GJh#B&-V{{KSwdOda&!7!sk*6c+!$kgCj;!ap#SI#a^@15-r(%O3)T
zWbQ-$+YW(J{}-l&K>jO+5=!-Nxll+L93CPumplMyjSGU9?+bv21WzJUow4cxS`mp9
cfVF(tstuWfAyKv}qok;cf=fxAGS`Fu2W&b2U;qFB

literal 0
HcmV?d00001

diff --git a/tests/testthat/test-quanteda-stm.R b/tests/testthat/test-quanteda-stm.R
index 7864d7466..01d4a20df 100644
--- a/tests/testthat/test-quanteda-stm.R
+++ b/tests/testthat/test-quanteda-stm.R
@@ -4,17 +4,22 @@ require(quanteda)
 
 test_that("Test that stm works on a quanteda dfm", {
   require(quanteda)
-  gadarian_corpus <- corpus(gadarian, text_field = "open.ended.response")
-  gadarian_dfm <- dfm(gadarian_corpus, 
-                      remove = stopwords("english"),
-                      stem = TRUE)
-  set.seed(10012) # NYU :-)
-  stm_from_dfm <- stm(gadarian_dfm,
-                      K = 3,
-                      prevalence = ~treatment + s(pid_rep),
-                      data = docvars(gadarian_corpus),
-                      max.em.its=2)
-  expect_identical(class(stm_from_dfm), "STM")
+  if(utils::compareVersion(as.character(utils::packageVersion("quanteda")), "0.9.9-31") >= 0) {
+    gadarian_corpus <- corpus(gadarian, text_field = "open.ended.response")
+    gadarian_dfm <- dfm(gadarian_corpus, 
+                        remove = stopwords("english"),
+                        stem = TRUE)
+    set.seed(10012) # NYU :-)
+    stm_from_dfm <- stm(gadarian_dfm,
+                        K = 3,
+                        prevalence = ~treatment + s(pid_rep),
+                        data = docvars(gadarian_corpus),
+                        max.em.its=2)
+    expect_identical(class(stm_from_dfm), "STM")
+  } else {
+    #basically if the version is old, just skip this test for now.
+    expect_identical("STM", "STM")
+  }
 })
 
 test_that("Test that stm works on a classic stm object structure", {