added smoothsort.h

schlafly · Oct 28, 2011 · 5f4771a · 5f4771a
1 parent 54d627e
commit 5f4771a
Show file tree

Hide file tree

Showing 14 changed files with 385 additions and 1 deletion.
diff --git a/.kdev4/galstar.kdev4 b/.kdev4/galstar.kdev4
@@ -34,3 +34,6 @@ isExecutable=true
 [MakeBuilder]
 Default Make Environment Profile=0
 Number Of Jobs=1
+
+[Project]
+VersionControlSupport=kdevgit
diff --git a/configure b/configure
diff --git a/scripts/astroutils.py b/scripts/astroutils.py
diff --git a/scripts/comp2galfast.py b/scripts/comp2galfast.py
diff --git a/scripts/comp_stats.py b/scripts/comp_stats.py
diff --git a/scripts/galfast_utils.py b/scripts/galfast_utils.py
diff --git a/scripts/plot_hist.py b/scripts/plot_hist.py
diff --git a/scripts/plot_priors.py b/scripts/plot_priors.py
diff --git a/scripts/plot_stats.py b/scripts/plot_stats.py
diff --git a/scripts/plotpdf.py b/scripts/plotpdf.py
diff --git a/scripts/read_galfast.py b/scripts/read_galfast.py
diff --git a/scripts/read_sdss.py b/scripts/read_sdss.py
diff --git a/src/sampler.cpp b/src/sampler.cpp
@@ -252,6 +252,10 @@ inline double logL_SED(const double (&M)[NBANDS], const double (&sigma)[NBANDS],
 //////////////////////////////////////////////////////////////////////////////////////
 
 double calc_logP_full(const double *const x, unsigned int N, MCMCParams &p) {
+	return 1;
+}
+
+double permutation_likelihood(const double *const x, unsigned int N, MCMCParams &p) {
 
 }
 
@@ -356,7 +360,7 @@ bool sample_mcmc(TModel &model, double l, double b, TStellarData::TMagnitudes &m
 	return convergence;
 }
 
-bool sample_brute_force(TModel &model, double l, double b, TStellarData::TMagnitudes &mag, TStellarData &data, TMultiBinner<4> &multibinner, TStats &stats, unsigned int N_samples = 150, unsigned int N_threads=4) {
+bool sample_brute_force(TModel &model, double l, double b, TStellarData::TMagnitudes &mag, TStellarData &data, TMultiBinner<4> &multibinner, TStats &stats, unsigned int N_samples=150, unsigned int N_threads=4) {
 	double Delta[4];
 	for(unsigned int i=0; i<4; i++) {
 		Delta[i] = (std_bin_max(i) - std_bin_min(i)) / (double)N_samples;