[Distr-commits] r285 - in pkg: distrDoc/chm distrDoc/inst/doc distrSim/R utils

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Mon Sep 1 15:01:58 CEST 2008 

Author: stamats
Date: 2008-09-01 15:01:58 +0200 (Mon, 01 Sep 2008)
New Revision: 285

Added:
   pkg/distrDoc/inst/doc/ParamFamParameter.eps
   pkg/distrDoc/inst/doc/ParamFamParameter.pdf
Modified:
   pkg/distrDoc/chm/distrDoc.chm
   pkg/distrDoc/inst/doc/distr.Rnw
   pkg/distrSim/R/rbind-methods.R
   pkg/utils/finde.r
Log:
merged branch into trunk

Modified: pkg/distrDoc/chm/distrDoc.chm
===================================================================
(Binary files differ)

Copied: pkg/distrDoc/inst/doc/ParamFamParameter.eps (from rev 284, branches/distr-2.0/pkg/distrDoc/inst/doc/ParamFamParameter.eps)
===================================================================
--- pkg/distrDoc/inst/doc/ParamFamParameter.eps	                        (rev 0)
+++ pkg/distrDoc/inst/doc/ParamFamParameter.eps	2008-09-01 13:01:58 UTC (rev 285)
@@ -0,0 +1,414 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: /home/btm722/arbeit/Rpackages/ParamFamParameter.dia
+%%Creator: Dia v0.96.1
+%%CreationDate: Mon Sep  1 14:01:16 2008
+%%For: btm722
+%%Orientation: Portrait
+%%Magnification: 1.0000
+%%BoundingBox: 0 0 275 298
+%%BeginSetup
+%%EndSetup
+%%EndComments
+%%BeginProlog
+[ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash /zero /one
+/two /three /four /five /six /seven /eight /nine /colon /semicolon
+/less /equal /greater /question /at /A /B /C /D /E
+/F /G /H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W /X /Y
+/Z /bracketleft /backslash /bracketright /asciicircum /underscore /quoteleft /a /b /c
+/d /e /f /g /h /i /j /k /l /m
+/n /o /p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclamdown /cent /sterling /currency /yen /brokenbar /section /dieresis /copyright
+/ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron /degree /plusminus /twosuperior /threesuperior
+/acute /mu /paragraph /periodcentered /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf
+/threequarters /questiondown /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis /Eth /Ntilde
+/Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply /Oslash /Ugrave /Uacute /Ucircumflex
+/Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex /atilde /adieresis /aring
+/ae /ccedilla /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide /oslash /ugrave
+/uacute /ucircumflex /udieresis /yacute /thorn /ydieresis] /isolatin1encoding exch def
+/cp {closepath} bind def
+/c {curveto} bind def
+/f {fill} bind def
+/a {arc} bind def
+/ef {eofill} bind def
+/ex {exch} bind def
+/gr {grestore} bind def
+/gs {gsave} bind def
+/sa {save} bind def
+/rs {restore} bind def
+/l {lineto} bind def
+/m {moveto} bind def
+/rm {rmoveto} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/sh {show} bind def
+/slc {setlinecap} bind def
+/slj {setlinejoin} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/rot {rotate} bind def
+/sc {scale} bind def
+/sd {setdash} bind def
+/ff {findfont} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/sw {stringwidth pop} bind def
+/tr {translate} bind def
+
+/ellipsedict 8 dict def
+ellipsedict /mtrx matrix put
+/ellipse
+{ ellipsedict begin
+   /endangle exch def
+   /startangle exch def
+   /yrad exch def
+   /xrad exch def
+   /y exch def
+   /x exch def   /savematrix mtrx currentmatrix def
+   x y tr xrad yrad sc
+   0 0 1 startangle endangle arc
+   savematrix setmatrix
+   end
+} def
+
+/mergeprocs {
+dup length
+3 -1 roll
+dup
+length
+dup
+5 1 roll
+3 -1 roll
+add
+array cvx
+dup
+3 -1 roll
+0 exch
+putinterval
+dup
+4 2 roll
+putinterval
+} bind def
+/Times-Roman-latin1
+    /Times-Roman findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Times-Italic-latin1
+    /Times-Italic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Times-Bold-latin1
+    /Times-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Times-BoldItalic-latin1
+    /Times-BoldItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-Book-latin1
+    /AvantGarde-Book findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-BookOblique-latin1
+    /AvantGarde-BookOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-Demi-latin1
+    /AvantGarde-Demi findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-DemiOblique-latin1
+    /AvantGarde-DemiOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-Light-latin1
+    /Bookman-Light findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-LightItalic-latin1
+    /Bookman-LightItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-Demi-latin1
+    /Bookman-Demi findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-DemiItalic-latin1
+    /Bookman-DemiItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-latin1
+    /Courier findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-Oblique-latin1
+    /Courier-Oblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-Bold-latin1
+    /Courier-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-BoldOblique-latin1
+    /Courier-BoldOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-latin1
+    /Helvetica findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Oblique-latin1
+    /Helvetica-Oblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Bold-latin1
+    /Helvetica-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-BoldOblique-latin1
+    /Helvetica-BoldOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-latin1
+    /Helvetica-Narrow findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-Oblique-latin1
+    /Helvetica-Narrow-Oblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-Bold-latin1
+    /Helvetica-Narrow-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-BoldOblique-latin1
+    /Helvetica-Narrow-BoldOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-Roman-latin1
+    /NewCenturySchoolbook-Roman findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-Italic-latin1
+    /NewCenturySchoolbook-Italic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-Bold-latin1
+    /NewCenturySchoolbook-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-BoldItalic-latin1
+    /NewCenturySchoolbook-BoldItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-Roman-latin1
+    /Palatino-Roman findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-Italic-latin1
+    /Palatino-Italic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-Bold-latin1
+    /Palatino-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-BoldItalic-latin1
+    /Palatino-BoldItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Symbol-latin1
+    /Symbol findfont
+definefont pop
+/ZapfChancery-MediumItalic-latin1
+    /ZapfChancery-MediumItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/ZapfDingbats-latin1
+    /ZapfDingbats findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+28.346000 -28.346000 scale
+-10.550000 -11.450000 translate
+%%EndProlog
+
+
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 12.350000 1.000000 m 12.350000 2.400000 l 18.450000 2.400000 l 18.450000 1.000000 l f
+0.000000 0.000000 0.000000 srgb
+n 12.350000 1.000000 m 12.350000 2.400000 l 18.450000 2.400000 l 18.450000 1.000000 l cp s
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(Parameter) 13.241250 1.827500 m 
+dup sw 4.317500 exch sub 
+9 div exch 0.0 exch 
+ gs 1 -1 sc ashow gr
+1.000000 1.000000 1.000000 srgb
+n 12.350000 2.400000 m 12.350000 3.400000 l 18.450000 3.400000 l 18.450000 2.400000 l f
+0.000000 0.000000 0.000000 srgb
+n 12.350000 2.400000 m 12.350000 3.400000 l 18.450000 3.400000 l 18.450000 2.400000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(+name: character) 12.500000 3.160000 m 
+dup sw 5.600000 exch sub 
+16 div exch 0.0 exch 
+ gs 1 -1 sc ashow gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 10.600000 6.600000 m 10.600000 8.000000 l 20.200000 8.000000 l 20.200000 6.600000 l f
+0.000000 0.000000 0.000000 srgb
+n 10.600000 6.600000 m 10.600000 8.000000 l 20.200000 8.000000 l 20.200000 6.600000 l cp s
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(ParamFamParameter) 11.077500 7.427500 m 
+dup sw 8.645000 exch sub 
+17 div exch 0.0 exch 
+ gs 1 -1 sc ashow gr
+1.000000 1.000000 1.000000 srgb
+n 10.600000 8.000000 m 10.600000 11.400000 l 20.200000 11.400000 l 20.200000 8.000000 l f
+0.000000 0.000000 0.000000 srgb
+n 10.600000 8.000000 m 10.600000 11.400000 l 20.200000 11.400000 l 20.200000 8.000000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(+main: numeric) 10.750000 8.760000 m 
+dup sw 4.900000 exch sub 
+14 div exch 0.0 exch 
+ gs 1 -1 sc ashow gr
+(+nuisance: OptionalNumeric) 10.750000 9.560000 m 
+dup sw 9.100000 exch sub 
+26 div exch 0.0 exch 
+ gs 1 -1 sc ashow gr
+(+fixed: OptionalNumeric) 10.750000 10.360000 m 
+dup sw 8.050000 exch sub 
+23 div exch 0.0 exch 
+ gs 1 -1 sc ashow gr
+(+trafo: MatrixorFunction) 10.750000 11.160000 m 
+dup sw 8.400000 exch sub 
+24 div exch 0.0 exch 
+ gs 1 -1 sc ashow gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 15.400000 5.688197 m 15.400000 3.400000 l 15.400000 3.400000 l s
+0 slj
+1.000000 1.000000 1.000000 srgb
+n 15.000000 5.688197 m 15.400000 6.488197 l 15.800000 5.688197 l ef
+0.100000 slw
+[] 0 sd
+0 slj
+0.000000 0.000000 0.000000 srgb
+n 15.000000 5.688197 m 15.400000 6.488197 l 15.800000 5.688197 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+showpage

