Index: tol_tests/tol/Bugzilla/bug_000907/estim.tol =================================================================== --- tol_tests/tol/Bugzilla/bug_000907/estim.tol (revision 2aafbee46ee24f716d49927d76b30142f95289da) +++ tol_tests/tol/Bugzilla/bug_000907/estim.tol (revision 2aafbee46ee24f716d49927d76b30142f95289da) @@ -0,0 +1,23 @@ +/* -*- mode: C++ -*- */ +////////////////////////////////////////////////////////////////////////////// +// FILE : estim.tol +// PURPOSE: test for a resolved bug +////////////////////////////////////////////////////////////////////////////// + +////////////////////////////////////////////////////////////////////////////// +//Loads general tools for BSR tests +////////////////////////////////////////////////////////////////////////////// +#Require BysMcmc; + +BysMcmc::@Config bsr.config = Include("model/master.bsr.config.oza")[1]; +Set bsr.parsed = BSR.Parse("model/master.bsr","master"); + +BysMcmc::@Cycler cycler = BysMcmc::Bsr::Gibbs::GetCycler( + bsr.parsed, + BysMcmc::@McmcPartialHandler::Null(0), + bsr.config, + BysMcmc::@Notifier::Null(0)); + +BysMcmc::@Estimation estim = BysMcmc::@Estimation::New(cycler); + +Real estim::Run(0); Index: tol_tests/tol/Bugzilla/bug_000907/model/master.bsr =================================================================== --- tol_tests/tol/Bugzilla/bug_000907/model/master.bsr (revision 2aafbee46ee24f716d49927d76b30142f95289da) +++ tol_tests/tol/Bugzilla/bug_000907/model/master.bsr (revision 2aafbee46ee24f716d49927d76b30142f95289da) @@ -0,0 +1,20 @@ +///////////////////////////////////////////////////////////////////////////// +// Bayesian Sparse Regression +///////////////////////////////////////////////////////////////////////////// + +$BEGIN + +Module.Type = master; +Model.Name = "TMO.CRC.D_H01Mi00__1.0.Prueba"; +Model.Description = "Versión 1.0.Prueba del modelo de TMO de la ser2Model CRC en fechado Diario, \n" +"en la hora 01 y el minuto 00.\n" +"Se hace estimación hasta 20100421, y previsión hasta 20100531"; +Session.Name = "y2010m05d11h16i18s22.00"; +Session.Description = "Sesión creada en el instante y2010m05d11h16i18s22.00"; +Session.Authors = "user@bayesforecast.com"; + +Modular.Schema = monophasic; +Include primary module "./obs/TMO.CRC.D_H01Mi00/primary/primary.bsr"; +Include primary module "./pri/TMO.CRC.D_H01Mi00__Output_TMO.CRC.D__Deg0.Coef/primary/primary.bsr"; + +$END Index: tol_tests/tol/Bugzilla/bug_000907/model/obs/TMO.CRC.D_H01Mi00/primary/primary.bsr =================================================================== --- tol_tests/tol/Bugzilla/bug_000907/model/obs/TMO.CRC.D_H01Mi00/primary/primary.bsr (revision 2aafbee46ee24f716d49927d76b30142f95289da) +++ tol_tests/tol/Bugzilla/bug_000907/model/obs/TMO.CRC.D_H01Mi00/primary/primary.bsr (revision 2aafbee46ee24f716d49927d76b30142f95289da) @@ -0,0 +1,58 @@ +///////////////////////////////////////////////////////////////////////////// +// Bayesian Sparse Regression +///////////////////////////////////////////////////////////////////////////// + +$BEGIN + +Module.Type = primary; +Model.Name = "TMO.CRC.D_H01Mi00"; +Model.Description = "Output de TMO de la ser2Model CRC en Diario en la hora 01 y el minuto 00"; +Session.Name = "y2010m05d11h16i18s22.00"; +Session.Description = "Sesión creada en el instante y2010m05d11h16i18s22.00"; +Session.Authors = "user@bayesforecast.com"; + + + +///////////////////////////////////////////////////////////////////////////// +// Defining header of Regression Variables +///////////////////////////////////////////////////////////////////////////// + +TMO.CRC.D_H01Mi00__Output_TMO.CRC.D__Deg0.Coef <- +0.7; + + +///////////////////////////////////////////////////////////////////////////// +// Defining header of noise distribution +///////////////////////////////////////////////////////////////////////////// + +TMO.CRC.D_H01Mi00::Noise[111 dating Daily from y2010m01d01h00i00s00.00 until y2010m04d21h23i30s00.00] + ~ Normal(0,SigmaBlk::TMO.CRC.D_H01Mi00::sigma2 * Cov = ArimaCovariance([[ + @ARIMAStruct(1,1-0.1*B,1,1), + @ARIMAStruct(7,1,1+0.1*B^7,1-B^7)]])); + + +///////////////////////////////////////////////////////////////////////////// +// Defining regression equations +///////////////////////////////////////////////////////////////////////////// + + +Output = {$ VMatrix { Include("./Output.oza")[1] } $}; +Input = {$ VMatrix { Include("./Input.oza")[1] } $}; + +///////////////////////////////////////////////////////////////////////////// +// Defining header of Regression Missing Values +///////////////////////////////////////////////////////////////////////////// + +TMO.CRC.D_H01Mi00__y2010m02d21 ? + at row 52 for output + <- +0 + ~ Uniform(-1.#INF,+0); +TMO.CRC.D_H01Mi00__y2010m03d20 ? + at row 79 for output + <- +0 + ~ Uniform(-1.#INF,+0); +TMO.CRC.D_H01Mi00__y2010m04d04 ? + at row 94 for output + <- +0 + ~ Uniform(-1.#INF,+0); + +$END Index: tol_tests/tol/Bugzilla/bug_000907/model/pri/TMO.CRC.D_H01Mi00__Output_TMO.CRC.D__Deg0.Coef/primary/primary.bsr =================================================================== --- tol_tests/tol/Bugzilla/bug_000907/model/pri/TMO.CRC.D_H01Mi00__Output_TMO.CRC.D__Deg0.Coef/primary/primary.bsr (revision 2aafbee46ee24f716d49927d76b30142f95289da) +++ tol_tests/tol/Bugzilla/bug_000907/model/pri/TMO.CRC.D_H01Mi00__Output_TMO.CRC.D__Deg0.Coef/primary/primary.bsr (revision 2aafbee46ee24f716d49927d76b30142f95289da) @@ -0,0 +1,44 @@ +///////////////////////////////////////////////////////////////////////////// +// Bayesian Sparse Regression +///////////////////////////////////////////////////////////////////////////// + +$BEGIN + +Module.Type = primary; +Model.Name = "TMO.CRC.D_H01Mi00__Output_TMO.CRC.D__Deg0.Coef"; +Model.Description = "XXX"; +Session.Name = "y2010m05d11h16i18s22.00"; +Session.Description = "Sesión creada en el instante y2010m05d11h16i18s22.00"; +Session.Authors = "user@bayesforecast.com"; + + + +///////////////////////////////////////////////////////////////////////////// +// Defining header of Regression Variables +///////////////////////////////////////////////////////////////////////////// + +TMO.CRC.D_H01Mi00__Output_TMO.CRC.D__Deg0.Coef <- +0.7; + + +///////////////////////////////////////////////////////////////////////////// +// Defining header of noise distribution +///////////////////////////////////////////////////////////////////////////// + +TMO.CRC.D_H01Mi00__Output_TMO.CRC.D__Deg0.Coef::Noise[1] + ~ Normal(0,0.0225); + + +///////////////////////////////////////////////////////////////////////////// +// Defining regression equations +///////////////////////////////////////////////////////////////////////////// + + +Output = {$ VMatrix { Include("./Output.oza")[1] } $}; +Input = {$ VMatrix { Include("./Input.oza")[1] } $}; + +///////////////////////////////////////////////////////////////////////////// +// Defining header of Regression Missing Values +///////////////////////////////////////////////////////////////////////////// + + +$END Index: tol_tests/tol/Bugzilla/bug_000907/test.tol =================================================================== --- tol_tests/tol/Bugzilla/bug_000907/test.tol (revision 2aafbee46ee24f716d49927d76b30142f95289da) +++ tol_tests/tol/Bugzilla/bug_000907/test.tol (revision 2aafbee46ee24f716d49927d76b30142f95289da) @@ -0,0 +1,37 @@ +/* -*- mode: C++ -*- */ +////////////////////////////////////////////////////////////////////////////// +// FILE : test.tol +// PURPOSE: test for a resolved bug +////////////////////////////////////////////////////////////////////////////// + +//Sets the bugzilla identifier number, your e-mail and the bugŽs summary + Real bugNum_ = 907; + Text email_ = "vdebuen@tol-project.org"; + Text summary_="Error en el parser de BSR para prior en omitidos con límites truncados"; + Text link_ = GetTolBugzillaLink(bugNum_); + + //Write here the initial test TOL code if needed + Real numErr0 = Copy(NError); + Real numWar0 = Copy(NWarning); + + Set Include("estim.tol"); + + Real numErr1 = Copy(NError); + Real numWar1 = Copy(NWarning); + + Set partialResults_ = [[ numErr0, numErr1]]; + +//This is a messure of the success of the test + Real quality_ = And(numErr1 == numErr0, + numWar1 == numWar0); + +//Return the results + Set resultStr_ = @strTestStatus(summary_, link_, quality_, + "Partial results = "<