[Rcpp-commits] r3568 - in pkg/RcppDE: . R inst/doc man src tests

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sun Apr 8 22:14:36 CEST 2012 

Author: edd
Date: 2012-04-08 22:14:35 +0200 (Sun, 08 Apr 2012)
New Revision: 3568

Modified:
   pkg/RcppDE/.Rbuildignore
   pkg/RcppDE/ChangeLog
   pkg/RcppDE/DESCRIPTION
   pkg/RcppDE/R/DEoptim.R
   pkg/RcppDE/R/zzz.R
   pkg/RcppDE/inst/doc/RcppDE.pdf
   pkg/RcppDE/man/DEoptim.Rd
   pkg/RcppDE/src/deoptim.cpp
   pkg/RcppDE/src/evaluate.h
   pkg/RcppDE/tests/compTest.R
Log:
Release 0.1.1 with a few changes that had been here for almost a year, as
well as what Uwe just asked for the not fail a stopifnot() comparison which
DEoptim which appears to have improved its results. To be chased by us...


Modified: pkg/RcppDE/.Rbuildignore
===================================================================
--- pkg/RcppDE/.Rbuildignore	2012-04-08 15:38:34 UTC (rev 3567)
+++ pkg/RcppDE/.Rbuildignore	2012-04-08 20:14:35 UTC (rev 3568)
@@ -1,3 +1,5 @@
 benchmark.R
 inst/doc/figures/
 inst/scripts/check2.r
+inst/doc/jss.bst
+inst/doc/jss.cls

Modified: pkg/RcppDE/ChangeLog
===================================================================
--- pkg/RcppDE/ChangeLog	2012-04-08 15:38:34 UTC (rev 3567)
+++ pkg/RcppDE/ChangeLog	2012-04-08 20:14:35 UTC (rev 3568)
@@ -1,3 +1,24 @@
+2012-04-08  Dirk Eddelbuettel  <edd at debian.org>
+
+	* DESCRIPTION: Release 0.1.1
+
+	* tests/compTest.R: With the just-release DEoptim 2.2.0, results are
+	no longer identical so we commented-out the stopifnot() comparison to
+	not break any automated tests (as requested by the CRAN maintainers)
+
+	* .Rbuildignore: Added a few more files which R CMD check does not
+	want to see in the tarball
+
+2011-03-07  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/evaluate.h: Also reflect '...' argument from R function we pass
+	in, with thanks to Josh Ulrich for the one-line patch
+
+	* R/DEoptim.R: No longer pass environment 'env' down
+	* man/DEoptim.Rd: No longer document now unused 'env'
+
+	* src/deoptim.cpp: Minor tweak to RcppArmadillo object creation
+
 2010-12-12  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.1.0

Modified: pkg/RcppDE/DESCRIPTION
===================================================================
--- pkg/RcppDE/DESCRIPTION	2012-04-08 15:38:34 UTC (rev 3567)
+++ pkg/RcppDE/DESCRIPTION	2012-04-08 20:14:35 UTC (rev 3568)
@@ -1,5 +1,5 @@
 Package: RcppDE
-Version: 0.1.0
+Version: 0.1.1
 Date: $Date$
 Title: Global optimization by differential evolution in C++
 Author: Dirk Eddelbuettel extending DEoptim (by David Ardia, Katharine Mullen,
@@ -7,9 +7,13 @@
 Maintainer: Dirk Eddelbuettel <edd at debian.org>
 Description: This package provides an efficient C++ based implementation of the
   DEoptim function which performs global optimization by differential evolution. 
-  It aims to show that "easier, shorter, faster: pick any three" is achievable
-  when moving code from plain old C to modern C++.
+  Its creation was motivated by trying to see if the old approximation "easier,
+  shorter, faster: pick any two" could in fact be extended to achieving all
+  three goals while moving the code from plain old C to modern C++.  The
+  initial version did in fact do so, but a good part of the gain was due to 
+  an implicit code review which eliminated a few inefficiencies which have
+  since been eliminated in DEoptim.
 License: GPL (>= 2)
 Depends: Rcpp, RcppArmadillo (>= 0.2.8)
-Suggests: inline, DEoptim
+Suggests: inline, DEoptim, lattice
 LinkingTo: Rcpp, RcppArmadillo

Modified: pkg/RcppDE/R/DEoptim.R
===================================================================
--- pkg/RcppDE/R/DEoptim.R	2012-04-08 15:38:34 UTC (rev 3567)
+++ pkg/RcppDE/R/DEoptim.R	2012-04-08 20:14:35 UTC (rev 3568)
@@ -47,7 +47,7 @@
        checkWinner = checkWinner, avWinner = avWinner, p = p)
 }
 
