Subversion Repositories gelsvn

Rev

Rev 207 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 207 Rev 296
Line 7... Line 7...
7 
using namespace CGLA;
 7 
using namespace CGLA;
8 
using namespace std;
 8 
using namespace std;
9 
 
 9 
 
10 
namespace Geometry
 10 
namespace Geometry
11 
{
 11 
{
12 
	Vec3f QEM::opt_pos(double sv_thresh) const
 12 
	Vec3d QEM::opt_pos(double sv_thresh) const
13 
	{
 13 
	{
14 
		CMatrix A_num(A);
 14 
			CMatrix A_num(A);
15 
		CVector b_num(b);
 15 
			CVector b_num(b);
16 
 
 - 
 
17 
		CMatrix U;
 - 
 
18 
		CMatrix V;
 - 
 
19 
		CVector s;
 16 
			CVector x(3);
20 
		SVD(A_num,U,s,V);
 17 
			x = LinearLSSolve(A,b);
21 
 
 - 
 
22 
// 		double sm = sv_thresh*s[0];
 18 
			/* Actually LSSolve uses SVD, but we cannot set a cut off value for
23 
// 		for(int i=1;i<3;++i)
 - 
 
24 
// 			{
 - 
 
25 
// 				if(fabs(s[i])< sm)
 - 
 
26 
// 					s[i] = 0;
 - 
 
27 
// 			}
 - 
 
28
- 
 
29 
		CMatrix A_inv = (V * s) * U;
 19 
				 the singular values. Might be worth fixing */
30 
 
 - 
 
31 
		CVector x(3);
 - 
 
32 
		x = A_inv * b_num;
 - 
 
33 
		Vec3f p(-x[0], -x[1], -x[2]);
 20 
			Vec3d p(-x[0], -x[1], -x[2]);
34 
		if(s[0] == 0)
 - 
 
35 
			{
 - 
 
36 
				cout << A << b << s << U << V << endl;
 - 
 
37 
			}
 - 
 
38
- 
 
39 
 
 - 
 
40 
		return p;
 21 
			return p;
41 
	}
 22 
	}
- 
 
 23 
 
42 
}
 24 
}