Copied: pkg/distrDoc/inst/doc/ParamFamParameter.pdf (from rev 284, branches/distr-2.0/pkg/distrDoc/inst/doc/ParamFamParameter.pdf)
===================================================================
--- pkg/distrDoc/inst/doc/ParamFamParameter.pdf	                        (rev 0)
+++ pkg/distrDoc/inst/doc/ParamFamParameter.pdf	2008-09-01 13:01:58 UTC (rev 285)
@@ -0,0 +1,101 @@
+%PDF-1.4
+%Ç쏢
+5 0 obj
+<</Length 6 0 R/Filter /FlateDecode>>
+stream
+xœ­RÉNÃ0½û+æÆ&
+™ñÞ#pa'?…‚šB+ø|&MR¨TµB>زß̼Åï AÒ­aÏkuúàáùCt«}V–döÀÖYÔré9"èè0m¡Jŵqð©–ÍàárŸ²Ç-CÞõçaËk8Kc +µi.¬P”JfHKÕ³%ð98
+콍Öêð.k³º˜íQúªÎSu¿AÂ`W¤8h4Žz-{€v2OPt†À=õd1x~S·Ù‹g¬
+Æ–ÔOa>üE$äAò!zQŠp¶ëiìÚÃ{áküïeJ´âÉ!éžFï/²zK#¹qÉE§Ñ;·®`è_2@ç"™å7²ÉAUÍšE]´UÞñé®3:/®\ua-ª¬É%°Û·y5k²éÍPt°6ü𤬾Š§Ý°y›•³	\gó¶úšµ‹&ï
+×[¨½A/Y8­‘
+Ô«›ñ«NÅ•£Ùš
+h2‰C‰v*6‡€äV˜©*ÿV÷"“ïÕ7À-ò÷endstream
+endobj
+6 0 obj
+404
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 275 298]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF /Text]
+/ExtGState 10 0 R
+/Font 11 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+/Metadata 12 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/OPM 1>>endobj
+10 0 obj
+<</R7
+7 0 R>>
+endobj
+11 0 obj
+<</R9
+9 0 R/R8
+8 0 R>>
+endobj
+9 0 obj
+<</BaseFont/Courier/Type/Font
+/Subtype/Type1>>
+endobj
+8 0 obj
+<</BaseFont/Helvetica-Bold/Type/Font
+/Subtype/Type1>>
+endobj
+12 0 obj
+<</Type/Metadata
+/Subtype/XML/Length 1287>>stream
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<?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='4ed87dd1-b03a-11e8-0000-05261415641d' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.61'/>
+<rdf:Description rdf:about='4ed87dd1-b03a-11e8-0000-05261415641d' xmlns:xap='http://ns.adobe.com/xap/1.0/' xap:ModifyDate='2008-09-01T14:01:50+02:00' xap:CreateDate='2008-09-01T14:01:50+02:00'><xap:CreatorTool>UnknownApplication</xap:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='4ed87dd1-b03a-11e8-0000-05261415641d' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='4ed87dd1-b03a-11e8-0000-05261415641d'/>
+<rdf:Description rdf:about='4ed87dd1-b03a-11e8-0000-05261415641d' 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>
+                                                                        
+                                                                        
+<?xpacket end='w'?>
+endstream
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 8.61)
+/CreationDate(D:20080901140150+02'00')
+/ModDate(D:20080901140150+02'00')>>endobj
+xref
+0 13
+0000000000 65535 f 
+0000000718 00000 n 
+0000002388 00000 n 
+0000000659 00000 n 
+0000000508 00000 n 
+0000000015 00000 n 
+0000000489 00000 n 
+0000000783 00000 n 
+0000000955 00000 n 
+0000000893 00000 n 
+0000000824 00000 n 
+0000000854 00000 n 
+0000001024 00000 n 
+trailer
+<< /Size 13 /Root 1 0 R /Info 2 0 R
+/ID [<ABCDB6122A7E63B2B97239E06EBB5975><ABCDB6122A7E63B2B97239E06EBB5975>]
+>>
+startxref
+2511
+%%EOF

