Giu/analistica
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ex-6: fix EMD typo

Browse Source
This commit is contained in:
Michele Guerini Rocco 2020-05-13 01:20:51 +02:00
parent bdc12117a7
commit e17f493cd5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ex-6/dist-plot.py
View File

@ -10,7 +10,7 @@ a, b, f = loadtxt(sys.stdin, unpack=True)
subplot(131) subplot(131)
title('FFT') title('FFT')
xlabel('EDM') xlabel('EMD')
ylabel('counts') ylabel('counts')
hist(a[:n], insert(b[:n], 0, a[0]), weights=f[:n], hist(a[:n], insert(b[:n], 0, a[0]), weights=f[:n],
histtype='stepfilled', color='#e3c5ca', edgecolor='#92182b') histtype='stepfilled', color='#e3c5ca', edgecolor='#92182b')
@ -18,7 +18,7 @@ ticklabel_format(style='sci', axis='x', scilimits=(0, 0), useMathText=True)
subplot(132) subplot(132)
title('RL') title('RL')
xlabel('EDM') xlabel('EMD')
ylabel('counts') ylabel('counts')
hist(a[n:2*n], insert(b[n:2*n], 0, a[n]), weights=f[n:2*n], hist(a[n:2*n], insert(b[n:2*n], 0, a[n]), weights=f[n:2*n],
histtype='stepfilled', color='#e3c5ca', edgecolor='#92182b') histtype='stepfilled', color='#e3c5ca', edgecolor='#92182b')
@ -26,7 +26,7 @@ ticklabel_format(style='sci', axis='x', scilimits=(0, 0), useMathText=True)
subplot(133) subplot(133)
title('convolution') title('convolution')
xlabel('EDM') xlabel('EMD')
ylabel('counts') ylabel('counts')
hist(a[2*n:], insert(b[2*n:], 0, a[2*n]), weights=f[2*n:], hist(a[2*n:], insert(b[2*n:], 0, a[2*n]), weights=f[2*n:],
histtype='stepfilled', color='#e3c5ca', edgecolor='#92182b') histtype='stepfilled', color='#e3c5ca', edgecolor='#92182b')

8
ex-6/test.c
View File

@ -95,10 +95,16 @@ double *experiment(
* histogram and store add each one to the respective * histogram and store add each one to the respective
* distance histogram. * distance histogram.
*/ */
<<<<<<< HEAD
static double dist[3]; static double dist[3];
dist[0] = emd_between(hist, fft_clean); dist[0] = emd_between(hist, fft_clean);
dist[1] = emd_between(hist, rl_clean); dist[1] = emd_between(hist, rl_clean);
dist[2] = emd_between(hist, conv); dist[2] = emd_between(hist, conv);
=======
pair_t dist;
dist.a = emd_between(hist, fft_clean);
dist.b = emd_between(hist, rl_clean);
>>>>>>> ex-6: fix EMD typo
// free memory // free memory
gsl_histogram_free(hist); gsl_histogram_free(hist);
@ -170,7 +176,7 @@ int main(int argc, char **argv) {
double conv_skew = gsl_stats_skew_m_sd(conv_dist, 1, opts.num_exps, conv_mean, conv_stdev); double conv_skew = gsl_stats_skew_m_sd(conv_dist, 1, opts.num_exps, conv_mean, conv_stdev);
double conv_min, conv_max; gsl_stats_minmax(&conv_min, &conv_max, conv_dist, 1, opts.num_exps); double conv_min, conv_max; gsl_stats_minmax(&conv_min, &conv_max, conv_dist, 1, opts.num_exps);
/* Create EDM distance histograms. /* Create EMD distance histograms.
* Since the distance depends wildly on the noise we can't * Since the distance depends wildly on the noise we can't
* set a fixed range and therefore use the above values. * set a fixed range and therefore use the above values.
*/ */