version 1.1.8

cran · Oct 23, 2014 · 52151d7 · 52151d7
1 parent 0278349
commit 52151d7
Show file tree

Hide file tree

Showing 24 changed files with 2,063 additions and 986 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,18 +1,18 @@
 Package: mixexp
 Type: Package
 Title: Design and analysis of mixture experiments
-Version: 1.1.2
-Date: 2014-2-13
+Version: 1.1.8
+Date: 2014-10-23
 Author: John Lawson <lawson@byu.edu> and Cameron Willden <ccwillden@gmail.com>, with contributions from Greg Piepel
 Maintainer: John Lawson <lawson@byu.edu>
 Description: This package contains functions for creating designs for mixture experiments, making ternary contour plots, and making mixture effect plots.
 License: GPL-2
-Depends: gdata, lattice, grid
+Depends: gdata, lattice, grid, daewr
 LazyLoad: yes
 Repository: CRAN
 Repository/R-Forge/Project: daewr
-Repository/R-Forge/Revision: 78
-Repository/R-Forge/DateTimeStamp: 2014-05-19 16:38:49
-Date/Publication: 2014-05-28 23:56:32
-Packaged: 2014-05-19 18:15:12 UTC; rforge
+Repository/R-Forge/Revision: 97
+Repository/R-Forge/DateTimeStamp: 2014-11-10 23:28:11
+Date/Publication: 2014-11-11 17:40:49
+Packaged: 2014-11-10 23:45:09 UTC; rforge
 NeedsCompilation: yes
diff --git a/MD5 b/MD5
@@ -1,32 +1,40 @@
-187ffd88b53a62f40d29a467f98d1e0f *DESCRIPTION
-70f353bbcf9f063d80b8ccd215315a86 *NAMESPACE
-3ec52fe3e08a373b966eced0bbbfc92b *R/DesignPoints.R
-499449d4931740e97e004e96d4ba7762 *R/Effplot.R
+b921728fe8f6263b66cf9e9cf074ac30 *DESCRIPTION
+788c6be87e8f0af71133efc221533d65 *NAMESPACE
+ea382d7453c479a03af89691cc374ccc *R/DesignPoints.R
+2aba9e9441ab3ba868b42efa8860814f *R/EffPlot.R
 3ad3c71d8af463b0f60927c48b6e748a *R/Eflags.R
 e5923423320694b42f114b885f71a72e *R/Fillv.R
-7bc2189d5de6273eb0e1d398370af7f5 *R/MixturePlot.R
+b13380299d991f907ebd51b08be60d62 *R/MixModel.R
+db890971519809f9cc3f79f16082f2ff *R/MixturePlot.R
+51777b9d9c985bfa4c70454b14d19962 *R/ModelEff.R
 5249a4ad3378db1f384f2bd9e803b688 *R/ModelPlot.R
 7c14430661e5a923dc39735d2cfa28a6 *R/Nrows.R
 1d1e41d2404b692fcb2a12609635db5a *R/SCD.R
 85308cc0960ee332036cfdc426f161f2 *R/SLD.R
 e70968351adb60ab99a8571bb4c0a18a *R/Vertcen.R
-fef7c9f2b5b951c9cd087a7e6ead8bea *R/Xvert.R
+a447d784bb61990a3e86539ba74f1ffa *R/Xvert.R
 030481ace7350906616dd1664f94e931 *R/crvtave.R
-63e4e93a9493a349081b2b6154470b8d *data/SneeMq.rda
-90b162a1185d2f0ef73cb9c3ed9b180d *data/conmx.rda
-fc4cc20d138fd0263981a84fdae1a71b *man/DesignPoints.Rd
-32d95380b71d4d6ed3db1c87f54c202c *man/Effplot.Rd
+c6f4128107aceabcc4f15c4dc875ac46 *R/cubic.R
+c1eadd695808d7a6fdc42ac85b2f0873 *data/Burn.rda
+273a863fdafc5f7544663b7b3f35f511 *data/SneeMq.rda
+66138b386fc212a206bc257e93a2b930 *data/conmx.rda
+3fd3d652333579c24c0f16b644b03e5b *man/Burn.Rd
+c5ec4b8a6e72cbcd7dc8f87a9d3bdb3e *man/DesignPoints.Rd
+1f38ab47802504244a6dabc3d1e25d0d *man/EffPlot.Rd
 9d7f235aed70124c06cf37f2f3f506c1 *man/Eflags.Rd
-c752862189a65e7cb34a3bb13f6db8b3 *man/Fillv.Rd
-2389c92a2cd76add93a308c993e8fc00 *man/MixturePlot.Rd
-573176afe5ac0b52007df7d62a115c29 *man/ModelPlot.Rd
+625a26ad79003b0984b5d389b7de606a *man/Fillv.Rd
+e773ef575da8279dc7ef3b144d23345d *man/MixModel.Rd
+b008d79d19cf43df4cbfc4aacfe1ade2 *man/MixturePlot.Rd
+359ae1152c3f6b77d0c14b003fae4e89 *man/ModelEff.Rd
+2b51e52180243cf3c9c85a95a7e7b0b7 *man/ModelPlot.Rd
 879dc499dd3a525092f962a75635e691 *man/Nrows.Rd
 93752cb0de5f573cc8aab1c4d3eca31c *man/SCD.Rd
 7d54d42a54f3d4c616a078c2a831d874 *man/SLD.Rd
 ef120358472acaeef56830a2e77c4003 *man/SneeMq.Rd
 839670e08fa17a6fdd089d333c7faca9 *man/Vertcen.Rd