-DEoptim <- function(fn, lower, upper, control = DEoptim.control(), env, ...) {
+DEoptim <- function(fn, lower, upper, control = DEoptim.control(), ...) {
   ##fn1  <- function(par) fn(par, ...)
   if (length(lower) != length(upper))
     stop("'lower' and 'upper' are not of same length")
@@ -71,9 +71,9 @@
     nam <- names(upper)
   else
     nam <- paste("par", 1:length(lower), sep = "")
-  if (missing(env))
-    env <- new.env()
 
+  env <- new.env()
+
   ctrl <- do.call(DEoptim.control, as.list(control))
   ctrl$npar <- length(lower)
   if (ctrl$NP < 4) {

Modified: pkg/RcppDE/R/zzz.R
===================================================================
--- pkg/RcppDE/R/zzz.R	2012-04-08 15:38:34 UTC (rev 3567)
+++ pkg/RcppDE/R/zzz.R	2012-04-08 20:14:35 UTC (rev 3568)
@@ -1,8 +1,9 @@
-.onLoad <- function (lib, pack) {
-    packageStartupMessage("Now loading:")
-    packageStartupMessage("  RcppDE: C++ Implementation of Differential Evolution Optimisation")
-    packageStartupMessage("  Author: Dirk Eddelbuettel")
-    packageStartupMessage("Based on:")
-    packageStartupMessage("  DEoptim (version 2.0-7): Differential Evolution algorithm in R")
-    packageStartupMessage("  Authors: David Ardia, Katharine Mullen, Brian Peterson and Joshua Ulrich")
+.onLoad <- function (lib, pkg) {
+    packageStartupMessage(paste("Now loading:",
+                                "  RcppDE: C++ Implementation of Differential Evolution Optimisation",
+                                "  Author: Dirk Eddelbuettel",
+                                "Based on:",
+                                "  DEoptim (version 2.0-7): Differential Evolution algorithm in R",
+                                "  Authors: David Ardia, Katharine Mullen, Brian Peterson and Joshua Ulrich",
+                                sep="\n"))
 }

Modified: pkg/RcppDE/inst/doc/RcppDE.pdf
===================================================================
--- pkg/RcppDE/inst/doc/RcppDE.pdf	2012-04-08 15:38:34 UTC (rev 3567)
+++ pkg/RcppDE/inst/doc/RcppDE.pdf	2012-04-08 20:14:35 UTC (rev 3568)
@@ -118,39 +118,44 @@
 << /S /GoTo /D [78 0 R  /Fit ] >>
 endobj
 118 0 obj <<
-/Length 3429      
+/Length 3333      
 /Filter /FlateDecode
 >>
 stream
-xÚµÛrã¶õÝ_¡Gyb£@äæi»Ýd6vÒ]Oûä’h[]]QZם~|Ï
- IQ²¶iÆ#“ÄåààÜϲÉÃ$›|•ÉówWø.×í•Ñ.ŸÜÝOteTfʉ7Z鼚Ü-&?M¿»®ìtw­§Ûõõ/w?Àœ¢;ÇeÊÛ Òà?Á¸÷Û'ø¿_¿0£·ŠÏU•Ù0c¿ƒj¬*\„ú@ÍèÁZäÊ”&LxƒC&·Æe¼‡­*í¹ïíõ­õùt^· «ávï‡Å-7øtÓ'xÀ¶¡k‡ýËÍ÷ß÷¨QöðvF‰ïÆPÕ¥rÐö°FAõHð†}ó͸[ã´Ê½‘]–<þÐ
-Æã,+rLÜ1èytal
-Ã6‹1˜Ö+ Í1Ì·H=”„zÁoµêìÖ¤3´“d	Øt›<KÎÙ}fÊ¿_,1;àc´kVJ»‰Î@°*M4.T‰$Ñh]%Ùlf‚E<¶vú£à·½¾unúO;ß#Ä«÷wW¿^!›²‰ž”zâ*§lv¾¾úé—l²€ö&™²U9y¦QëINl]M>]ý-ªYOÝ\1©TU˜‚ì+å*?q ¥UnD:Aäݱª—!0¢~‚t«½VÖäðRªp=£‹@§41‹šøsæ2Y
-þ”›ì&áõã÷W“Ÿôô/¨&È?ü5†X䈶T™ŽÂM\º~šiSÔ`7cëP4…òI±M–U=ÐöíY¤oóÌNß"1ƒ Ö#h;§lñ;b­³zˆöÍ+´ž
-' 4`•™)òt·½6~úEöDjÑ^ÓfØðs¦-òhÇŒ2%š%ì‡ 4_°i‹»;ìÆvÃóYd¤ñ–-©® ³ÂÁª«¨æz)²Zïã|
-æßwB䮘:0e2ÇâX¨ÜD[£Ú‡=?—²Ax±é^ðWX¶–çrv‡¥>m¾îmT; 0ô¼ð¬O²çíNÀ\ 
-d;àœ;–*cµ*M>”+ûäÊw4¡8!!LxzFA’#­1Ê™JéÖv'”yXâ¼:h8ÐÆT†zÖOAë׸
-Â܍<–àç&Mcâ7bdŸHÓ´cÑì‡÷焤RÖF)jçz„ÅÆf$6¦Òqó„ö?²BÐ7¡ó¸¸—÷j
-ðùö¯Ÿ>ðøwüx~rÍø£hHéUŸ°´@Œæ^¤ÖÚ@rA5?ÖHªÃÿ?rK¤;;(Rwø'$Ç¡˜‚•œµnM®ä‘¤k¢!ØÊó>VwùŠqtÂ2è
-ôäÓ§:B§ïÄNñ—€
-šÔÃœ§Ó z³DîÌ;%=]•dÖ™œÑ[
-@²S´Á6¨n Úòžƒðöø>–1›Wªð¦YÑïXÖn-Ä•….úôC]·ÄÉ"#”lÁK?616ê˜=póúd¸5tEíÅE H«Ï×®˜Ö
-¯tiz¿‡× Õg‡ wA÷V)˜	|ÿîºÌ§;jù9³ÙužçdضLë×MøZ„ƒÎnÜ0aïPw¨q ã0`!2ËâFþJZÅËð6XËBéB÷yµ&Û†„+
-{Fúž³)ÆÆetÍÃnè&pÀö~ÌPAì[Ú꜡‚pÔ¤ÛD˜yŒ0y ½4ºâÓ[	$°LéÂ9i52†8’ԍÕ_ÿy
-‹}I^¾mWː ˆ’¾‚ùƒvËCQ”Ú&ào“M‘|ÈH ×ñý¨áÒÜ ·5´Ôg#¯.QrÎf‚ž¤|àÃKÈIR²$.Üúßàò‰Kg´6„¾é±§-ÐØ×–ePô–{)±g2×!¼¯Ç¡»—Ã\0$¯xà*+ûùë­uÙyQ S©læûÚI@>‹T3Äc{•ÛnÚ!2¤Þ‰#ÅÖl™‡ÅGÖäS;’£Nƒüò˜ÇАgÅ…*¨]aC€‰+~
-2G¡ú®
-º.[ž½¬”Ù—ÙdXᤔ‰ƒ¦fV™j(ü]R¬BÝÒy° ðxMæ¾ãVáÃª.…‰U™4è=f+œªt£ƒ%Ç¢4;(úᜥ—¨#¶O¡e$/Á,Û.^kî:*ªÒö"ÎC¨ŸâÒ‰¶KÐ¥j>swk³|ʲI*.¶šÛy‰&ÒF–÷@4‘àÜB¶ÖüÍC 
-I]@[¶Þo0¶ˆm‰í#yÐìxü<vÍ
-6Uî„i9­i™fÇ€Öõ²Óñ¼Ì‚N3¹E at p×-?ŸC8»¢"¯G(âà>„8¸Œ¡ô‰u¬¶	^I°ƒÎÅDŸ`ˆb
- ñF€oR´=O„€ž9ŬD‰vß]êïÆæ[vsii3}`:µAÉít*XÀe¼Åòžò•”°þ,ë¼Àï€:ˆiÚ±úÈmžœÌ›T±KCŠñ
-ë4@ÁXÓ“í1hîkËýUÀïdÕ«‹¼RjÁv«’ÂÒ×ê#$g̍€y 9iö1žeyYY˜%Š2ÆÄŠT@ìo¸B™Ò÷»Ê m’‡‹Hȹ³fÂ!»¶•ùVö½;Pñ¥gVq<?dïMÝ÷)U—D›‰'2Od°n°\U$
-Ðxd½ægŠç›{NÂiT,¹Ÿqš0;
-ëQ…˜Ôgº_cñ!ÈS½ê‡GJúý¥Wt᳓>œŠJïƒäµûn™;ÓÓïb”7Á:#3ü¤Botõ£OD˜îo×ýÂZË "#2Œç‚¾ïczOü‡¾é>Ô„6Š-÷–VˆR=2§ÊHÇ$CQ©’ôG(aÿÛ•äÂVŠAëè½¢0ŠóØí8áäí¢ïØ¥ցŠRuAGV@˜o;z¹LSGŠìQv±ÃÞƒè¶h¹»{RÔSnmÊrsö´l Ü¹²EhO “)øÐ*;v•Ií‰ØäpupxmÐ"ÜX±ÀEd{‘
-±¥ ÜZ¥#!À./øH¸®sð‚Ö«ÊÊÙ–ˆ¼Ë2Pxä–›ƒ¾>›.ó t#ÄÆ€ÅÄR6ØÄ<÷_aˆíýÿá´¤3SY:Ê™ÒY3©eצÀÖ~ËY‰q »ãƒ’ÎÎ+ˆjG1þš|x€´®~³ÜÎél{c,@*>š}à°SÇ%Øw.§ªr`ÁbùÊåÍEO^­ëJÝÇÑÃN „)º©q½y Dü´®(u¤—¶WunbN¶YW)ˆ
-KDºÍ:EIäkJR˜å‰ *ØzØZÒ‘íê(gƒî3ß}0½2-Ú"ÀøÇàóæÍ…ù0LÒUåGE†–;U€ˆ¿\r8TðÂó¦F^îùÙÆM!hëe_fú~0XÀÓ-rc‘6Á3£>q8ŽfM²ÄXus1³)ó”OÃû׳ç³âÎ.+:ßÛÏàÏ:Â{TËìež‹³‡M·—“¥oq­j,töúD~Î[öZµçm°Q%[w£âh®­º„õ:9n/Ù"¹³-7t/`t3γ´¿f)F5”L„÷e)/“º2ù=£Ô~Û6üøîljXçH%YfÑ ¡}Û×&¬6<œp‘u?‡L]°ª%@áBú ’å³$"n½nRYa„,_(‰ ª„sk*|稰S‹ ³L>cÄ~@Û!)ê®Ö`‡ÄM¡¨O“d¹ƒØ}l"ÃØÕÝÓ*ì o>J6¬Ù¿47óÀ’ÚàY¬vì^¸eÏR÷¢p¥c¾‚¥Ç‘w@Ÿuý9D´dÂNx*"Û_p´ û5²|ÕðÄèr`KÜŠøQuøïC<¢tã¦#J°ð{GÖ†öZ	¬‰GŒq­U×ï|	0rªLÒ!L8§F[¥ýë¼ög=t‹áe™[p[P.]Šu1èË ÷îH0yêáãªx#.¬åA\iˆö±£CýšzGä„wP¯ƒ ÕþÝ?úI‡ñóÈéQg)/Œžâ—&•BÏD‰¥=rËØ,4‚9å–iº¹ÄñŸôÑ ækhç4Ó¿ãaOt»ð&gGH“Ôn×mÓ¡Am{YžžåçJíÃ|$¤Šæ+‘Rù*ÖfÂŘʇƒi¹ú
-tÓ¥*ønLUtÎâ›ãòLïzžaÏ¿÷¯Ç@ÃW]iÆ	¹÷ÃLÂeåÿžIX­LY¼zC†¬T¶‡îÁfb>‹¬³Ñ®¯¸0"·g2Uºü(4|ívŒ-ù
->QY¬h9¾‹72予Ž‘é05ÐÎB.fÎæ•*¬=u[†™ÅÂÈ}8+ï7÷ŠØíÄ0gÙß›ØØP?»`–*
-3¸8;Ü‹s‘»G	paŠËèŒdÕ»e„õ«ŒµÇe$J)+e÷ÀÕ˜³Õ&Ã…~©,Ý‹¸î^Â9ª×॒t–yaí¡L*Oç-c<cÿÙ¤­Âí8ü>Í„{}á0e®?›räY¼6×òôpLLÃjn{–‡cSßß]ýˆ{Ô¦
+xÚµZY“ÛÆ~ß_ÁGlYD0ùIQd—œr*‘¶’Û ‰åÒ汸Z+•òoO_3€ EGJ©´ 13===}|Ý3Ùl=ËfßÞdòüóÝÍŸ¾±j¦ŠT+ggw÷3Ué4Óå¬Ð*U¶šÝ­f?$ßÜV&ioUrØÝþt÷ŒÉûc\–ÆEêüè÷æðøãGf)lZeƏ8¦¨j“æ.P}¤–Hô‘èOÍmªKí¼Ä.³¹.tª‹^TZ©‚Û^ÝÎMa“eÝ­†tGxZ}ä_›=>]òX64µØ¾Ù¯¹ý~ rÀ·ÓiÅñzŠUU¦¾øõ#­IR¼†n_}5En®Jm¡e•%÷ê„ãé-Ëmq*Ü)ê6	:ß·†nûÕMS¤ šSš¯Pz¨	õ
+‚ÿÛmoÅ00휦•ä K°MsBò¬Q8¦ý…%ÿfµjÄâ	G”]³eRÊÍTŠU)’qž–(e@ÖUÔÍf!\Ô¸ÇÆ$þ·sç’Ÿ‘ìòˆoÞÜÝüzƒÛ”ÍÔ¬T3W¹TÃb—»›~Êf+øþÝ,KMUΞ©×nfi[·³÷7ÿf607—Ϫ´ÊuN\T©«Š™-­¬íDqïŽÈU-¼Œ‰‘ô#¥¹*Tj´…—2µÀë[9Ł֤Ö«ù1s™LÿR7k×3ÿúîÛ›Ù*ùí7ÿ7{&™ÛIP„Òë¦mú½ÆÞéh%SSŒØÓEj«@KgY5 ß¾¾ÈïÜ”.y…‚$å«'Øu.Í2÷ÙÕ‘]•Õc~_|B¾‹ñ ØšZÚä‘ÕTÉÑa²…[óÄ[׏™2ø¹Å?{ì}ô¿½%y`Ãl8à2ŸpÅÒã°ç‡GÿeÎ~TUŠ¼ÀœŒUs·M­~°Íªäß[‘t_I]‘ªèIÞMhcžZx‘)“{{Äg™ðds«²-„÷Šûø©ky’¶?z%Ý
+$Q÷‹·ºL>òû{Æ¡•Æ+,Â;Í’ÂÉ©†i¶™é/¦bEß òi}i ÞÓû3.dF»i4Æ(#»é˜Ö¡¹¬7{VHFWú¢Hž»ÁüÜÇa{ð±1‘7qØ©ž¨¢L³¢¸¤(UjLé;tK¿²}¨:&#ÕÑ•
+‹'Ž°ý}ý&vž‘ÂFFC«"$€ÏW{ÿ–û¿æÇóƒˆk‰ÄÄLJp Ê
+KtÞmEmñ¡(Tóc‡¢zZâßþäÞ3~ø#"Ç Rtž4ØΦ·£èFÚH
+6S€·¬ru÷ÀàGÌQ‘ˆ·[Àåԁ:ýŽÛ)!XAÇó´äáÔ©Þ‚{ã®1HÞ:m™½ü€3Ò;o¸žhÇ+xöÊ;Ø¿Àð©Ž[¥y¡àŠþŸêÚÜ ´ÌU>”û ÚÉ<cÇ™óÔM€G=ß‘^E\CÏû õH  eõË­Ë“zÝðLW8¦7+‰{
+J}ñäíÎÛÞ–)y7ïßÜBœiéˏ™Én­œŒ"gYÚ[aÈ:úÎ2hÛ}é8tX‰NyÁ²ºQÐ’¯jxl‚ežª\
+÷jG¾
+WêdµñÚ¾$YÐǍ(=|]·ã ÷SŽJ!Ô©.9*@¤:ö8, dÚ 2%vkœŽž}õÌXƌᒶjICèIæÆ惯ÿ	{
+“}àÁ˜¾•¡Àä}o…5Š݁»¢*u{˜èS'4’HwŠ!t¸6=,­ÈR¥ò‹†aÊkƒµœ¼¤h¹K–QÅGá»Ìú¦ûÙÑ;Se ž±SLX	||<c"ÐÄ	MÑ×eê¥çÞÙn2îBR”—ãná¸Ø$Ò=ë÷Ð;¨ÓCƒ¤M§0EÖè¡ÆÔ¦[˜6}}&—ŽÛP·;ñë¿,hS%,ÖFûÊa¦ã…â© ¡ ÷Íò+­N¹ m=¢ÄßßzK ¨ó>š®ÐT½ò{)£¯sÃ0ÃYåãÌLª«6øÚJ¬B ¬¬wðÓ[:y¬*‚g|g$Õ—0mÕº7Rˆr•VÂÑi®=?‘«@˜«Lä#؁ÕãÐçëaÇMçÑAžVÊ\µó
+B@°™°K“æÕ>3n››Ì&¬››èžù»/ÉD¾‘³}"™7™IšßÐ3x¡.êZê-Šâ%Â)¸Ø=PÐô  åþˈåšø©"„ã‡Yê[Ó4MË„võf ãø¼,¼M³¸EApÕ?Ÿ=‚ÝRé„7uóÐ×gú–=Ÿ™Ç˜è˜+Öƒ·Á¥¸	R\||!Ä÷`/£  eI0•$чªKí}8~àȧÖÉšåÔy¤`Ó«[Á.@¦m°¨¾V
+W•y>Âÿg ê ÆtSU/Ð[£ÿKèþ{¬ÕÅnej‹üíu6´ÑýS¼êÜ-ü
+g)LšUŸœäEæ‘(L¿)Ûºò^Ç{Ô&Ë
+¹Tˆ.GȬIWšcЬ3Û/ãA¸”h QÌ^YJ¤ÒápyHÄå©.‹A>7!9
+²:q•è€9wgaì“jS‰£ïdÝ-Êl”ãm{ýx¼OÚ›z)b†.ù~"&ÉE‘ÓzU<Z)~Ë=ë?#Œoî9÷¦^¡Ø~!pÂè©’aßHŠ™V—Ï"Ó*û0ë
+€a|q6ŽƒƒÏ“×>jlºžÂRÀû·Oâ›÷ÞI¯±ÁÀ–ú=åújO©Ï%cXä)Aß»ÝÀv:…H…_|æ¹äö¨ØÜú]ñ&Hî1™,­ˆÐµ‘^tˆ~;f%R'ê2ÜW[Ɇð¶Á,è¥Ä’¶å”“5CIgØщK¬»`\ËÓ™ž‰nâЉ²˜6Ôc8˜ðV7÷‹v®ŒK3«/™ìܦ&qà;Y
+?Tʏqø4èʱ%«$Š™ÒÄ#7{’ßxU.˜¤xqë«JãÑ0hs>‚Wâ¢)ÒÊÈ—€Ë20Ü0#£–¬ž–	NÈöü'8º9xHk‹?äU¬O~Æ¡IŸ&ˆXÖ1DßÃTäž>ãØÄ–âɍL1ì*Èëþ_Áƒ[\:8±W'#¶<‡H­¡ùðØs½œŒÔsŸfa[
+Ý× “)²XÍ‚÷QE%ÏG¢ÏúgãSÇŸ NÅ m®÷kJ"(~ÃÁˆáÝÇÅý²¤µç•8{’_ëýù.F ´BçÈz®8„Bzän¢ ƒ ò«]Þ½ÞŸ.'œÈp`¹"]Æ€®tÁû#iˆªªâŒNá8
+_ûF^îùÙEñ†V
+-ýUCcû‘{Pµ•‚Zè ñÚÆ/ŸÕ¥ T”!í)ªA胟kÞ‹#“YsPæÞZ(¾ÍC8ë©ïÂÇ÷–k1œš‚P•Ó%?Ç+ÏôÁ'ÀÐH˜lïË AÝרùÀ†A' Ùï¤
+±¾tì¶ñe àÊw
+µ£­Õ(Yĵ>ŽC7
+c„oÜØ?Ï &QÙ•
+Ê~?)žû3)†ugÕ ÚªpÎ	¯-'ݬ gØ°ô3Ð4ú [oóŒaûÆË}ÉÆE/:l[0ÄÙj`½Â
+PàŽÝ‰™÷ÂÂÉÆÈO;ûrJ4„ÄÚzÉé!  ©xÿŒÇIm¼¦Ck[Æ£'ö
+).XUSîPŸØŽÎñk0éS0$)̉^z†ê×^n
+aÛ¯âÂÇ
+
+¶›,zŒˆ‘9ëIµñºÝ	¾ÇLGa¶¥¸\ŠÁ•ƒÌšåOIR.CéõÑ›äÑùÙZn¦ÓH?S,nn	1Þ9;ÃqóÞÎxs‚1àí<²œ '­w=Û†uŽ‚Enl8‚¤¹¨T÷\EɱÏËÇyÕ9[]±xUëŸúÊË8â¬)ÊsP£YWüÍ[Lr’&ÑðÃÐÍ?—Ü,vðv9ri¼ï(ónJIú4‚µ`™!ñ¸…WPSJ~ô.àßÃsWÄß΄°f¥œëSóJo¶W7½Œ ‡AÚÆ	ø~!HÓð«`À…Rá›j—™üç-äÁÇ<ìàñ˜Dø^Mm)ða×P?X(Ä'W€ØÜ^ªÐ“–QJyU¶R¦E¼”äÃKUø#l¹$Rå¬÷UÎ×hСúo÷ÐÞð
+‘’;40jx‡>üïwhú‚Í`ÙÅÊ7ðFN<J<{†\U®Š.!ÁRBÑ‹ÄE¯ƒw§b“¥%æ–“õŠwh3=±zc
+Ž6ãîm¸·!GÊÔƒr&5¥¾˜2Tt'è̝bdbû½?Q~ö€
+¹?=
+÷2ø²¿¶%C^_п¸Ø­4Ïõè†íx-Î…í=9Hʼn)"б
+ÝÊ	w‘NnZ¾¹»ù/´3Žu
 endstream
 endobj
 78 0 obj <<
@@ -158,56 +163,56 @@
 /Contents 118 0 R
 /Resources 117 0 R
 /MediaBox [0 0 595.276 841.89]
-/Parent 130 0 R
-/Annots [ 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 128 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R ]
+/Parent 131 0 R
+/Annots [ 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 128 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 130 0 R 104 0 R 105 0 R 106 0 R ]
 >> endobj
 79 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [154.772 550.974 213.673 562.834]
+/Rect [154.594 550.974 214.206 562.834]
 /A << /S /GoTo /D (cite.MullenArdiaEtAl:2009:DEoptim) >>
 >> endobj
 80 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [215.7 550.974 237.617 562.834]
+/Rect [216.055 550.974 237.972 562.834]
 /A << /S /GoTo /D (cite.MullenArdiaEtAl:2009:DEoptim) >>
 >> endobj
 81 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [242.403 550.974 295.815 562.834]
+/Rect [242.581 550.974 296.703 562.834]
 /A << /S /GoTo /D (cite.ArdiaBoudtCarlEtAl:2010:DEoptim) >>
 >> endobj
 82 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [297.842 550.974 324.741 562.834]
+/Rect [298.552 550.974 325.451 562.834]
 /A << /S /GoTo /D (cite.ArdiaBoudtCarlEtAl:2010:DEoptim) >>
 >> endobj
 83 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [325.508 550.974 333.03 562.834]
+/Rect [326.218 550.974 333.74 562.834]
 /A << /S /GoTo /D (cite.CRAN:DEoptim) >>
 >> endobj
 84 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [376.398 539.018 427.666 550.879]
+/Rect [375.823 539.018 427.823 550.879]
 /A << /S /GoTo /D (cite.PriceStornLampinen:2006:DE) >>
 >> endobj
 85 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [429.806 539.018 451.724 550.879]
+/Rect [429.91 539.018 451.828 550.879]
 /A << /S /GoTo /D (cite.PriceStornLampinen:2006:DE) >>
 >> endobj
 86 0 obj <<
@@ -228,14 +233,14 @@
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [218.609 467.287 282.516 479.148]
+/Rect [218.378 467.287 283.553 479.148]
 /A << /S /GoTo /D (cite.CRAN:RcppArmadillo) >>
 >> endobj
 89 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [284.006 467.287 305.924 479.148]
+/Rect [284.928 467.287 306.845 479.148]
 /A << /S /GoTo /D (cite.CRAN:RcppArmadillo) >>
 >> endobj
 90 0 obj <<
@@ -263,105 +268,112 @@
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [80.004 339.014 105.903 351.812]
+/Rect [80.004 339.014 107.894 351.812]
 /A << /S /GoTo /D (cite.CRAN:DEoptim) >>
 >> endobj
 93 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [111.437 339.014 141.302 351.812]
+/Rect [113.215 339.014 143.08 351.812]
 /A << /S /GoTo /D (cite.CRAN:DEoptim) >>
 >> endobj
 94 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [130.393 247.327 191.593 260.125]
+/Rect [131.414 247.327 196.096 260.125]
 /A << /S /GoTo /D (cite.MullenArdiaEtAl:2009:DEoptim) >>
 >> endobj
 95 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [192.383 247.327 216.194 260.125]
+/Rect [197.907 247.327 221.718 260.125]
 /A << /S /GoTo /D (cite.MullenArdiaEtAl:2009:DEoptim) >>
 >> endobj
 96 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [220.006 247.327 275.196 260.125]
+/Rect [226.55 247.327 285.222 260.125]
 /A << /S /GoTo /D (cite.ArdiaBoudtCarlEtAl:2010:DEoptim) >>
 >> endobj
 97 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [275.986 247.327 305.251 260.125]
+/Rect [287.033 247.327 316.298 260.125]
 /A << /S /GoTo /D (cite.ArdiaBoudtCarlEtAl:2010:DEoptim) >>
 >> endobj
 98 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [306.28 247.327 314.327 260.125]
+/Rect [317.327 247.327 325.374 260.125]
 /A << /S /GoTo /D (cite.CRAN:DEoptim) >>
 >> endobj
 99 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [416.466 233.778 493.456 246.576]
+/Rect [444.911 233.778 522.996 246.576]
 /A << /S /GoTo /D (cite.StornPrice:1997:Differential) >>
 >> endobj
 100 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [494.953 233.778 518.764 246.576]
+/Rect [80.004 220.229 103.814 233.027]
 /A << /S /GoTo /D (cite.StornPrice:1997:Differential) >>
 >> endobj
 101 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [228.818 138.934 305 151.732]
+/Rect [307.623 138.934 385.251 151.732]
 /A << /S /GoTo /D (cite.StornPrice:1997:Differential) >>
 >> endobj
 102 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [310.325 138.934 334.136 151.732]
+/Rect [391.301 138.934 415.111 151.732]
 /A << /S /GoTo /D (cite.StornPrice:1997:Differential) >>
 >> endobj
 103 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [360.111 138.934 486.605 151.732]
+/Rect [442.534 138.934 522.996 151.732]
 /A << /S /GoTo /D (cite.VesterstromThomsen:2004:Comparative) >>
 >> endobj
+130 0 obj <<
+/Type /Annot
+/Subtype /Link
+/Border[0 0 0]/H/I/C[0 1 0]
+/Rect [80.004 125.384 125.665 138.182]
+/A << /S /GoTo /D (cite.VesterstromThomsen:2004:Comparative) >>
+>> endobj
 104 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [491.931 138.934 515.742 151.732]
+/Rect [131.538 125.384 155.348 138.182]
 /A << /S /GoTo /D (cite.VesterstromThomsen:2004:Comparative) >>
 >> endobj
 105 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [339.759 122.181 397.43 134.979]
+/Rect [339.742 108.632 397.443 121.43]
 /A << /S /GoTo /D (cite.PriceStornLampinen:2006:DE) >>
 >> endobj
 106 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [400.858 122.181 424.669 134.979]
+/Rect [400.869 108.632 424.679 121.43]
 /A << /S /GoTo /D (cite.PriceStornLampinen:2006:DE) >>
 >> endobj
 119 0 obj <<
@@ -380,1030 +392,1026 @@
 /Font << /F41 121 0 R /F46 122 0 R /F48 123 0 R /F15 124 0 R /F56 125 0 R /F64 126 0 R /F66 127 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-150 0 obj <<
-/Length 3947      
+151 0 obj <<
+/Length 4045      
 /Filter /FlateDecode
 >>
 stream
-xÚµZÛŽãÆ}߯Ð[4°E“}#i?­7^;Alëy³„Cq$y%r"JžÀ@~=uëf“CÍÈ6‚ŬÈf_««Nªît±Y¤‹oß|}ûæ‹÷™]diR¦e¶¸½_Ù"·yRj»¸]/~Zª›Ýþý‹÷®ˆ+eJC
-}P·7+­õ²®ú›lÙð>žà＆ÿž°L-w-ÿ>ܬ”[vGü¾ƒ¿þ6Ü‹:~|÷<ÆÏVYsëõ¼<à¼Þ¤²é*V~†+m“Â9žçÚUígèŠew¿å{Ã/Ýݧà¯ëw8pϹ9Ε&½áÒ{lÞI«úH«…&¸
-;Ä¿ns¬p˜í*HÐîçÔ¦²ø—ØÅ—¾}³ø)[~òÃ.hb$(Þ¯Ug:1ÎïECr_é2åá“‘œæÇšJO‰KC*ÍÒQ'P“ÏxÅ~Ã`EÕ戂©qÖ{¿ý(˜´‡½0*Ia3V0ckJ™0ÖïZ75i«ü
-ù,¿¦^J`Ö«41wø_*ÆŠ¾¤Ã]iÚç*T÷gL‹?!@—亘æóÄuzÕÆçº; šœIy¼ut-«’H%3­×Ã4Yé5ªô5vD¶xšAVšD[û•A1+ì|e þÆcâ"w¢4vßñ"ï4š/X¥4èjžU
-•®o. “;osð|ÂçÇ•“ÊBA‡BÞ²fPÁ»o€'7¢ª±îÇë@¹Aø†6ßI‹_²@ÁãÕ§6 òàíâVöwßÀϏÜn,5gçrßý®iE"U›žq‚¦Vµ"ƒï¨°õp»!œn¯ØÔÅOÔþ"Ш<K@ÅÇ{ j='š,ÉÊ`n4_oõé{R½jN4Ö&Je¿C4PÐ`îÂVn¯\3¸™‹ksX¬r—˜—'™âYÝnÙm–GYU¢Vˆ”P¬—»¿æÈï;ù(N5¹>³u“Âa_¢¦l¹#ifЫšöaNrY–äy¨2£Ø3»d²Ä•ÅÐ-̇Üî_Q‹ç1)Ø{$áy‹Q“8ÈOâ°¿Š"5²@R—‘5béN¼Hsœ "·‘¶÷ÕQ|AVNôP*íп<xE;4AêÜm×ÂFb`´¥ùíX…4MŠMVàg‚¨Œ-š_±·n/Ï÷Hß6È"7åò·†!‡ôÈCQ{Ze¯0Ô¶KÒa2–uܧõÄ•kO6úfÏœ‹ÓÎín:mj‡;tÂ!³ûë7àù»©•*P"Ž“ß®?”Âíf”Ö• +ÁÛ¼#ž‡3Ã"ËôH­T03?yMfo£=©VnâʤŒO=/"¶0óÌÂÒÂ=7…Ùé‰)óL¦qx¡‡X“…àTI܍1C¦ø?ä·¢óv½ ©bùþ¦0B\NuzcŒ–Ázub'— Ñùòqë™#,5	¤:ü`í¹'è‡÷Rtßù¡âÝÑCi,ñÈN‚+îâÆ@²Ç‘£)ϨŸvà‚¶s	3‹,Té€}X³üEÆ«,PÁ‚X'g†
-uâ_Vú"Ñ*h)6›;>þö75,ÚZ$Eï F„ßW`/ÎË¿ø+*¾I­¥ž?NÖ01‚2M23ãÞÊX‡ÊoÒžmkfYyžØô%?Dó¸Â8@«õŽ‰b›X±§·(§&ôÖ(ý'èm	„9{5F"#5™IJ3qLÏÌø7s†±“ô´EÔr­±æc“{’eß禎Ã<[Hg_aðDåÃ;ý2Bj•Ø"Ê€FPð¼Þ	Ò^ÔÌÄd±¢ï|¨VeÑXJäûŽvœKç”Ëg}Ñ ³Y‘ åUÎv}A1ÞÉa ›ûÑ+%íÛ±,ÂOWèõ|ë+)«~²¦³dU§L‡‰çPÒ{Jzö˜wf¦¯‚æÂRÛµ()~ÙI;
-ìO²ûOüqH–¤.žÂYÆ<k.~°XSPš+¹Kž¹»Ð~½´4¡·8ZN5)Æ&Y>˜œTûäÅÜ”ÊUêßÇà¶ÞMö5£–}`}M<Rк#¶;C2uiÅÄçXZaÃu†Ké a#ñÆîσ>%ûèy+
-ïÂÀ#ÑÛ†Ÿ	› "GîŒhºÔè¤,0*¼—Em‡²M'~o&“©À'é!lé·Ù‡°cf­ZCØZ|>×+ø¹¡FCiÑÝÅþÈ=¨\_ŽŸ'SÎ’rˆÌùûfq\P¶º;‹=}p>©Â/>D†ÉâF°º„ŠŒqøŒËy$Œ­±t¥pMs!ª=ðs¼.òs¬¼ç-Î Ù‹Ó¢Þ½ôv“Þßý·ý ÷Ýätƒä£	Ä0Aà}Žd˜IuO)ͳ¡Â#.ü˱!®€'ÚÒaâsY‹"Û]ä(­ê¼59EœÀ1®Ùq7[âš.¥ì†-q2ûš ¹gï7|ë)µÚAqYw"Ù0þÑáíð~œºTìä¢KÕ@󁿾»À¯Ë!ôèûßr×Þ¦ÒœN
-«§˜F}U—ËÓ©Ü äÂÔK÷PˆLñâÒ/!ÄÏ
-"h8.JïŠû ™
-&	ÎÞüò42?œ>81ÚµH ˜²ð[ñÏ¡ò~y÷‰×ÂD’M‘ë"3%pîl,»—BæaH9u¢JŽÈR²–3e< ,2©.‰§/Ç#XÜT!,Tï'	˜ß·žÆ"TÎì‹*]R˜âZOäÒ@†1`ZÉYðC•ÞûP©·\ºh(„1ãèºp·N»È‹æîm‹®È÷­}4ðÅûBÅó-u’ê0ßÙ%A¤a‚îBöPà“Üà䈌ͷæWÉ¡ÜÜÜû€Ä“ùj
-uÚ$¢¨•‚pƪyï6ŹS”õÂ4þ¡¢¬‹$ød5Höñk%µ*þ©	:¿‰ÕQڝäL at Bzö‡ÆGNݹ÷_è¸1Šš¨“»³œ8@V¾ý@Viôç;*=Ž•<oYÁ‘ÔBÁœÅ.Q LÊ
-5“ž4jä4áµòiÄî|díkŠ•=ð€ÒËÏø¥&-rÍ%~F¯DúÚ\—îÒi’‰¿˜Ç«Øóh£U6RvæõPsù¡9xïù$i]›R„[áÔ8Q]Tpؘ,e3–Ӎ»ªØdMŒˆdõ˜ŽXÍ(øpïÃ’&&;VrÅðK{Gg¼«q¦¯Ÿ¤Muðû-v²Î ‘\ø©B 6!ð²¥ýàÉäLÁ#ë|ìT7\BórN²îB‹ÃA˜4~ð9¢c'ïäbrˆõ}pNkh^¬ó²=÷QGÔ*Ç >ó=H†Ÿž½‹œÝ̲ÿë¸1{>Ô*m¸9 ‡¦4Ò–%#²ºóéþ¿Ä-BÔB»|ûϬúÐV
-=@Ш[Òó½<XzBÀ»pŽEpýl”ÑA¹Œ½mš¢ŸNÓ4Ï|Îó™¤È]œ¸ñYrkÙ鶡X
-•åˆ§¨Z#ºK/¨CøK8È2n7ìãÌ:T\çqÕrNñ2ƒhwÔq;ŒHÐďÕF®[D£¹E ;õLâ{ë“žŒfNŒÎtÍà˜ð%¨¾&“„P‡¨V&¥”ïsõØX¡HH›ˆbÀçJÆW$HS‚=ífiÎ|-ʇ’Ó£ØÜe¯ñô̆4GM)ȱ€l »£!GN'ð…H¨À5§ØÞñ%›î¼Ù®K±ÏÿœEX¿RÆoÔ)øVYË%,Õ!ªõП–>|ð	JBÅtÎJ¤Yr.¢þ
-”£î˜RRüé›ñ<+ZiFþ5Ë[²R¿ìàk>
-þÝgÑHš©eWÄž“Þ/’ø©’ÄÖ~ðsˆ/\ÁÇg|2¤†RF€ÐŸAîÅWâŠ?Ƶ@ÿ׿HzØ,÷ý‰_kâ¿ï¹€¡c+ÌÉcÊ[gx´*“ržÍʽ‹ñ5ÂÓ2>ÉñYz-ü`¥J)h•…ߺ Tëèq¨ÅéÑÖgJ¿š=WN]ÄGQè\ÅA„`F1Ýš9táðºçuÜŸ}&ÎçÕ°ôaÈ°çä8éýèI9(¹r:œ8À‹	Q$G˜lTí@6T…³Áͱ:F±á֏>^ða#6$ØÁÂÑÞ'±N\(nݏíw ^'¤%>í§–äáà÷$óåk‰iDzhgOA_³À)Ò@DHE?q‘²8€¾Ù—ZF‘/ü}Î7®že«|úöƇKœQ£üž­¼s9ø»¢1P›JÅûaÏ(Ó»>rI§ó <3&]Ô]à—}&‹ú#„vœ]3\+ï;V÷Ö*$þv'G)Á¦£“Tê|t§FÉÑ°|¢^7Uë¹3Â(–Wò}šãÃj˜VÏ2¥á:íì$*œÆ<uÝòCñ™HíÓ3ò1ÖLxNW|WçãðÕ[OŽÙ\ž˜!!ÕÁ‡MJÐezä83,\'À$Öûknÿ˜$7j”F'à
-y˜ü²–ë)A©7:,8Ôpåð*À8k{,ºq_âƒú}`Á¶\°`!)ñMoumtÏ
-k`~_<Ïׯ¯¼v{ ù%fsõ'Î'w
-¬¤3úçŒl`H{v¢®ùòÏáNÒç-øº3ê°6yÀ:x¤Å'ï™v|^Ë8_%§¾—+ÔÀ} ïH™8o–øIŒæÞ}ÒBÒüô<Jò4\HÞÜŒgà+b=3À‚£[í BÆÃ!,ÏJb¨õ÷­Îá,T]†ª!ÃÕÊ…7ÌÚjSú„
-9DïJ©ÿì‡XŸÞ‰cÙÔKvs—±<“)ù°’\Xï‘ÁÛŽÍÆzýÒcÃÒúê«U™&Ù"3 at Fœ"+09‘Bˆ›è\ò…*`'ª	•©—‘mÜ·S‰ÉÒZNOçã¥K,+…·60®tR”ö÷áè@ƒ{¡Ü8þ8¯v›­ßWVbJ‡TGr;…DÝÐ"ΑeËÕ)ylõüÚù*…7|Âœjœâ€Ä÷Ú:rì][íÃ%	>&ÂVÑ¢.\Õ\Ëm–ÅÅ+^ÇhfÔè$Í^½„â\9’3žÂ>>¤%ãaÍ% ÏÒ,qÙ+çTibãÓúh"ÓkCüûÍí›ÿ4w!ž
+xÚ­[ÛnäÆ}߯Ð[F°‡&Ù’öÓz³¾±¬÷ÍŠ¢Fã*䌵Œä×S×f“¢¤ÙØ0ä!›}­®:uªº7½Ø\¤ß¾úúý«/¾ÉÜE–&UZeïo.Êì¢pERwñþúâçU~ùÏ÷ûâ_Æ•²Ü@
+}P×—kc̪©‡ËlÕò>áït
+ÿ{À²|µ=ðïÝå:÷«®Çï[ø;À߆›aQǏo>ƒçÏø¹Æ*×Üú]s/w8¯W©,d¾ŠµÎpm\RzÏóä±Ö&ÏW5þ˜Õþ2/V'(nðá–¿aµ=ŽÑwXúÛe^ªxüœg_PAƒ³í±z}hpí	KËú‰´¼M|nTZ…Šo;ìÿH#q“éü­OÊÊi‹[¨²¥_‘ìÚv\ʉ¤.“SùAÍx³î
+|¡µaÅ«B›ßPñž«Õ\v]\·8Í‹uže‰ËJ°Iœ­x~ب>l°wW¬ºü-ç£ìùëu‡³©·¸¡Wäæ¨[Õ(½¡
+VMOZMp5v¸ë6Ô‡¹Å}zિ¤.Ý€ÿwÑ£Šðã»o_]üœ­~@½¤>pbÑpo€ÉòÄ¥¹î Êèø7™(Þò óíÌ«¤Lƒ¹äi–N:2˜uÆó×Ô›~Kº)Ó%{B±ÀDh7ŒÍ“úén´X¿;œ©9ˆÙÚêÁ|MÝ‚ºÐgšØ’{ü/cM-!¥?
+,IÖ[”þOžI“r]Z,‹ÎZ×áš—J >‘¾(ÐtÖ‘Gfq¤zM{¾ºîÇÒÚS“øq³ÿ„ŧY´ürqùØùº¨òÕ÷G^Ç–Íi졍q°5.›jŒ`
+Á#Z_™“š
+zð~… ˆVâ²ÁÚî± õ´¤9’
+‚-õ\ãÍ»×?r;܃šÀõÃ¥ó ÑíÀUn:©ûîË%ÌÌ·m À½šÁ[Öí7oáç§%àô.ñUþ»ù]‹ÛnhPd…ɯÏßQùA=ÖfÐñÂŽ‚ÌÓ,ɬe™»1À„äâ@‚5Ð\›ã¤kõ’XœKò<û±¼C@¹
+x{Îb¦ù?¹:1Eê“,E=ôIQä<¯÷·ì£¬±«»^Ö5€”AÕP¯ÜÕLPÓð}+ÅՐk¾>±A³@_¤ž­ëÌ5Õ)ƒ¾¼[’x¼¢U+ôÒ6ÙÔ°»…ùi!ß¿èðÓ¤	UÂóþž0†ÅÑVA VHúÒÉ2QTº—Ñö3ä6Òö¦îŵû<ɪ)2h¥-:“»ÀÚ uî¶;ŒÂF÷o£ùmY‰MŠ
++g·U †-1¬n'ÞM{¤o›
+Pì=.n;CÎ瞇b††«â†ÚnEZ¬x66Ái=påFL©Ú3VZÌaiwÓ‰)ŸÉç¼	úpÅŽiWåê¾iu·ø¡²º ³Üh|C$ÿ†Eœ™‰VåÁÊtò“LÑ&[4ѬÜÆ•I^Dl`ö‘¥#-aqºeb«âK£iœ^è®É@pª$îVE̘Éΐ‚ƒ¹ÊTKÊÕ7—¥zúKjÒKkݪéX¯ÎCìäi¨·üè­Ò4‰@°I ÎÁàGk>u;)"oŠ5w°ïz…Ò2XbÏn‚+nã­Æ›~ÄäôÏxpgν„™eªt at 0œ]ý*ã‹U–¨aaA¬”íM‘' “Mz^ëË$wÁØH³ÙÜññ÷àÔAoK‘ýñ{ Üt0oS…a¬ \Š^˜#!Ÿ©`
+Ñf&PV‰3-àµlò¾Ö
+Ú±a-,©(küs–:Ã2X£I¢Ñ}£RÏù,ÌÞ–ùŸGgsk^„È:mf“Êάó‘¹ç˜+Lc«á¥Gƒ¦ZSÇ&7$Ç–?kè»ÈÒÄ»X<)…Î?"Ì2Ê¡€6Ph|½ˆ}R0›Å
+¾Õp¬îeÑXºÁ’+Â/.]TxXtB£ÌE PVgy!ØItå<萈XÜOš }ëÁ üt†N/·>“¬š—Éj*,ÕLYjáV3’N*‘E/T¦	»|e½lXÂð:HñVQ쎍vüåF=Áž¡2Œêµ±°²¥pʉ/ÊOLA9QÚ­ç6‚æûºW0«—ÀÄÚ¤t/ÇÆù“tÄ 3T÷ôj¶©í*’ ¼ÒMdP”I1ÈD=›Ž¤¹@-MåÄÀ—ÈYŠRžGÎÀM™€…÷h•”äƒîO£6û l•†÷_à‘HmËÏŽí$‡ÎˆœKNÊ? ÂYÔíX¶éØÕ-esðFfV†[Í‚
+°.¬Õ˜à\[|¾Ôk‘¸±FK©äí“ý‘sÈÁ"—¨ÛÒ”³¤ã1Âýá™ÙBô6¦¡tÏNHaê5[Â/Ãdq#X]BEF8|ÆåP"õØ`ém”ö¶iÌ€¨öHË9Üz’–cåg_q– èÈY¼ý¤¿°›ôFª&!€3‰Ïgð¼I&§$‡ODTSg형'Õ4¥”ø.D÷¸ð/§–¸Ærå!âtIö´E¦»¶Àû‰¾RZ#ìi®Øú9[ÏÝÜ¿ô)澩0lˆ—¹7í –}Œ¾
+”;mÉœ¸,‚+‘Šl¯÷a|ïçî;yҝš
+âÿ܏¸±Ì©«*T¹×þo¹kµhF4o gÍÑ(ˆ¯É*é\nPòÄÔ+÷
+€-teù£_BXŸ•DÎp\”ÞG÷^²2LœÔø d4>œ>¸0ÚµH ˜2ð[óϾV—¼ýÈkaɆÈuû‘Y ëé,Cú\œ²
+)§KÀ»ÔüŠ¶r¢,”EuÇ%ñô%õŠÅmBÁœƒîÝ,éòûý­RXÊ…}É+Ÿ”öl?äÇs½‹üûWrô€	‰ï¡Rµ\ºh(„UÒ.	’!€Ýn<$'X»Ú
+\“ç»ÖHà‹oÀõGó­L’š0ßÅ%U‰±›v!c(àINpv¨ÈæÛŒó«åsiîCÀáÙÆ|5:cçYä9„¤Õ²o›ãÜ1Êtå%ꯜnåh֝¬‰>~­¥VÍ?
+Á@§›X÷ÒîØñw	GèY³­FMÝiÐ/t@ELÔɧç¨
++ŸŽó £?ÞQéq’œäyËBŽ¤
+æ$v‰ê!RVæe"³"Œ¯µf»}pÖ#»Ø¥Oó;ká—²–½¬bÉH€që<M2cÏKqA œŽ¹]Ì}HOìx´É*[);ñúh¸|ßîÕy>H&×¥œM lOêa…
+è›×¾Ä)ë˜u†·VÁ®n69£"Y3%#ÎÈœc@»©Ž“ü0üÒæÑéízš…Æ×Ò¦ÞëFB‚ݽ,´´@#×~ê¤Íè»ìé0z29GðÀLjÕõzòç™ã/gÚùly¿ZiÐwR0óN>¦†X_sZÃ!àÅõï*ÛÓuD­
+à3íA²úô¬>,rvËþ®7âRÄëiOðAw¢á³QéVcQ’U¸ð—¸Eˆ9B€àV¯ÿñ÷õÚJ¡Ê‘%=ßhÜ!À2^…Ó+@o*ÄÙ”ËÔÛ!¨Y ùéÒ¹¦œN.y>ˆF'm4´vŽîa#+GåG9âÃ1ªÖŠîÒêþŽçÏdì\†8•F×)®:>«êCFíŽ:>Œ#6ñc½‘‹QãhnèÎ=“óIáÄ1ùå¨hÑ/ñM’µ»~	_‚æ²HømØŠ6`eÒIùNçXmõWJ„„‰è|®e¼p‚%˜ÓN°`‘å@™Ï%AÙȁâ8ÒÏâÈÂg/ÑôÌ…CŒ†²S¹ÀvÇ«D´pºÄSÚ1»€|
+\ ÍÏë1š«8;tÚÜŽžK±ÏŸDX¿Q²oÙÔ)W›mˆX\ÂRCZEþ´ÒèAs“Šé’ÿ”0³âDDó:)OÝuro Ð|¼ô±!¨8H3òo¬YkÉJuÙî	)h?Žî]3h$ÌÔM2høþD‰ŸP!>&ë½Ó)ÄÔàã#6ÒB)ÛèˆOwâ)qÁâZ þ׿JzÜ,Ÿ8tjÑèA?ž÷`ÆŽ[égÉ̉ë‘Ϋ¤c„½ÒY¹jq'ÎFˆúÈÆgiÂ2>@o„ ¬ó
+¯z)jU¥n^P«ëèäp¬5C>ða—ðéGç)“ˆî¨xì$èÁcœCN¬^ÇÍIqšVÃÒ»1
+À®“5&`RÂY9ªyîÍxÓ.÷6„‘b
+´Qµ=YQ7}½”bíï5`иðà!é 9¬#Š_×±uàuÆZâ#~jI.~2_¾É)¡Æ‚ÎÎþð2L`i "¤£¹HŒY|À0Ll,_E±/ü}Ž…åãl•ÚlŽL¢Q£â¤­Õ¿ìÅùÀh­Ü`|*ˆ=£P¯†È+O#ø,È"ºÜ*ÊÀ/»NöêùÁaü];^-½Ñ˧záEn×ä'GÇÛ{5<T?SLîÑär,Ÿ¨ÏM}PîŒ@Šåµ|Ÿgø°fÕ³Fi¹ÎáRöõÍ`–º‰nv„¡øT»ÑôŒ`„|Œ^ǃíêԏ_õ¨zvÄæ‹ÄÕ'{¸¤ò\æǍcÀÂMbõz—nõ9W~lRØ|’E'à
+‰˜ýª‘;)A§Kƒ÷8¸T=‡Âj7Ý4m;-_rLž·ãúCàÁ´|0
+A°ˆ”§Ý!º\…50AŠ¿Ï⃗V^º2FˆüsEþgœä3†ÇœläH;;QÙËbõ£²¸£tÁ‰¾ÉL×l )EñQ=Ó–k¦l¡·Qwrσè>XÙòŽ”ŠW¾á“XM¸‹.-$ËOÏ“,O{Ï…æ-Íø1ÇŠxÏì@„àé߀÷û°:'‰¡ƒÞ±:]«°¥aPe¨2\¹ä†Y[ƒ—z»ñÖ™zRjÀ?»1Ö§w¾†žª`7§p¡Ë3™’†•=_±d×г©Z?ôØ®Œ9û>A&ƒIv‘Yà">'#°E’x$™TFîZçÑ?*ˆj‚AeùóÈ6íÛç‰ÍÒZN§þ©»+V‰Álx WŸ†£#/î…rãøà¼ÞBì"ûÊ:L鐺'·#—º±Eœ$ËVë3RòØêñ•òUtS:Ì©Ñè$ºwh"·Þê]¸ ÁÇDØ*ZÔ×3¯å&ËâÉëªc´
+‹øiM’f/^@ñ¾ÏÈNHá?ŸÑM²ñ‡0ö)ÏÒ,ñÙçTiâ*³8‘ù•!þ}ûþÕÿ ÝëmT
 endstream
 endobj
