[Distr-commits] r215 - in branches/distr-2.0/pkg: distrDoc/inst/doc distrMod/R

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Wed Jul 30 06:00:29 CEST 2008 

Author: stamats
Date: 2008-07-30 06:00:27 +0200 (Wed, 30 Jul 2008)
New Revision: 215

Modified:
   branches/distr-2.0/pkg/distrDoc/inst/doc/Estimate.eps
   branches/distr-2.0/pkg/distrDoc/inst/doc/Estimate.pdf
   branches/distr-2.0/pkg/distrMod/R/AllClass.R
Log:
prototype slightly modified, UML-diagrams updated

Modified: branches/distr-2.0/pkg/distrDoc/inst/doc/Estimate.eps
===================================================================
--- branches/distr-2.0/pkg/distrDoc/inst/doc/Estimate.eps	2008-07-29 21:52:10 UTC (rev 214)
+++ branches/distr-2.0/pkg/distrDoc/inst/doc/Estimate.eps	2008-07-30 04:00:27 UTC (rev 215)
@@ -1,11 +1,11 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: /home/btm722/arbeit/Rpackages/Estimate.dia
 %%Creator: Dia v0.96.1
-%%CreationDate: Mon Jul 28 09:16:04 2008
+%%CreationDate: Wed Jul 30 05:58:40 2008
 %%For: btm722
 %%Orientation: Portrait
 %%Magnification: 1.0000
-%%BoundingBox: 0 0 206 275
+%%BoundingBox: 0 0 236 328
 %%BeginSetup
 %%EndSetup
 %%EndComments
@@ -341,25 +341,25 @@
     currentdict end
 definefont pop
 28.346000 -28.346000 scale
--25.450000 -11.650000 translate
+-25.950000 -13.500000 translate
 %%EndProlog
 
 
 0.100000 slw
 [] 0 sd
 1.000000 1.000000 1.000000 srgb
-n 26.000000 2.000000 m 26.000000 3.400000 l 32.100000 3.400000 l 32.100000 2.000000 l f
+n 26.000000 2.000000 m 26.000000 3.400000 l 34.200000 3.400000 l 34.200000 2.000000 l f
 0.000000 0.000000 0.000000 srgb
-n 26.000000 2.000000 m 26.000000 3.400000 l 32.100000 3.400000 l 32.100000 2.000000 l cp s
+n 26.000000 2.000000 m 26.000000 3.400000 l 34.200000 3.400000 l 34.200000 2.000000 l cp s
 /Helvetica-Bold-latin1 ff 0.700000 scf sf
-(Estimate) 27.237500 2.827500 m 
+(Estimate) 28.287500 2.827500 m 
 dup sw 3.625000 exch sub 
 8 div exch 0.0 exch 
  gs 1 -1 sc ashow gr
 1.000000 1.000000 1.000000 srgb
-n 26.000000 3.400000 m 26.000000 6.000000 l 32.100000 6.000000 l 32.100000 3.400000 l f
+n 26.000000 3.400000 m 26.000000 7.600000 l 34.200000 7.600000 l 34.200000 3.400000 l f
 0.000000 0.000000 0.000000 srgb
-n 26.000000 3.400000 m 26.000000 6.000000 l 32.100000 6.000000 l 32.100000 3.400000 l cp s
+n 26.000000 3.400000 m 26.000000 7.600000 l 34.200000 7.600000 l 34.200000 3.400000 l cp s
 /Courier-latin1 ff 0.560000 scf sf
 (+name: character) 26.150000 4.160000 m 
 dup sw 5.600000 exch sub 
@@ -369,27 +369,35 @@
 dup sw 4.900000 exch sub 
 14 div exch 0.0 exch 
  gs 1 -1 sc ashow gr
-(+Infos: matrix) 26.150000 5.760000 m 
+(+samplesize: numeric) 26.150000 5.760000 m 
+dup sw 7.000000 exch sub 
+20 div exch 0.0 exch 
+ gs 1 -1 sc ashow gr
+(+asvar: OptionalMatrix) 26.150000 6.560000 m 
+dup sw 7.700000 exch sub 
+22 div exch 0.0 exch 
+ gs 1 -1 sc ashow gr
+(+Infos: matrix) 26.150000 7.360000 m 
 dup sw 4.900000 exch sub 
 14 div exch 0.0 exch 
  gs 1 -1 sc ashow gr
 0.100000 slw
 [] 0 sd
 1.000000 1.000000 1.000000 srgb
-n 25.500000 9.200000 m 25.500000 10.600000 l 32.650000 10.600000 l 32.650000 9.200000 l f
+n 26.500000 11.050000 m 26.500000 12.450000 l 33.650000 12.450000 l 33.650000 11.050000 l f
 0.000000 0.000000 0.000000 srgb
-n 25.500000 9.200000 m 25.500000 10.600000 l 32.650000 10.600000 l 32.650000 9.200000 l cp s
+n 26.500000 11.050000 m 26.500000 12.450000 l 33.650000 12.450000 l 33.650000 11.050000 l cp s
 /Helvetica-Bold-latin1 ff 0.700000 scf sf
