Merge branch 'vaskeEmFix' of git://disco.cse.ucsc.edu/libDAI into mergeVaskeEmFix

diff --cc include/dai/factor.h
index 695813b,1427002..6b04966
--- 1/include/dai/factor.h
--- 2/include/dai/factor.h
+++ b/include/dai/factor.h
@@@ -111,8 -109,16 +111,14 @@@ template <typename T> class TFactor 
  
          /// Constructs TFactor depending on variables in ns, with values set to the TProb p
          TFactor( const VarSet& ns, const TProb<T>& p ) : _vs(ns), _p(p) {
 -#ifdef DAI_DEBUG
 -            assert( _vs.nrStates() == _p.size() );
 -#endif
 +            DAI_DEBASSERT( _vs.nrStates() == _p.size() );
          }
+         TFactor( const std::vector< Var >& vars, const std::vector< T >& p ) : _vs(vars.begin(), vars.end(), vars.size()), _p(p.size()) {
+             Permute permindex(vars);
+             for (size_t li = 0; li < p.size(); ++li) {
+                 _p[permindex.convert_linear_index(li)] = p[li];
+             }
+         }
          
          /// Constructs TFactor depending on the variable n, with uniform distribution
          TFactor( const Var& n ) : _vs(n), _p(n.states()) {}

diff --cc include/dai/properties.h
Simple merge

diff --cc src/emalg.cpp
Simple merge