Changeset f7f325b in tol for tol_tests


Ignore:
Timestamp:
Dec 10, 2009, 12:10:39 PM (17 years ago)
Author:
Víctor de Buen <vdebuen@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
a64c950
Parents:
1463b2e
Message:

Avoiding use of members of type Code
Relates to #795

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1776 be4846ae-f051-483a-831f-b64e7d08527f

Location:
tol_tests/tol/BSR
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • tol_tests/tol/BSR/test_03/def.tol

    r1463b2e rf7f325b  
    2929
    3030//Number of variables of each observational node
    31 Real n = IntRand(10,10);
     31Real n = IntRand(3,3);
    3232Real S = 7;
    3333//Data length of each observational node
    34 Real m  = IntRand(300,600);
     34Real m  = IntRand(100,100);
    3535//Number of observational nodes
    36 Real K1 = IntRand(2,4);
     36Real K1 = IntRand(2,2);
    3737//
    38 Real enableARMA = true;
     38Real enableARMA = True;
     39Real enableARMASeasonal = And(enableARMA,True);
    3940//Regular AR Degree
    4041Real p1 = enableARMA*IntRand(0,2);
    4142//Seasonal AR Degree
    42 Real pS = enableARMA*IntRand(0,2);
     43Real pS = enableARMASeasonal*IntRand(0,2);
    4344//Regular AR Degree
    4445Real q1 = enableARMA*IntRand(0,Max(0,1-p1));
    4546//Seasonal AR Degree
    46 Real qS = enableARMA*IntRand(0,Max(0,1-pS));
     47Real qS = enableARMASeasonal*IntRand(0,Max(0,1-pS));
    4748//Number of missing values in input matrix
    4849Real MissInp = Max(4,IntRand(0.01*n*K1,0.05*n*K1));

  • tol_tests/tol/BSR/test_03/test.tol

    r1463b2e rf7f325b  
    3838  Real bsr.linBlk.MH.useAfterIter = 1/0;
    3939  Real bsr.arimaStoreInitialValues = True;
    40 //Code bsr.scalarSampler.armaBlock = BysMcmc::Options::Scalar.Sampler::Arms;
    41 //Code bsr.scalarSampler.nonLinBlock = BysMcmc::Options::Scalar.Sampler::Arms;
    4240  Real do.resume = 0;
    4341  Real do.mcmc.profiler   = True

  • tol_tests/tol/BSR/test_04/test.tol

    r1463b2e rf7f325b  
    382382  Real mcmc.cacheLength   =   100;
    383383
    384   Code bsr.scalarSampler.nonLinBlock=BysMcmc::Options::Scalar.Sampler::Slice;
    385 
    386384  Text DBApi.modularSchema =
    387385    BysMcmc::Options::DBApi.Modular.Schema::Master.ObsAsPrimary;

  • tol_tests/tol/BSR/test_05/test.tol

    r1463b2e rf7f325b  
    313313  Real mcmc.cacheLength   =    100;
    314314
    315   Code bsr.scalarSampler.nonLinBlock=BysMcmc::Options::Scalar.Sampler::Slice;
    316 
    317315  Text DBApi.modularSchema =
    318316    BysMcmc::Options::DBApi.Modular.Schema::Master.ObsAsPrimary;

  • tol_tests/tol/BSR/test_07/test.tol

    r1463b2e rf7f325b  
    7777  Text _.segmentName = "Obs";
    7878
    79   //Tool function to reduce registers length in _.linearParamInfo
    80   Code LPI = BysMcmc::Bsr::OneNode::LPI;
    8179  //#Original data storer by columns with names
    8280  Set _.data.orig = For(1, Card(data.name), Matrix(Real j)
    … …  
    103101
    104102  //Linear block definition with domain and prior restrictions
    105   Set _.linearParamInfo = [[
     103  Set _.linearParamInfo = {
     104  //Tool function to reduce registers length in _.linearParamInfo
     105  Code LPI = BysMcmc::Bsr::OneNode::LPI;
     106  [[
    106107    //   Variable      initVal   min    max     priAvg   priSig  priSigWeight
    107108    LPI("Input_1",           0, -1/0,     0,         ?,       ?,          ?),
    … …  
    112113    LPI("Input_Pr_1_2",      0,    0,  +1/0,         ?,       ?,          ?),
    113114    LPI("Constant" ,  _.cteAvg, -1/0,  +1/0,  _.cteAvg,    0.25,       0.90)
    114   ]];
     115  ]]};
    115116  //Input matrix
    116117  VMatrix _.X = Group("ConcatColumns",
    … …  
    142143  Real mcmc.thinning      =    1;
    143144  Real mcmc.cacheLength   =  100;
    144   Code bsr.scalarSampler.nonLinBlock=BysMcmc::Options::Scalar.Sampler::Slice;
    145145
    146146  Real bsr.iniVal.try.givenByUser = 2;

  • tol_tests/tol/BSR/test_08/test.tol

    r1463b2e rf7f325b  
    8181  Text _.segmentName = "Obs";
    8282
    83   //Tool function to reduce registers length in _.linearParamInfo
    84   Code LPI = BysMcmc::Bsr::OneNode::LPI;
    8583  //#Original data storer by columns with names
    8684  Set _.data.orig = For(1, Card(data.name), Matrix(Real j)
    … …  
    108106
    109107  //Linear block definition with domain and prior restrictions
    110   Set _.linearParamInfo = [[
     108  Set _.linearParamInfo = {
     109  //Tool function to reduce registers length in _.linearParamInfo
     110  Code LPI = BysMcmc::Bsr::OneNode::LPI;
     111  [[
    111112    //   Variable      initVal   min    max     priAvg   priSig  priSigWeight
    112113    LPI("Input_1",           0, -1/0,     0,         ?,       ?,          ?),
    … …  
    117118    LPI("Input_Prod_1_2",    0,    0,  +1/0,         ?,       ?,          ?),
    118119    LPI("Constant" ,  _.cteAvg, -1/0,  +1/0,  _.cteAvg,    0.25,       0.90)
    119   ]];
     120  ]]};
    120121  //Input matrix
    121122  VMatrix _.X = Group("ConcatColumns",
    … …  
    147148  Real mcmc.thinning      =     2; //Probit mcmc have high alternance
    148149  Real mcmc.cacheLength   =   100;
    149   Code bsr.scalarSampler.nonLinBlock=BysMcmc::Options::Scalar.Sampler::Slice;
    150 
    151150    //Try order for given by user solution to start MCMC
    152151    Real bsr.iniVal.try.givenByUser = 3;

  • tol_tests/tol/BSR/test_09/test.tol

    r1463b2e rf7f325b  
    202202  Real bsr.cholesky.warningFreq      = 100;
    203203  Real bsr.truncMNormal.gibbsNumIter = 5;
    204   Code bsr.scalarSampler.armaBlock =
    205     BysMcmc::Options::Scalar.Sampler::Arms;
    206   Code bsr.scalarSampler.nonLinBlock =
    207     BysMcmc::Options::Scalar.Sampler::Arms;
    208204
    209205  Text bsr.arimaFilter = BysMcmc::Options::Arima.Filter::FastCholSea;

  • tol_tests/tol/BSR/test_12/test.tol

    r1463b2e rf7f325b  
    176176  Real bsr.cholesky.warningFreq      = 100;
    177177  Real bsr.truncMNormal.gibbsNumIter = 5;
    178   Code bsr.scalarSampler.armaBlock =
    179     BysMcmc::Options::Scalar.Sampler::Slice;
    180   Code bsr.scalarSampler.nonLinBlock =
    181     BysMcmc::Options::Scalar.Sampler::Slice;
    182178//Metodo de aproximacion del arima
    183179  Text bsr.arimaFilter = BysMcmc::Options::Arima.Filter::FastCholSea;

  • tol_tests/tol/BSR/test_16/test.tol

    r1463b2e rf7f325b  
    2020  Real bsr.linBlk.MH.useAfterIter = 1/0;
    2121  Text bsr.arimaFilter = BysMcmc::Options::Arima.Filter::DifEq;
    22 //Code bsr.scalarSampler.armaBlock = BysMcmc::Options::Scalar.Sampler::Arms;
    23 //Code bsr.scalarSampler.nonLinBlock = BysMcmc::Options::Scalar.Sampler::Arms;
    2422//Generic flags
    2523  Real do.resume          = 0;
Note: See TracChangeset for help on using the changeset viewer.