Version 3.2v3.2

1 files changed, 13 insertions, 8 deletions

diff --git a/CakeInit.R b/CakeInit.R
index 0adab40..a23ad95 100644
--- a/CakeInit.R
+++ b/CakeInit.R
@@ -2,11 +2,11 @@
 
 # Purpose: Load the modules required by CAKE
 # Call with chdir=TRUE so it can load our source from the current directory
-# Tessella Project Reference: 6245
+# Tessella Project Reference: 6245, 7247, 8361, 7414
 
-# Copyright (C) 2011 Syngenta
+# Copyright (C) 2011-2016 Syngenta
 
-#    This program is free software: you can redistribute it and/or modify
+#    The CAKE R modules are free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
@@ -17,24 +17,29 @@
 #    GNU General Public License for more details.
 # 
 #    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.”
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-library(mkin)
+library(FME)
 library(Rsolnp)
 source("CakeModel.R")
 source("CakeOlsFit.R")
 source("CakeIrlsFit.R")
-source("CakeOlsPlot.R")
-source("CakeIrlsPlot.R")
+source("CakePlot.R")
 source("CakeNullPlot.R")
 source("CakeCost.R")
 source("CakePenalties.R")
 source("CakeMcmcFit.R")
 source("CakeSummary.R")
+source("CakeErrMin.R")
+source("CakeHelpers.R")
+source("CakeSolutions.R")
 
 options(width=1000)
 options(error=recover)
 options(warn=-1)
 
 # When running from C#, this must match the C# CAKE version
-CAKE.version<-"2.0"
+CAKE.version<-"3.2"
+
+# The number of data points to use to draw lines on CAKE plots.
+CAKE.plots.resolution<-401