Modified: pkg/distrDoc/inst/doc/distr.Rnw
===================================================================
--- pkg/distrDoc/inst/doc/distr.Rnw	2008-09-01 12:57:51 UTC (rev 284)
+++ pkg/distrDoc/inst/doc/distr.Rnw	2008-09-01 13:01:58 UTC (rev 285)
@@ -1629,7 +1629,7 @@
   \begin{center}
     \includegraphics[width=7.5cm]{ProbFamily.eps}%
     \caption{\label{figPF}{\footnotesize Inheritance relations and slots of the 
-    corresponding \mbox{(sub-)}classes for \code{Distribution} where we do not 
+    corresponding \mbox{(sub-)}classes for \code{ProbFamily} where we do not 
     repeat inherited slots
     }}
   \end{center}
@@ -1647,12 +1647,28 @@
 is realized in a class design for the parameter of a parametric family 
 ---class \code{ParamFamParameter}, the formal class of a slot of class
 \code{ParamFamily}.
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%@Matthias:
-%insert graph here 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
+\ifpdf
+\begin{figure}[!ht]
+\vspace{2ex}
+  \begin{center}
+    \includegraphics[width=4cm]{ParamFamParameter.pdf}%
+    \caption{\label{figPFParam}{\footnotesize Inheritance relations and slots of 
+    \code{ParamFamParameter} where we do not repeat inherited slots
+    }}
+  \end{center}
+\vspace{-4ex}
+\end{figure}
+\else
+\begin{figure}[htb]
+  \begin{center}
+    \includegraphics[width=7.5cm]{ParamFamParameter.eps}%
+    \caption{\label{figPFParam}{\footnotesize Inheritance relations and slots of 
+    \code{ParamFamParameter} where we do not repeat inherited slots
+    }}
+  \end{center}
+\vspace{-1ex}
+\end{figure}
+\fi
 It has slots \code{name} (the name of the parameter), \code{main} (the interesting
 aspect of the parameter), \code{nuisance} an unknown part of the parameter of
 secondary interest, but which has to be estimated, for instance for confidence
