------------------------------------------------------------
revno: 2496
committer: Anton Gladky <gladky.an...@gmail.com>
branch nick: trunk
timestamp: Sun 2010-10-17 19:57:23 +0200
message:
1. Again some changes for Eigen3 compilation
modified:
lib/base/Math.hpp
py/mathWrap/miniEigen.cpp
--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to
https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'lib/base/Math.hpp'
--- lib/base/Math.hpp 2010-10-17 15:41:22 +0000
+++ lib/base/Math.hpp 2010-10-17 17:57:23 +0000
@@ -137,8 +137,8 @@
mV = svd.matrixV();
mS = svd.singularValues().asDiagonal();
- *unitary=mU() * mV().adjoint();
- *positive=mV() * mS().asDiagonal() * mV().adjoint;
+ *unitary=mU * mV.adjoint();
+ *positive=mV * mS * mV.adjoint();
#endif
}
=== modified file 'py/mathWrap/miniEigen.cpp'
--- py/mathWrap/miniEigen.cpp 2010-10-17 12:55:29 +0000
+++ py/mathWrap/miniEigen.cpp 2010-10-17 17:57:23 +0000
@@ -107,7 +107,7 @@
static bool Quaternionr__eq__(const Quaternionr& q1, const Quaternionr& q2){ return q1==q2; }
static bool Quaternionr__neq__(const Quaternionr& q1, const Quaternionr& q2){ return q1!=q2; }
#include<Eigen/SVD>
-static bp::tuple Matrix3r_polarDecomposition(const Matrix3r& self){ Matrix3r unitary,positive; Eigen::SVD<Matrix3r>(self).computeUnitaryPositive(&unitary,&positive); return bp::make_tuple(unitary,positive); }
+static bp::tuple Matrix3r_polarDecomposition(const Matrix3r& self){ Matrix3r unitary,positive; Matrix_computeUnitaryPositive(self,&unitary,&positive); return bp::make_tuple(unitary,positive); }
#define EIG_WRAP_METH1(klass,meth) static klass klass##_##meth(const klass& self){ return self.meth(); }
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
