Merge branch 'develop'

emilopezcano · Apr 15, 2018 · a790517 · a790517
2 parents f81c4f0 + 718f0e4
commit a790517
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 24 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: SixSigma
 Type: Package
 Title: Six Sigma Tools for Quality Control and Improvement
-Version: 0.9-51
+Version: 0.9-52
 Encoding: UTF-8
 Author: Emilio L. Cano, Javier M. Moguerza, Mariano Prieto and Andrés Redchuk
 Maintainer: Emilio L. Cano <emilio.lcano@uclm.es>

diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+SixSigma 0.9-52
+--------------
+* Fix bug on computation of Z_lt
+* Improve graphical output of ss.study.ca (remove "NA" strings)
+
 SixSigma 0.9-5
 --------------
 * Include ISBNs in the DESCRIPTION file

diff --git a/R/ss.ca.R b/R/ss.ca.R
@@ -107,7 +107,7 @@ ss.ca.z <- function(x, LSL = NA, USL = NA,
 		else {
 			z <- min(zul, zll)
 		}
-		if (LT == FALSE){
+		if (LT != FALSE){
 			z <- z - 1.5
 		} 
 		return(as.vector(z))	
@@ -474,15 +474,19 @@ if (is.numeric(xLT)){
 	grid::grid.text(expression(bold("Mean: ")), y=unit(.95,"npc")-unit(1.5,"lines"), 
 			just=c("right","top"),
 			gp=grid::gpar(cex=.8))
-	grid::grid.text(sprintf("%.4f",mLT), y=unit(.95,"npc")-unit(1.5,"lines"), 
-			just=c("left","top"),
-			gp=grid::gpar(cex=.8))
+	if(!is.na(mLT)){
+	  grid::grid.text(sprintf("%.4f",mLT), y=unit(.95,"npc")-unit(1.5,"lines"), 
+	                  just=c("left","top"),
+	                  gp=grid::gpar(cex=.8))
+	}
 	grid::grid.text(expression(bold("SD: ")), y=unit(.95,"npc")-unit(2.5,"lines"), 
 			just=c("right","top"),
 			gp=grid::gpar(cex=.8))
-	grid::grid.text(sprintf("%.4f",sLT), y=unit(.95,"npc")-unit(2.5,"lines"), 
-			just=c("left","top"),
-			gp=grid::gpar(cex=.8))
+	if(!is.na(sLT)){
+	  grid::grid.text(sprintf("%.4f",sLT), y = unit(.95,"npc") - unit(2.5, "lines"), 
+	                  just = c("left", "top"),
+	                  gp = grid::gpar(cex = .8))
+	}
 	grid::grid.text(expression(bold("n: ")), y=unit(.95,"npc")-unit(3.5,"lines"), 
 			just=c("right","top"),
 			gp=grid::gpar(cex=.8))
@@ -548,31 +552,40 @@ grid::grid.lines(x=c(0,1), y=c(1,1), gp=grid::gpar(col="#BBBBBB",lwd=2))
 	grid::grid.text(expression(bold(P[p]*": ")), y=unit(.95,"npc")-unit(1.5,"lines"), 
 			just=c("right","top"),
 			gp=grid::gpar(cex=.8))
-	grid::grid.text(sprintf("%.4f",cpLT), y=unit(.95,"npc")-unit(1.5,"lines"), 
-			just=c("left","top"),
-			gp=grid::gpar(cex=.8))
+	if(!is.na(cpLT)){
+	  grid::grid.text(sprintf("%.4f", cpLT), y = unit(.95, "npc") - unit(1.5, "lines"), 
+	                  just = c("left", "top"),
+	                  gp = grid::gpar(cex = .8))
+	}
 	grid::grid.text(expression(bold("CI: ")), y=unit(.95,"npc")-unit(3,"lines"), 
 			just=c("right","top"),
 			gp=grid::gpar(cex=.7))
-	grid::grid.text(paste("[",paste(sprintf("%.1f",cpiLT[1]),sep=""),
-					",",sprintf("%.1f",cpiLT[2]),"]",sep=""), 
-			y=unit(.95,"npc")-unit(3,"lines"), 
-			just=c("left","top"),
-			gp=grid::gpar(cex=.7))
+	if(!is.na(cpiLT)){
+	  grid::grid.text(paste("[", paste(sprintf("%.1f", cpiLT[1]), sep = ""),
+	                        ",", sprintf("%.1f", cpiLT[2]),"]", sep = ""), 
+	                  y = unit(.95,"npc") - unit(3, "lines"), 
+	                  just = c("left", "top"),
+	                  gp = grid::gpar(cex = .7))
+	}
 	grid::grid.text(expression(bold(P[pk]*": ")), y=unit(.95,"npc")-unit(4.5,"lines"), 
 			just=c("right","top"),
 			gp=grid::gpar(cex=.8))
-	grid::grid.text(sprintf("%.4f",cpkLT), y=unit(.95,"npc")-unit(4.5,"lines"), 
-			just=c("left","top"),
-			gp=grid::gpar(cex=.8))
+	if(!is.na(cpkLT)){
+	  grid::grid.text(sprintf("%.4f", cpkLT), y = unit(.95, "npc") - unit(4.5, "lines"), 
+	                  just = c("left", "top"),
+	                  gp = grid::gpar(cex = .8))
+	}
 	grid::grid.text(expression(bold("CI: ")), y=unit(.95,"npc")-unit(6.5,"lines"), 
 			just=c("right","top"),
 			gp=grid::gpar(cex=.7))
-	grid::grid.text(paste("[",paste(sprintf("%.1f",cpkiLT[1]),sep=""),
-					",",sprintf("%.1f",cpkiLT[2]),"]",sep=""), 
-			y=unit(.95,"npc")-unit(6.5,"lines"), 
-			just=c("left","top"),
-			gp=grid::gpar(cex=.7))
+	## TODO: see one-side specs
+	if(!is.na(cpkiLT)){
+	  grid::grid.text(paste("[", paste(sprintf("%.1f", cpkiLT[1]), sep = ""),
+	                        ",", sprintf("%.1f", cpkiLT[2]), "]", sep = ""), 
+	                  y = unit(.95,"npc") - unit(6.5, "lines"), 
+	                  just = c("left", "top"),
+	                  gp = grid::gpar(cex = .7))
+	}
 	grid::popViewport()
 	grid::popViewport()