-149 0 obj <<
+150 0 obj <<
 /Type /Page
-/Contents 150 0 R
-/Resources 148 0 R
+/Contents 151 0 R
+/Resources 149 0 R
 /MediaBox [0 0 595.276 841.89]
-/Parent 130 0 R
-/Annots [ 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 140 0 R 153 0 R 141 0 R 142 0 R 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R ]
+/Parent 131 0 R
+/Annots [ 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 141 0 R 154 0 R 142 0 R 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R ]
 >> endobj
 107 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [356.45 718.346 420.037 731.143]
+/Rect [355.611 704.796 420.396 717.594]
 /A << /S /GoTo /D (cite.MullenKrayzmanLevin:2010:Atomic) >>
 >> endobj
 108 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [422.07 718.346 445.881 731.143]
+/Rect [422.309 704.796 446.12 717.594]
 /A << /S /GoTo /D (cite.MullenKrayzmanLevin:2010:Atomic) >>
 >> endobj
 109 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [135.19 704.796 196.527 717.594]
+/Rect [137.04 691.247 202.44 704.045]
 /A << /S /GoTo /D (cite.BoernerHigginsKantelhardt:2007:Rainfall) >>
 >> endobj
 110 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [197.587 704.796 221.398 717.594]
+/Rect [205.35 691.247 229.16 704.045]
 /A << /S /GoTo /D (cite.BoernerHigginsKantelhardt:2007:Rainfall) >>
 >> endobj
 111 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [359.371 704.796 417.62 717.594]