-(MCEstimate) 26.632500 10.027500 m 
+(MCEstimate) 27.632500 11.877500 m 
 dup sw 4.885000 exch sub 
 10 div exch 0.0 exch 
  gs 1 -1 sc ashow gr
 1.000000 1.000000 1.000000 srgb
-n 25.500000 10.600000 m 25.500000 11.600000 l 32.650000 11.600000 l 32.650000 10.600000 l f
+n 26.500000 12.450000 m 26.500000 13.450000 l 33.650000 13.450000 l 33.650000 12.450000 l f
 0.000000 0.000000 0.000000 srgb
-n 25.500000 10.600000 m 25.500000 11.600000 l 32.650000 11.600000 l 32.650000 10.600000 l cp s
+n 26.500000 12.450000 m 26.500000 13.450000 l 33.650000 13.450000 l 33.650000 12.450000 l cp s
 /Courier-latin1 ff 0.560000 scf sf
-(+criterion: numeric) 25.650000 11.360000 m 
+(+criterion: numeric) 26.650000 13.210000 m 
 dup sw 6.650000 exch sub 
 19 div exch 0.0 exch 
  gs 1 -1 sc ashow gr
@@ -397,14 +405,14 @@
 [] 0 sd
 0 slj
 0 slc
-n 29.075000 8.288197 m 29.075000 7.600000 l 29.050000 7.600000 l 29.050000 6.000000 l s
+n 30.075000 10.138197 m 30.075000 9.325000 l 30.100000 9.325000 l 30.100000 7.600000 l s
 0 slj
 1.000000 1.000000 1.000000 srgb
-n 28.675000 8.288197 m 29.075000 9.088197 l 29.475000 8.288197 l ef
+n 29.675000 10.138197 m 30.075000 10.938197 l 30.475000 10.138197 l ef
 0.100000 slw
 [] 0 sd
 0 slj
 0.000000 0.000000 0.000000 srgb
-n 28.675000 8.288197 m 29.075000 9.088197 l 29.475000 8.288197 l cp s
+n 29.675000 10.138197 m 30.075000 10.938197 l 30.475000 10.138197 l cp s
 /Courier-latin1 ff 0.560000 scf sf
 showpage

Modified: branches/distr-2.0/pkg/distrDoc/inst/doc/Estimate.pdf
===================================================================
--- branches/distr-2.0/pkg/distrDoc/inst/doc/Estimate.pdf	2008-07-29 21:52:10 UTC (rev 214)
+++ branches/distr-2.0/pkg/distrDoc/inst/doc/Estimate.pdf	2008-07-30 04:00:27 UTC (rev 215)
@@ -3,18 +3,15 @@
 5 0 obj
 <</Length 6 0 R/Filter /FlateDecode>>
 stream
-xœ­“MO1†ïýsS4;Óonjˆ1Qt/Éfù0,„£?ßYvEP‚ĘÚLg¦ÏÛ·]€F]vÎKuñ`´Tõ¨FŠœÃ¤ؘˆÎNH&yŒÖBU¨¡âˆÆzxSëfðxsLÙS›-‡,5ëvÊK¸Ê£ÓÞGÈr¡Š@I*™!ª†–Ài”,e«T§½åjRVE'{Q½LõJ!¯i›))ùFÊI¿‚k™±æ©ÉÃLÜ&ÿÃÄh¨!?Ÿ
-Ê¢ùxP
-òUQÕ
-¶[1£²;I-Z•]¸|xîœHäv6œ/» Ájò.‘oÚ-R œzc€5{v×Æ#’Ž0Í&r|À4cÐQ"°rщìZúýõÛZª
-]KÅÑ õ´‹~ é?lsòÞjæˆÌÚPc[^MÄ­É|Ö…Ùk)«üK„æ€ÎBrŒIZ•›‘¨	¦uDã¾Hû§Â¾¹ŽTKô{:QLò]¤ž¬–ÍMÎT
-ÏþV7–“ûêÎoáFendstream
+xœ­SMoÔ0½ûW̍–JCflí½ªµäÂ1Š²mP²m“ð!~=“&M»lµ¬ªÊ[ãçç÷ÆÏ·!A6Žy.[óæ"ÀeoÆÑ]rHpÆä-;´lŒÎAW™µáˆÖ	ü2wdpñác_g´^rkhZÏSÙ»Ü0úL$B^ªª”ô$3äk3©%Aö	l¦P¶·æè´ê¶ªãü»9ÍÍù®’Àèh‘D”2ôvrr 迺3T—1ò$\¹<Æ „{Iä€Åað|§üdS´Õ
+Ê«¢+Ê¡êF©˜Q‚äŸ[Í6Wðöó·ãW[À£“¾hošª¯ÿèþæG[uu¹ƒ)úŸE·‚/7C}½)š³bèêß;¨›õu¿‚ö~÷Ÿ–z)càP¬ÎX0¸íp : 
+.‘ç=QpJž´äô²±³cGÏÞïIìj	ꬊ£E'´-}è%Òpo'"sfiJCÙÕ}›‡'\L$ä ÉëßRªv©Ê<4Z	‚VžªÌÑnTûC;2µÓ”A-“þB%ਔӘõëg¼Ò»ÏÍ_b`ú©endstream
 endobj
 6 0 obj
