Skip to content

Commit

Permalink
fix another merge conflict from enum refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
karlnapf committed Jul 4, 2016
1 parent 2c19339 commit 9df6de7
Showing 1 changed file with 2 additions and 2 deletions.
Expand Up @@ -88,7 +88,7 @@ float64_t MultiKernelMMD::compute_mmd(terms_t& t) const
t.term[1]=2*(t.term[1]-t.diag[1]);
SG_SDEBUG("term_0 sum (without diagonal) = %f!\n", t.term[0]);
SG_SDEBUG("term_1 sum (without diagonal) = %f!\n", t.term[1]);
if (s_type!=ST_BIASED_FULL)
if (s_type!=EStatisticType::ST_BIASED_FULL)
{
t.term[0]/=n_x*(n_x-1);
t.term[1]/=n_y*(n_y-1);
Expand All @@ -106,7 +106,7 @@ float64_t MultiKernelMMD::compute_mmd(terms_t& t) const
SG_SDEBUG("term_1 (normalized) = %f!\n", t.term[1]);

SG_SDEBUG("term_2 sum (with diagonal) = %f!\n", t.term[2]);
if (s_type==ST_UNBIASED_INCOMPLETE)
if (s_type==EStatisticType::ST_UNBIASED_INCOMPLETE)
{
t.term[2]-=t.diag[2];
SG_SDEBUG("term_2 sum (without diagonal) = %f!\n", t.term[2]);
Expand Down

0 comments on commit 9df6de7

Please sign in to comment.