+/Rect [374.532 691.247 436.844 704.045]
 /A << /S /GoTo /D (cite.BoudtPetersonCarl:2008:HFPortfolio) >>
 >> endobj
 112 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [418.68 704.796 442.491 717.594]
+/Rect [439.754 691.247 463.565 704.045]
 /A << /S /GoTo /D (cite.BoudtPetersonCarl:2008:HFPortfolio) >>
 >> endobj
 113 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [355.243 691.247 492.804 704.045]
+/Rect [385.381 677.698 522.996 690.496]
 /A << /S /GoTo /D (cite.CRAN:micEconCES) >>
 >> endobj
 114 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [494.953 691.247 518.764 704.045]
+/Rect [80.004 664.149 103.814 676.947]
 /A << /S /GoTo /D (cite.CRAN:micEconCES) >>
 >> endobj
 115 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [160.653 677.698 204.896 690.496]
+/Rect [190.337 664.149 234.58 676.947]
 /A << /S /GoTo /D (cite.CRAN:selectMeta) >>
 >> endobj
 116 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [206.537 677.698 230.347 690.496]
+/Rect [236.22 664.149 260.031 676.947]
 /A << /S /GoTo /D (cite.CRAN:selectMeta) >>
 >> endobj
-140 0 obj <<
+141 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [460.329 633.48 522.996 646.278]
+/Rect [460.329 620.278 522.996 633.076]
 /A << /S /GoTo /D (cite.CRAN:Rcpp) >>
 >> endobj