-393
+435
 endobj
 4 0 obj
-<</Type/Page/MediaBox [0 0 206 275]
+<</Type/Page/MediaBox [0 0 236 328]
 /Parent 3 0 R
 /Resources<</ProcSet[/PDF /Text]
 /ExtGState 10 0 R
@@ -61,10 +58,10 @@
 <?adobe-xap-filters esc="CRLF"?>
 <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
 <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
-<rdf:Description rdf:about='b5916006-9491-11e8-0000-ea51b4484deb' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.61'/>
-<rdf:Description rdf:about='b5916006-9491-11e8-0000-ea51b4484deb' xmlns:xap='http://ns.adobe.com/xap/1.0/' xap:ModifyDate='2008-07-28T09:16:56+02:00' xap:CreateDate='2008-07-28T09:16:56+02:00'><xap:CreatorTool>UnknownApplication</xap:CreatorTool></rdf:Description>
-<rdf:Description rdf:about='b5916006-9491-11e8-0000-ea51b4484deb' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='b5916006-9491-11e8-0000-ea51b4484deb'/>
-<rdf:Description rdf:about='b5916006-9491-11e8-0000-ea51b4484deb' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
+<rdf:Description rdf:about='615cc24f-9608-11e8-0000-80e36821e0f5' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.61'/>
+<rdf:Description rdf:about='615cc24f-9608-11e8-0000-80e36821e0f5' xmlns:xap='http://ns.adobe.com/xap/1.0/' xap:ModifyDate='2008-07-30T05:58:56+02:00' xap:CreateDate='2008-07-30T05:58:56+02:00'><xap:CreatorTool>UnknownApplication</xap:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='615cc24f-9608-11e8-0000-80e36821e0f5' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='615cc24f-9608-11e8-0000-80e36821e0f5'/>
+<rdf:Description rdf:about='615cc24f-9608-11e8-0000-80e36821e0f5' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>
                                                                         
@@ -74,27 +71,27 @@
 endobj
 2 0 obj
 <</Producer(GPL Ghostscript 8.61)
-/CreationDate(D:20080728091656+02'00')
-/ModDate(D:20080728091656+02'00')>>endobj
+/CreationDate(D:20080730055856+02'00')
+/ModDate(D:20080730055856+02'00')>>endobj
 xref
 0 13
 0000000000 65535 f 
-0000000707 00000 n 
-0000002377 00000 n 
-0000000648 00000 n 
-0000000497 00000 n 
+0000000749 00000 n 
+0000002419 00000 n 
+0000000690 00000 n 
+0000000539 00000 n 
 0000000015 00000 n 
-0000000478 00000 n 
-0000000772 00000 n 
-0000000944 00000 n 
-0000000882 00000 n 
-0000000813 00000 n 
-0000000843 00000 n 
-0000001013 00000 n 
+0000000520 00000 n 
+0000000814 00000 n 
+0000000986 00000 n 
+0000000924 00000 n 
+0000000855 00000 n 
+0000000885 00000 n 
+0000001055 00000 n 
 trailer
 << /Size 13 /Root 1 0 R /Info 2 0 R
-/ID [<ED94CAE79362638C74FDA335CEEDE91B><ED94CAE79362638C74FDA335CEEDE91B>]
+/ID [<238C9FDA102D361E882144E0870DAA1D><238C9FDA102D361E882144E0870DAA1D>]
 >>
 startxref
-2500
+2542
 %%EOF

Modified: branches/distr-2.0/pkg/distrMod/R/AllClass.R
===================================================================
--- branches/distr-2.0/pkg/distrMod/R/AllClass.R	2008-07-29 21:52:10 UTC (rev 214)
+++ branches/distr-2.0/pkg/distrMod/R/AllClass.R	2008-07-30 04:00:27 UTC (rev 215)
@@ -416,8 +416,8 @@
                         Infos = "matrix"),
          prototype(name = "Estimate",
                    estimate = numeric(0),
+                   samplesize = numeric(0),
                    asvar = NULL,
-                   samplesize = 1,
                    Infos = matrix(c(character(0),character(0)), ncol=2,
                                   dimnames=list(character(0), c("method", "message")))),
          validity = function(object){
@@ -432,6 +432,8 @@
          representation(criterion = "numeric"),
          prototype(name = "Minimum criterion estimate",
                    estimate = numeric(0),
+                   samplesize = numeric(0),
+                   asvar = NULL,
                    criterion = numeric(0),
                    Infos = matrix(c(character(0),character(0)), ncol=2,
                                   dimnames=list(character(0), c("method", "message")))),

More information about the Distr-commits mailing list