[r-cran-erm] 03/33: Import Debian patch 0.12-0-3
Andreas Tille
tille at debian.org
Mon Dec 12 11:19:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-erm.
commit 27c88fd7aa5dbdd1295cc04b28c7a136b2b9cd46
Author: Julian Gilbey <jdg at debian.org>
Date: Mon May 17 21:54:21 2010 +0100
Import Debian patch 0.12-0-3
---
debian/changelog | 9 +++++++++
debian/patches/02_plotPImap-pp-reuse | 8 ++++++--
debian/patches/03_plotPImap-prettify | 26 ++++++++++++++------------
debian/patches/04_PathwayMap | 9 ++++++---
4 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 73bf7b9..d88e5f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+erm (0.12-0-3) unstable; urgency=low
+
+ * Fix bug with plotPathwayMap - failed if pp was not given as a
+ parameter
+ * Allow more colour possibilities for nonordinal warnings in plotPImap
+ (with thanks to Reinhold Hatzinger for suggesting this)
+
+ -- Julian Gilbey <jdg at debian.org> Mon, 17 May 2010 21:54:21 +0100
+
erm (0.12-0-2) unstable; urgency=low
* Fixed dRM -> dRm bug in plotPImap
diff --git a/debian/patches/02_plotPImap-pp-reuse b/debian/patches/02_plotPImap-pp-reuse
index e252ff0..c914499 100644
--- a/debian/patches/02_plotPImap-pp-reuse
+++ b/debian/patches/02_plotPImap-pp-reuse
@@ -17,12 +17,16 @@ Last-Update: 2010-05-13
{
def.par <- par(no.readonly = TRUE) # save default, for resetting...
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,11 @@
tr<-as.matrix(tr[,-1])
# person parameters unlist in case of several for NA groups
- suppressWarnings(pp<-person.parameter(object))
-+ if (is.null(pp)) suppressWarnings(pp<-person.parameter(object))
++ if (is.null(pp))
++ suppressWarnings(pp<-person.parameter(object))
++ else if (class(pp) != "ppar" || !identical(pp$X,object$X))
++ stop("pp is not a person.parameter object which matches the main Rasch data object!")
++
theta<-unlist(pp$thetapar)
tt<-table(theta)
diff --git a/debian/patches/03_plotPImap-prettify b/debian/patches/03_plotPImap-prettify
index c51255f..31aee27 100644
--- a/debian/patches/03_plotPImap-prettify
+++ b/debian/patches/03_plotPImap-prettify
@@ -8,24 +8,25 @@ Last-Update: 2010-05-13
--- a/R/plotPImap.R
+++ b/R/plotPImap.R
-@@ -1,7 +1,8 @@
+@@ -1,7 +1,9 @@
`plotPImap` <-
function(object, item.subset="all", sorted = FALSE, main="Person-Item Map",
latdim="Latent Dimension", pplabel="Person\nParameter\nDistribution",
- cex.gen=0.7, xrange=NULL, warn.ord=TRUE, irug=TRUE, pp=NULL)
-+ cex.gen=0.7, xrange=NULL, warn.ord=TRUE, warn.ord.colour=FALSE,
++ cex.gen=0.7, xrange=NULL,
++ warn.ord=TRUE, warn.ord.colour="black",
+ irug=TRUE, pp=NULL)
{
def.par <- par(no.readonly = TRUE) # save default, for resetting...
-@@ -79,18 +80,25 @@
+@@ -83,18 +85,25 @@
i<-nrow(tr)+1-j
assign("trpoints",tr[i,!is.na(tr[i,])])
npnts<-length(trpoints)
- points(sort(trpoints),rep(j,npnts),type="b")
-+ if (warn.ord.colour && !dRm) {
-+ if(!all(sort(trpoints)==trpoints)) ptcol="blue" else ptcol="black"
-+ } else
++ if (!dRm && !all(sort(trpoints)==trpoints))
++ ptcol=warn.ord.colour
++ else
+ ptcol="black"
+
+ if(npnts>1) points(sort(trpoints),rep(j,npnts),type="b",cex=1,col=ptcol)
@@ -56,19 +57,20 @@ Last-Update: 2010-05-13
main = "Person-Item Map", latdim = "Latent Dimension",
pplabel = "Person\nParameter\nDistribution", cex.gen = 0.7,
- xrange = NULL, warn.ord = TRUE, irug = TRUE, pp = NULL)
-+ xrange = NULL, warn.ord = TRUE, warn.ord.colour = FALSE,
++ xrange = NULL, warn.ord = TRUE, warn.ord.colour = "black",
+ irug = TRUE, pp = NULL)
}
\arguments{
\item{object}{Object of class \code{Rm} or \code{dRm}}
-@@ -32,6 +33,10 @@
+@@ -32,6 +33,11 @@
\item{xrange}{Range for the x-axis}
\item{warn.ord}{If \code{TRUE} (the default) asterisks are displayed in the right margin of the lower
panel to indicate nonordinal threshold locations for polytomous items.}
-+ \item{warn.ord.colour}{If \code{TRUE} nonordinal threshold locations
-+ for polytomous items are also coloured blue to make them even more
-+ visible. This is especially useful when there are many items so
-+ that the plot is quite dense.}
++ \item{warn.ord.colour}{Nonordinal threshold locations for polytomous
++ items are coloured with this colour to make them more visible. This
++ is especially useful when there are many items so that the plot is
++ quite dense. The default is \code{"black"}, so that there is no
++ distinction made.}
\item{irug}{If \code{TRUE} (the default), all thresholds are plotted below the person distribution
to indicate where the included items are most informative.}
\item{pp}{If non-\code{NULL}, this contains the
diff --git a/debian/patches/04_PathwayMap b/debian/patches/04_PathwayMap
index 81f352d..5ebbf2a 100644
--- a/debian/patches/04_PathwayMap
+++ b/debian/patches/04_PathwayMap
@@ -130,7 +130,7 @@ Last-Update: 2010-05-16
export(IC)
--- /dev/null
+++ b/R/plotPathwayMap.R
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,180 @@
+`plotPathwayMap` <-
+function(object, pmap=FALSE, item.subset="all", person.subset="all",
+ mainitem="Item Map", mainperson="Person Map",
@@ -227,14 +227,17 @@ Last-Update: 2010-05-16
+ # We have to postpone the person subsetting code until after we have
+ # done the person plot calculations
+
++ if (is.null(pp))
++ suppressWarnings(pp<-person.parameter(object))
++ else if (class(pp) != "ppar" || !identical(pp$X,object$X))
++ stop("pp is not a person.parameter object which matches the main Rasch data object!")
++
+ # We plot the infit data versus the parameters for both items and persons
+ iloc<-tt[,1]
+ ise<-tt[,2]
+ ifit <- itemfit(pp)
+ ifitZ <- ifit$i.infitZ
+
-+ if (is.null(pp)) pp<-person.parameter(object)
-+
+ ploc <- as.matrix(pp$theta.table['Person Parameter'])
+ pse <- as.matrix(pp$se.theta[[1]])
+ pfit <- personfit(pp)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-erm.git
More information about the debian-science-commits
mailing list