-d638e283ff51ff118839715475e6f0a1 *man/Xvert.Rd
+3cbfa760438ddbdea88d8e5acf0f6828 *man/Xvert.Rd
 8d4b33af6aefb0bf66ab73a7bf021978 *man/conmx.Rd
 0ff0431b909cec74010404c99723231f *man/crvtave.Rd
-49e70327ca01ceab8a7c17d39dfb24a0 *man/mixexp-package.Rd
+b76d4ba05bdfefebbac57def0fa56ced *man/cubic.Rd
+6845de9a421bf92cc67ae4275b0efa41 *man/mixexp-package.Rd
 4adf6166def03e0720733fa47d8e82c0 *src/cnvrt.f
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,15 +1,18 @@
 useDynLib(mixexp)
-import(gdata, lattice, grid)
+import(gdata, lattice, grid, daewr)
 export(crvtave,
+       cubic,
        Eflags,
-	   Nrows,
-	   Vertcen,
-	   SCD,
-	   SLD,
-	   MixturePlot,
-	   ModelPlot,
-	   DesignPoints,
-	   Xvert,
-	   Effplot,
-	   Fillv
+	     Nrows,
+	     Vertcen,
+	     SCD,
+	     SLD,
+	     MixturePlot,
+       MixModel,
+	     ModelPlot,
+	     DesignPoints,
+	     Xvert,
+	     EffPlot,
+       ModelEff,
+	     Fillv
        )
diff --git a/R/DesignPoints.R b/R/DesignPoints.R
@@ -1,46 +1,56 @@
-DesignPoints = function (des = NULL, x = NULL, y = NULL, z = NULL, x1lower = 0, 
-    x1upper = 0, x2lower = 0, x2upper = 0, x3lower = 0, x3upper = 0,
-    axislabs=c("Fraction x1","Fraction x2","Fraction x3"),
-    cornerlabs = c("x1","x2","x3")){
-    check1 <- is.null(des)
-    check2 <- is.null(x)
-    if (check1 & check2) {
-        design = FALSE
-    }
-    else {
-        design = TRUE
-    }
-    if (check2) {
-        x <- c(0, 0, 1)
-        y <- c(0, 1, 0)
-        z <- c(1, 0, 0)
-    }
-    if (check1) {
-    }
-    else {
-        x <- des$x3
-        y <- des$x2
-        z <- des$x1
-    }
-    w <- runif(length(x))
-    Check <- x1lower + x1upper + x2lower + x2upper + x3lower + 
-        x3upper
-    if (Check == 0) {
-        cls <- c(rep(0, 6))
-        constraints = FALSE
-    }
-    else {
-        cls <- c(rep(0, 6))
-        cls[1] <- x1lower
-        cls[2] <- x1upper
-        cls[3] <- x2lower
-        cls[4] <- x2upper
-        cls[5] <- x3lower
-        cls[6] <- x3upper
-        constraints = TRUE
-    }
-    MixturePlot(x, y, z, w, x3lab = axislabs[3], x2lab = axislabs[2], 
-        x1lab = axislabs[1], corner.labs = cornerlabs, 
-        lims = cls, constrts = constraints, contrs = FALSE, cols = FALSE, 
-        mod = 1, n.breaks = 9, despts = design)
+DesignPoints = function (des = NULL,nmxcmp=3, x = NULL, y = NULL, z = NULL, x1lower = 0, 
+                         x1upper = 0, x2lower = 0, x2upper = 0, x3lower = 0, x3upper = 0,
+                         cornerlabs = c("x3","x2","x1"),
+                         axislabs=c("x1","x2","x3"),pseudo=FALSE)
+{
+  if (nmxcmp > 3 ){ stop("DesignPonts function only works for designs with three mixture components")}
+
+  for (i in 1:3) {
+    axislabs[i]<-paste("Fraction ",axislabs[i])
+  }  
+  check1 <- is.null(des)
+  check2 <- is.null(x)
+  if (check1 & check2) {
+    design = FALSE
+  }
+  else {
+    design = TRUE
+  }
+  if (check2) {
+    x <- c(0, 0, 1)
+    y <- c(0, 1, 0)
+    z <- c(1, 0, 0)
+  }
+  if (check1) {
+  }
+  else {
+    if (ncol(des) !=3) {cat("Warning: the design matrix has more than three columns; the DesignPoints function ","\n")
+                        cat("only plots design points for designs with three mixture components. Component x1 is","\n")
+                        cat("assumed to to be the first column of the design, x2 the second and x3 the third. Other","\n")
+                        cat("columns are ignored. Use cornerlabs and axislabs to change variable names in the plot.","\n")}
+    x<-des[ ,3]
+    y<-des[ ,2]
+    z<-des[ ,1]
+  }
+  w <- runif(length(x))
+  Check <- x1lower + x1upper + x2lower + x2upper + x3lower + 
+    x3upper
+  if (Check == 0) {
+    cls <- c(rep(0, 6))
+    constraints = FALSE
+  }
+  else {
+    cls <- c(rep(0, 6))
+    cls[1] <- x1lower
+    cls[2] <- x1upper
+    cls[3] <- x2lower
+    cls[4] <- x2upper
+    cls[5] <- x3lower
+    cls[6] <- x3upper
+    constraints = TRUE
+  }
+  MixturePlot(x, y, z, w, x3lab = axislabs[3], x2lab = axislabs[2], 
+              x1lab = axislabs[1], corner.labs = cornerlabs, 
+              lims = cls, constrts = constraints, contrs = FALSE, cols = FALSE, 
+              mod = 1, n.breaks = 9, despts = design,pseudo=pseudo)
 }