[Dream-commits] r38 - pkg www

[noreply at r-forge.r-project.org]

Author: josephguillaume
Date: 2012-09-13 03:20:23 +0200 (Thu, 13 Sep 2012)
New Revision: 38

Added:
   www/LREWswI_synthetic.zip
Modified:
   pkg/DESCRIPTION
   pkg/LICENSE
Log:
Added SWAT Parallelisation example to www

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-05-25 02:58:03 UTC (rev 37)
+++ pkg/DESCRIPTION	2012-09-13 01:20:23 UTC (rev 38)
@@ -12,5 +12,6 @@
 Suggests: snow, R.matlab, lattice, reshape, mgcv
 Enhances: multicore, foreach, doMPI, doMC, doSNOW
 Imports: stats, utils
-License: file LICENSE
+License: bsd
+Copyright: The code in ACR.R,AdaptpCR.R,CalcCbWb.R,CalcDelta.R, non-parallelised code in CompDensity.R, CovInit.R, DEStrategy.R, dream.R, GenCGR.R, handleBounds.R, LHSInit.R,metrop.R,offde.R,RemOutlierChains.R is Copyright (c) 2008, Los Alamos National Security, LLC. All other code is Copyright(C) Joseph Guillaume and Felix Andrews.
 URL: http://dream.r-forge.r-project.org/

Modified: pkg/LICENSE
===================================================================
--- pkg/LICENSE	2012-05-25 02:58:03 UTC (rev 37)
+++ pkg/LICENSE	2012-09-13 01:20:23 UTC (rev 38)
@@ -1,4 +1,4 @@
-Copyright (c) 2008, Los Alamos National Security, LLC                                        
+The code in ACR.R,AdaptpCR.R,CalcCbWb.R,CalcDelta.R, non-parallelised code in CompDensity.R, CovInit.R, DEStrategy.R, dream.R, GenCGR.R, handleBounds.R, LHSInit.R,metrop.R,offde.R,RemOutlierChains.R are Copyright (c) 2008, Los Alamos National Security, LLC
 All rights reserved.                                                                         
                                                                                              
 Copyright 2008. Los Alamos National Security, LLC. This software was produced under U.S.     
@@ -31,3 +31,12 @@
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,      
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                                           
+
+All other code is Copyright(C) 2009, Joseph Guillaume and Felix Andrews.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

Added: www/LREWswI_synthetic.zip
===================================================================
(Binary files differ)


Property changes on: www/LREWswI_synthetic.zip
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/zip