Skip to content

Commit

Permalink
Uncrustify tests. Tweak mcmc tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sandro Dias Pinto Vitenti committed Aug 2, 2021
1 parent 1b54b31 commit 6625d26
Show file tree
Hide file tree
Showing 41 changed files with 3,844 additions and 3,034 deletions.
4 changes: 2 additions & 2 deletions numcosmo/math/ncm_fit_esmcmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1931,7 +1931,7 @@ ncm_fit_esmcmc_run_lre (NcmFitESMCMC *esmcmc, guint prerun, gdouble lre)
gdouble m = n * lerror2 / lre2;
guint runs = ((m - n) > 1000.0) ? MIN (ceil ((m - n) * self->lre_step), 100000) : ceil (m - n);
guint ti = (self->cur_sample_id + 1) / self->nwalkers;

runs = GSL_MIN (ncm_timer_task_estimate_by_time (self->nt, self->max_runs_time), runs);
runs = GSL_MAX (runs / self->nwalkers + 1, self->min_runs);

Expand All @@ -1949,7 +1949,7 @@ ncm_fit_esmcmc_run_lre (NcmFitESMCMC *esmcmc, guint prerun, gdouble lre)

if (self->auto_trim)
ncm_mset_catalog_trim_by_type (self->mcat, self->auto_trim_div, self->trim_type, self->mtype);

ncm_mset_catalog_estimate_autocorrelation_tau (self->mcat, FALSE);
lerror = ncm_mset_catalog_largest_error (self->mcat);
}
Expand Down
44 changes: 26 additions & 18 deletions tests/ncm_data_gauss_cov_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* numcosmo is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
Expand All @@ -44,7 +44,6 @@ ncm_data_gauss_cov_test_init (NcmDataGaussCovTest *gcov_test)
static void
ncm_data_gauss_cov_test_finalize (GObject *object)
{

/* Chain up : end */
G_OBJECT_CLASS (ncm_data_gauss_cov_test_parent_class)->finalize (object);
}
Expand All @@ -55,12 +54,12 @@ static gboolean _ncm_data_gauss_cov_test_cov_func (NcmDataGaussCov *gauss, NcmMS
static void
ncm_data_gauss_cov_test_class_init (NcmDataGaussCovTestClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
NcmDataClass *data_class = NCM_DATA_CLASS (klass);
NcmDataGaussCovClass* gauss_class = NCM_DATA_GAUSS_COV_CLASS (klass);

GObjectClass *object_class = G_OBJECT_CLASS (klass);
NcmDataClass *data_class = NCM_DATA_CLASS (klass);
NcmDataGaussCovClass *gauss_class = NCM_DATA_GAUSS_COV_CLASS (klass);
object_class->finalize = &ncm_data_gauss_cov_test_finalize;

data_class->prepare = &_ncm_data_gauss_cov_test_prepare;
gauss_class->mean_func = &ncm_data_gauss_cov_test_mean_func;
gauss_class->cov_func = NULL;
Expand All @@ -71,42 +70,50 @@ _ncm_data_gauss_cov_test_prepare (NcmData *data, NcmMSet *mset)
{
}

void
void
ncm_data_gauss_cov_test_mean_func (NcmDataGaussCov *gauss, NcmMSet *mset, NcmVector *vp)
{
NcmDataGaussCovTest *gcov_test = NCM_DATA_GAUSS_COV_TEST (gauss);
guint i;

for (i = 0; i < gauss->np; i++)
{
gdouble x = 1.0 / (gauss->np - 1.0) * i;

ncm_vector_set (vp, i, gcov_test->a + gcov_test->b * cos (gcov_test->c * x + gcov_test->d));
}
}

static gboolean
static gboolean
_ncm_data_gauss_cov_test_cov_func (NcmDataGaussCov *gauss, NcmMSet *mset, NcmMatrix *cov)
{
guint i;

for (i = 0; i < gauss->np; i++)
{
gdouble var_i = g_test_rand_double_range (1e-3, 1.0e-2) * fabs (ncm_vector_get (gauss->y, i)) * 1.0e-3;

ncm_matrix_set (gauss->cov, i, i, var_i);
}

for (i = 0; i < gauss->np; i++)
{
guint j;

for (j = i + 1; j < gauss->np; j++)
{
gdouble cor_ij = g_test_rand_double_range (1.0e-1, 1.0) * (g_test_rand_double_range (0.0, 1.0) > 0.5 ? -1.0 : 1.0);
gdouble cov_ij = cor_ij * sqrt (ncm_matrix_get (gauss->cov, i, i) * ncm_matrix_get (gauss->cov, j, j));

ncm_matrix_set (gauss->cov, i, j, cov_ij);
ncm_matrix_set (gauss->cov, j, i, cov_ij);
}
}

{
NcmMatrix *t1 = ncm_matrix_dup (gauss->cov);
gint ret = gsl_blas_dgemm (CblasNoTrans, CblasTrans, 1.0, ncm_matrix_gsl (t1), ncm_matrix_gsl (t1), 0.0, ncm_matrix_gsl (gauss->cov));
gint ret = gsl_blas_dgemm (CblasNoTrans, CblasTrans, 1.0, ncm_matrix_gsl (t1), ncm_matrix_gsl (t1), 0.0, ncm_matrix_gsl (gauss->cov));

NCM_TEST_GSL_RESULT ("_ncm_data_gauss_cov_test_cov_func", ret);
ncm_matrix_copy_triangle (gauss->cov, 'U');
ncm_matrix_free (t1);
Expand All @@ -118,18 +125,18 @@ _ncm_data_gauss_cov_test_cov_func (NcmDataGaussCov *gauss, NcmMSet *mset, NcmMat
#define _TEST_NCM_DATA_GAUSS_COV_MIN_SIZE 10
#define _TEST_NCM_DATA_GAUSS_COV_MAX_SIZE 20

void
void
ncm_data_gauss_cov_test_gen_cov (NcmDataGaussCovTest *gcov_test)
{
NcmDataGaussCov *gauss = NCM_DATA_GAUSS_COV (gcov_test);
guint size = g_test_rand_int_range (_TEST_NCM_DATA_GAUSS_COV_MIN_SIZE, _TEST_NCM_DATA_GAUSS_COV_MAX_SIZE);

guint size = g_test_rand_int_range (_TEST_NCM_DATA_GAUSS_COV_MIN_SIZE, _TEST_NCM_DATA_GAUSS_COV_MAX_SIZE);
ncm_data_gauss_cov_set_size (gauss, size);
gcov_test->a = g_test_rand_double_range ( 1.0, 3.0);
gcov_test->b = g_test_rand_double_range ( 1.0, 2.0) * 1e-1;
gcov_test->a = g_test_rand_double_range (1.0, 3.0);
gcov_test->b = g_test_rand_double_range (1.0, 2.0) * 1e-1;
gcov_test->c = g_test_rand_double_range (-1.0, 1.0) * 2.0 * M_PI;
gcov_test->d = g_test_rand_double_range (-1.0, 1.0) * 2.0 * M_PI;

ncm_data_gauss_cov_test_mean_func (gauss, NULL, gauss->y);
_ncm_data_gauss_cov_test_cov_func (gauss, NULL, NULL);
ncm_data_set_init (NCM_DATA (gauss), TRUE);
Expand All @@ -140,3 +147,4 @@ ncm_data_gauss_cov_test_new ()
{
return g_object_new (NCM_TYPE_DATA_GAUSS_COV_TEST, NULL);
}

Loading

0 comments on commit 6625d26

Please sign in to comment.