@@ -1713,7 +1729,7 @@
      corresponding matrix.
 
 % -----------------------------------------------------------------------------
-\newpage
+%\newpage
 \subsection{Risk Classes}
 % -----------------------------------------------------------------------------
 The risk classes are up to now (i.e, version 2.0) not used inside of the 
@@ -1725,7 +1741,7 @@
 \begin{figure}[!ht]
 \vspace{2ex}
   \begin{center}
-    \includegraphics[width=4cm]{BiasType.pdf}%
+    \includegraphics[width=7cm]{BiasType.pdf}%
     \caption{\label{figBT}{\footnotesize Inheritance relations and slots of the 
     corresponding \mbox{(sub-)}classes for \code{BiasType} where we do not
     repeat inherited slots
@@ -1736,7 +1752,7 @@
 \else
 \begin{figure}[htb]
   \begin{center}
-    \includegraphics[width=4cm]{BiasType.eps}%
+    \includegraphics[width=6cm]{BiasType.eps}%
     \caption{\label{figBT}{\footnotesize Inheritance relations and slots of the 
     corresponding \mbox{(sub-)}classes for \code{BiasType} where we do not 
     repeat inherited slots

Modified: pkg/distrSim/R/rbind-methods.R
===================================================================
--- pkg/distrSim/R/rbind-methods.R	2008-09-01 12:57:51 UTC (rev 284)
+++ pkg/distrSim/R/rbind-methods.R	2008-09-01 13:01:58 UTC (rev 285)
@@ -4,13 +4,13 @@
           f <- base::rbind; do.call(f,cal0)})
 
 setMethod("rbind", "SeqDataFrames",  function(x,...){
-    SL <- list(dots)
+    SL <- list(...)
     len <- length(SL)
     if (len >= 1)
        { if (!all(lapply(SL at data, is.data.frame)))
               stop("all elements must be data frames")
           f <- function(y) {list(ncol(y), names(y))}
-          g <- function(y) identical(f(y), f(object at data[[1]]))
+          g <- function(y) identical(f(y), f(y at data[[1]]))
           if (!all(lapply(SL at data, g)))
                stop("all elements must have the same column structure")
           vLl <- lapply(SL, function(y) length(y at data))

Modified: pkg/utils/finde.r
===================================================================
--- pkg/utils/finde.r	2008-09-01 12:57:51 UTC (rev 284)
+++ pkg/utils/finde.r	2008-09-01 13:01:58 UTC (rev 285)
@@ -14,6 +14,4 @@
 setwd(ow)
 }
 finde(x=".makeQNew", dir ="C:/rtest/distr/pkg/distr/R")
-finde(x="\\.oKT", dir ="C:/rtest/distr/branches/distr-2.0/pkg/distr/R")
-finde(x="setMethod\\(\"trafo", dir ="C:/rtest/distr/branches/distr-2.0/pkg/distrMod/R")

More information about the Distr-commits mailing list