-153 0 obj <<
+154 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [80.004 619.931 143.938 632.729]
+/Rect [80.004 606.729 143.938 619.527]
 /A << /S /GoTo /D (cite.CRAN:Rcpp) >>
 >> endobj
-141 0 obj <<
+142 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [146.725 619.931 170.536 632.729]
+/Rect [146.725 606.729 170.536 619.527]
 /A << /S /GoTo /D (cite.CRAN:Rcpp) >>
 >> endobj
-142 0 obj <<
+143 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [421.588 606.382 492.532 619.18]
+/Rect [420.765 593.179 492.6 605.977]
 /A << /S /GoTo /D (cite.CRAN:RcppArmadillo) >>
 >> endobj
-143 0 obj <<
+144 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [494.953 606.382 518.764 619.18]
+/Rect [494.953 593.179 518.764 605.977]
 /A << /S /GoTo /D (cite.CRAN:RcppArmadillo) >>
 >> endobj
-144 0 obj <<
+145 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [151.545 579.283 202.071 592.081]
+/Rect [151.545 566.081 202.071 578.879]
 /A << /S /GoTo /D (cite.Sanderson:2010:Armadillo) >>
 >> endobj
-145 0 obj <<
+146 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [203.711 579.283 227.522 592.081]
+/Rect [203.711 566.081 227.522 578.879]
 /A << /S /GoTo /D (cite.Sanderson:2010:Armadillo) >>
 >> endobj
