[Distr-commits] r527 - branches/distr-2.2/pkg/distrMod/R branches/distr-2.2/pkg/distrMod/man www

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

Author: ruckdeschel
Date: 2009-08-18 16:12:11 +0200 (Tue, 18 Aug 2009)
New Revision: 527

Removed:
   www/~$strMod.html
Modified:
   branches/distr-2.2/pkg/distrMod/R/AllShow.R
   branches/distr-2.2/pkg/distrMod/man/meRes.Rd
   www/distrMod.html
Log:
modified wrong use of "criterium" to "criterion"

Modified: branches/distr-2.2/pkg/distrMod/R/AllShow.R
===================================================================
--- branches/distr-2.2/pkg/distrMod/R/AllShow.R	2009-08-16 23:36:58 UTC (rev 526)
+++ branches/distr-2.2/pkg/distrMod/R/AllShow.R	2009-08-18 14:12:11 UTC (rev 527)
@@ -218,7 +218,7 @@
        digits <- getOption("digits")
        show(as(object,"Estimate"))
        if(getdistrModOption("show.details")!="minimal"){
-        cat("Criterium:\n")
+        cat("Criterion:\n")
         print(criterion(object), quote = FALSE)}
     })
 

Modified: branches/distr-2.2/pkg/distrMod/man/meRes.Rd
===================================================================
--- branches/distr-2.2/pkg/distrMod/man/meRes.Rd	2009-08-16 23:36:58 UTC (rev 526)
+++ branches/distr-2.2/pkg/distrMod/man/meRes.Rd	2009-08-18 14:12:11 UTC (rev 527)
@@ -16,7 +16,7 @@
 \arguments{
   \item{x}{numeric; the data at which to evaluate the estimate}
   \item{estimate}{numeric; the estimate} 
-  \item{criterion.value}{numeric; the value of the criterium} 
+  \item{criterion.value}{numeric; the value of the criterion}
   \item{param}{object of class \code{ParamFamParameter}; the parameter value} 
   \item{crit.fct}{a function to fill slot \code{minuslogl} when an object of 
       class \code{MCEstimate} is coerced to class \code{mle} 

Modified: www/distrMod.html
===================================================================
--- www/distrMod.html	2009-08-16 23:36:58 UTC (rev 526)
+++ www/distrMod.html	2009-08-18 14:12:11 UTC (rev 527)
@@ -61,24 +61,24 @@
 mapping a parameter theta to the <br>
 corresponding distribution member of the parametric family. Based on
 this we introduce <span style="font-style: italic;">MCE</span>s
-(Minimum Criterium Estimators) which<br>
-are defined as minimizing a criterium function at the data within the
+(Minimum Criterion Estimators) which<br>
+are defined as minimizing a criterion function at the data within the
 parametric family. <br>
 These are realized as a function taking as arguments <span
  style="font-style: italic;">data</span>, <span
  style="font-style: italic;">ParamFamily</span>, <span
  style="font-style: italic;">criterion</span>, the latter being the
-criterium function with arguments<br>
+criterion function with arguments<br>
 <span style="font-style: italic;">data</span> and <span
- style="font-style: italic;">theta </span>measuring the criterium at
+ style="font-style: italic;">theta </span>measuring the criterion at
 parameter value theta. <br>
 Particular cases are<br>
 <ul>
   <li>Maximum Likelihood Estimators (with the negative (log)likelihood
-as criterium), <br>
+as criterion), <br>
   </li>
   <li>Minimum distance estimators (distance of the empirical
-distribution to the members of the parametric family as criterium); <br>
+distribution to the members of the parametric family as criterion); <br>
 we have realized</li>
   <ul>
     <li>Minimum Kolmogoroff distance Estimators</li>
@@ -87,7 +87,7 @@
     <li>Minimum Total Variation distance Estimators</li>
   </ul>
 </ul>
-the criterium function is then optimized using the R-functions <span
+the criterion function is then optimized using the R-functions <span
  style="color: rgb(51, 51, 255);">optim</span>, <span
  style="color: rgb(51, 51, 255);">optimize</span>, respectively.<br>
 MCEs can (but do not need to) use method dispatch; this way particular

Deleted: www/~$strMod.html
===================================================================
(Binary files differ)