Skip to content

Commit 93eb98f

Browse files
committed
report number of samples in inferpopulation
1 parent 7b304df commit 93eb98f

26 files changed

+709
-698
lines changed

R/inferpopulation.R

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -847,27 +847,27 @@ inferpopulation <- function(
847847
'Starting Monte Carlo sampling of', nsamples, 'samples by',
848848
nchains, 'chains'
849849
)
850-
cat('\nin a space of', (
851-
vn$R * 2 * ncomponents +
850+
851+
samplespacedims <- vn$R * 2 * ncomponents +
852852
vn$C * 2 * ncomponents +
853853
vn$D * 2 * ncomponents +
854854
sum(apply(Oalpha0, 1, function(x) sum(x > 2e-17) - 1)) * ncomponents +
855855
sum(apply(Nalpha0, 1, function(x) sum(x > 2e-17) - 1)) * ncomponents +
856856
sum(apply(Nalpha0, 1, function(x) sum(x > 2e-17) - 1)) +
857857
vn$B * ncomponents +
858858
ncomponents - 1
859-
),
860-
## '(effectively',
861-
## paste0(
862-
## (sum(as.numeric(vn) * c(
863-
## 3 + npoints, 3 + npoints, 3 + npoints,
864-
## 3 + npoints, 0, 0, 1 + npoints
865-
## )) +
866-
## sum(Nalpha0 > 2e-100) +
867-
## nrow(Nalpha0) * (npoints - 1) + 1 +
868-
## sum(Oalpha0 > 2e-100) +
869-
## nrow(Oalpha0) * (npoints - 1) + 1 ) * ncomponents - 1 + nalpha - 1,
870-
## ')' ),
859+
samplespacexdims <- 1 + # Alpha
860+
vn$R * ncomponents + # Rrate
861+
vn$C * ncomponents + # Crate
862+
vn$D * ncomponents + # Drate
863+
1 + # K
864+
vn$C * npoints * ncomponents + # latent C
865+
vn$D * npoints * ncomponents + # latent D
866+
sum(is.na(data)) # missing data
867+
868+
869+
cat('\nin a space of', samplespacedims,
870+
'(effectively', paste0(samplespacedims + samplespacexdims, ')'),
871871
'dimensions.\n')
872872

873873
cat('Using', ncores, 'cores:',
@@ -1431,7 +1431,7 @@ inferpopulation <- function(
14311431
## Inform user that compilation is done, if core 1:
14321432
if (acore == 1) {
14331433
print2user(paste0('\rCompiled core ', acore, '. ',
1434-
'Effective dimensions of sampled space: ',
1434+
'Number of samplers: ',
14351435
length(confnimble$samplerExecutionOrder), '.\n',
14361436
'Estimating remaining time, please be patient...'),
14371437
outcon)

development/tests/custom/dataset_custom150.csv

Lines changed: 150 additions & 150 deletions
Large diffs are not rendered by default.
Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
Rvrt,Rpvrt,Ruvrt,Cvrt,Dvrt,Duvrt,Bvrt,Nvrt,Ovrt,N2vrt
2-
-0.395246875139823,8.2411924750225,0.949817785817012,3.36746434658382,0,3.4,yes,B,Oc,a
3-
-0.356584527236355,7.78504666662015,0.479930944302909,0.919598378563167,3,1,yes,E,Ob,a
4-
-1.33539625696575,3.8246476586393,0.290683533059963,0.986849244759091,3.2,1,yes,E,Oc,a
5-
-0.276168479834571,6.17953969596856,0.676833315235258,3.62815768497334,3.2,3.6,yes,C,Ob,a
6-
2.57435778141736,0.886465730720787,0.947936470866123,0.503543954562774,-0.2,0.6,yes,C,Od,b
7-
0.0514841544838029,8.37397398832197,0.435014012785366,1.13421276185881,0.2,1.2,no,B,Od,d
8-
0.168869198494957,7.82206247896669,0.529134912668262,1.90774377374913,-0.2,2,yes,B,Od,b
9-
3.36573298016726,12.0975926665064,0.915187680645755,2.16599109254497,2.6,2.2,yes,E,Oc,b
10-
1.78686191936681,5.31735930641673,0.524017383329554,0.970287241028494,-1.6,1,yes,C,Oc,b
11-
-0.470822308710557,7.21421708433641,0.974674014836227,1.12908400948215,-1,1.2,yes,D,Ob,a
12-
-0.248350770304736,9.19661732191395,0.946531667384733,0.214552784891884,-0.8,0.2,no,C,Oc,c
13-
0.397288502971568,7.03186426962859,0.205991935339294,2.69044846215199,-0.4,2.6,yes,E,Ob,b
14-
-1.41844637368579,6.08253590077878,0.667511834904567,0.283951716480965,1,0.2,yes,C,Oe,a
15-
0.325097443865216,0.409402725725303,0.479441015934243,2.05023034409707,-0.4,2,yes,C,Oc,b
16-
1.10450517498165,9.88519399508357,0.927185370733761,0.602017306332555,0,0.6,yes,E,Oc,b
17-
-0.781649623098902,5.05576486628533,0.965286135569673,1.10820888550928,-0.8,1.2,yes,C,Od,a
18-
2.89922482316533,10.2732079565161,0.426355253102871,0.223691505084073,0.8,0.2,yes,C,Oc,b
19-
-0.630814452837581,6.19031506341888,0.743341515216017,2.15249011052567,0.2,2.2,yes,D,Od,a
20-
0.492665254508775,0.671045346427922,0.583230035578813,0.00721614045214958,-1.4,0,yes,C,Oe,b
21-
-0.172822476399951,0.390202637745353,0.913189838516319,1.83261611467867,-0.4,1.8,yes,B,Od,a
22-
3.05411572196685,13.2371453855754,0.611387297126166,2.04129071986455,2.2,2,yes,E,Od,b
23-
2.67505050866703,0.430946915613094,0.552102348718575,0.863299323165396,0,0.8,yes,C,Od,b
24-
0.383460145913423,10.8820542421555,0.860251174591857,1.25001306659856,1.6,1.2,no,E,Od,d
25-
-0.703024885692559,6.81933057934687,0.949727937374087,0.767947593963547,0.8,0.8,no,C,Od,c
26-
0.10546924767542,2.89228998494552,0.736240951177488,0,2.2,0,yes,C,Od,b
27-
-0.330640044842053,13.3959517279924,0.750143132473767,0.8025158880069,-0.6,0.8,no,C,Od,c
28-
2.72432193853534,0.30978644823941,0.592020051630965,3.24474467028604,0.4,3.2,yes,C,Od,b
29-
3.63502412387482,1.53164031416363,0.239933203199941,0,1.4,0,yes,D,Od,b
30-
3.09747977559259,0.5428711698335,0.892059761348653,2.61055897558454,-0.2,2.6,yes,A,Oc,b
31-
-0.266665811481624,1.02943196736088,0.300529302589302,2.38042746746057,-0.8,2.4,yes,E,Oc,a
2+
-0.803957333542458,4.46674926484361,0.187340901802713,0.0882824915278539,1.2,0,yes,E,Ob,a
3+
,8.34130436922191,0.165314042453987,0.707889331138198,2.8,0.8,yes,A,Od,a
4+
3.09792669875612,,0.938986951787687,1.80803898179549,3.2,1.8,no,B,Od,d
5+
3.30474975808799,16.7684384355047,,3.73215634516142,0.6,3.8,yes,E,Oc,b
6+
-0.963731961830605,5.94279334365785,0.243319330462488,,1.2,0.8,yes,E,Od,a
7+
2.32674898922465,6.16707258944448,0.502952190320746,1.82450902149953,,1.8,no,C,Od,d
8+
3.35527122364734,8.71315117853761,0.828048860767144,0.719299706296245,3.2,,yes,E,Od,b
9+
-0.684804834247055,16.0490935006238,0.569755056981513,0.266611637322873,0.6,0.2,,E,Oc,a
10+
-1.49529441060709,5.38546013213722,0.619970007436334,4.44387933974426,-0.4,4.4,yes,,Ob,a
11+
0.712312508192033,11.1650442477002,0.681605372248999,0.755119143742564,-0.6,0.8,no,C,,d
12+
0.210353752948934,0.534989001151921,0.967693147211532,3.64794684022873,-1,3.6,yes,B,Oe,
13+
-0.269879564835596,6.63207173793191,0.951583274495536,1.08490032412099,0.4,1,yes,E,Oc,a
14+
0.366373819528959,0.932683661951263,0.514536464820143,0,2,0,yes,D,Oc,b
15+
3.29101193035013,0.524060110136082,0.909642653812632,0,-0.4,0,yes,C,Ob,b
16+
-2.30701541476943,0.459396201951249,0.7321136564577,2.03518436860216,2.8,2,yes,B,Oc,a
17+
-1.96589459990591,9.64449364641808,0.575025677141952,1.68811204218279,1,1.6,no,C,Oc,c
18+
-0.185980953330923,6.83099181773038,0.944272872377441,0.91320014941079,-2.4,1,yes,C,Oc,a
19+
0.28619046741859,8.69060643701377,0.163830616054564,2.05147361835809,4,2,yes,B,Od,b
20+
-0.256123009726109,0.243870569223521,0.391632364404622,1.9505388804158,1.4,2,yes,D,Od,a
21+
1.88048494632932,13.8692575295055,0.276471190294137,1.82641114868068,2,1.8,no,C,Oc,d
22+
0.0432031365005089,7.41014203375679,0.376461846983997,2.43328286190674,3,2.4,no,D,Od,d
23+
2.39547725578836,1.08225755210168,0.960948578394305,0.499815738913112,1,0.4,yes,C,Oc,b
24+
0.553459862184736,0.761618622274981,0.943679049310097,4.30389840424776,2.4,4.4,yes,D,Oc,b
25+
-0.489712648836984,1.64832025451838,0.557671587939919,2.97797162930295,0.2,3,yes,E,Oe,a
26+
-0.289570721026207,7.69316734226387,0.298036196325312,2.28837927355154,-1,2.2,yes,C,Od,a
27+
-0.138175464779036,6.75931038801343,0.256486494369154,1.22074592625911,-1,1.2,no,B,Oc,c
28+
0.409314559233793,8.35194139649996,0.93158267082295,2.84854829605652,3.2,2.8,no,B,Oc,d
29+
-0.813400702580376,1.91070428976187,0.933698326168419,2.50010585401572,-0.4,2.6,yes,C,Oc,a
30+
1.02424300758317,7.27059765322546,0.44988673772045,1.62696677754922,-0.2,1.6,no,B,Oc,d
31+
-0.596740793740906,7.988639287157,0.388580804325954,0.318008483999054,0.2,0.4,yes,E,Od,a

0 commit comments

Comments
 (0)