-146 0 obj <<
+147 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [400.511 562.164 456.774 574.961]
+/Rect [398.932 549.309 456.985 562.106]
 /A << /S /GoTo /D (cite.CRAN:DEoptim) >>
 >> endobj
-147 0 obj <<
+148 0 obj <<
 /Type /Annot
 /Subtype /Link
 /Border[0 0 0]/H/I/C[0 1 0]
-/Rect [462.356 562.164 492.221 574.961]
+/Rect [462.409 549.309 492.274 562.106]
 /A << /S /GoTo /D (cite.CRAN:DEoptim) >>
 >> endobj
-151 0 obj <<
-/D [149 0 R /XYZ 80 770.89 null]
+152 0 obj <<
+/D [150 0 R /XYZ 80 770.89 null]
 >> endobj
 6 0 obj <<
-/D [149 0 R /XYZ 81 147.682 null]
+/D [150 0 R /XYZ 81 147.275 null]
 >> endobj
-155 0 obj <<
-/D [149 0 R /XYZ 81 147.682 null]
+156 0 obj <<
+/D [150 0 R /XYZ 81 147.275 null]
 >> endobj
-148 0 obj <<
-/Font << /F15 124 0 R /F68 152 0 R /F64 126 0 R /F46 122 0 R /F66 127 0 R /F82 154 0 R /F41 121 0 R >>
+149 0 obj <<
+/Font << /F15 124 0 R /F68 153 0 R /F46 122 0 R /F64 126 0 R /F66 127 0 R /F82 155 0 R /F41 121 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-173 0 obj <<
-/Length 2969      
+174 0 obj <<
+/Length 2953      
 /Filter /FlateDecode
 >>
 stream
-xÚ­ZÝ“Û¶¿¿‚oåM"˜ø AæÍNìLÒÌ´u®íƒ“iy’NR,‰QòÕýë»_ AŠ§“ÛŽ‡	,Àîâ·¸,Y%YòýÍ›»›WïŠ2Ñ™ª²J'w‰ÉKUEâs¯*›'w‹äCúÝ­N7ð>Þά5é[x_,à¿åþ»‡ç´„ÿŽò@ë¯w?¾z§óçÂ*kLL<-ÒÜd²’ç~ßÞÝü~£á5KtR剷Få•Iæ»›¿fÉÚL2Uz›<Õ.qÚÂï6ùùæ/¼AWÄËÐÞ(M^Wª0¦ßàÛæ׏ûÜÝÎtáOßÃÇ›ñùîíÔ¶f^+2œi«rW1¿w"°í8i;h)]zÚ#¿£t6øÕÞÎœs¦ò»U¶22ös‘ìFÆ èÆ¢)ªJU°‘h¬ñhtåU	Ê
-âéÇ[S)[ø«˜x°;’qi2ÎàÝ—Iá­òAÆd/ð8xþOByÜÎJm-ë Å"âbÚÁó-<¿dyÆ?šd¦;ŽS#˜3·?½¯üÅbî ÝD»\•U1Tk˜ð“0Ù^\VL5ZNQVîEn¸°å@Ø´92î K?…c7¹šKÔçB*¯æΫ³N¹—W©Ü¼¾°§Zöt’÷ᬳ"/ô‹´ã
-Lh‹B&ô×O¸¾Ÿ1tÅ´oä½ås—KÙFÍ-ïurê•Lq£^vG˜¥‡¿{é—}ëÒåƒq?‰¶òýö‘<Î@ /5Á÷•ø˜ÅŽ`ˆkº $ð:É£d³w·¥Mëû¥,[ý
-šMnNb5ó%{‰_2í"ÂûVõ>춎pðýÀ[Œ0Û©Üšà:¾ÂaxÍ+HpnÆ_‚Xd¿!1ÒÈ¡G ½æyFž¹‚)7uæl t†°áå þ sڐâÖ,ˆð‰²¨÷­H @ûÄâJ§|–_ZÜx-0Þë0…zhvýÌÍÔ,LDaLïõ1§&ɕ鄽¥š2ýÌ“ìH´W´wãiïõ~%º@š'l^z™à z±Œ—9Ý”Y”àÂËÌð3/&Íâ>×γý= E‘.[2Á4Ú€c¤IülîqߟȈObi¡€5lïÁÆÑêWØ[u™Ú†H&iC6뢨H£#VNeÖöœtú=S™U•î¤ø5
-Þ1~Âí‘šê-o÷bXÔ³ç.ŸÎÚö¢O¤|Ü~"+¥ tAù‘³ÂVéßh–»">ïçØà
-ç$u:àºWN@gÒþ°ùž–ÀºA¢'Å8öšÐ(K7;vŠ±&kÙ:ñx$iD"ž›³`¼€¸ëæØ/fÓ/€ÖZGCÖ=-çS'$’þ–)kÂ×°§MppRž‚D­|Ă–ýúÏÐóPf½$áó& ¦hù—cÕ‘CApìžà	Jü“ðÔUz»ƒ1M·Û7tì_cƒI{«ûÌxb–Oü>ÇÎudPÐöÔ
-9(”ßQ&‘`·òã”P.£L¥ nî±qúLê¬;lÛþèpè7šÞ­qqސžZÒìþ{¨1ÜØ|ð–NÞ&œ" o¦[;«
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/rcpp -r 3568

More information about the Rcpp-commits mailing list