diff options
Diffstat (limited to 'intern/iksolver')
-rw-r--r-- | intern/iksolver/intern/IK_Solver.cpp | 7 | ||||
-rw-r--r-- | intern/iksolver/intern/TNT/cmat.h | 13 | ||||
-rw-r--r-- | intern/iksolver/intern/TNT/fmat.h | 13 | ||||
-rw-r--r-- | intern/iksolver/intern/TNT/fspvec.h | 1 | ||||
-rw-r--r-- | intern/iksolver/intern/TNT/vec.h | 12 | ||||
-rw-r--r-- | intern/iksolver/intern/TNT/vecadaptor.h | 10 |
6 files changed, 5 insertions, 51 deletions
diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index 23960a9550b..919eeb739ce 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -39,11 +39,14 @@ #include <list> using namespace std; -typedef struct { +class IK_QSolver { +public: + IK_QSolver() {}; + IK_QJacobianSolver solver; IK_QSegment *root; std::list<IK_QTask*> tasks; -} IK_QSolver; +}; IK_QSegment *CreateSegment(int flag, bool translate) { diff --git a/intern/iksolver/intern/TNT/cmat.h b/intern/iksolver/intern/TNT/cmat.h index 46eb1100475..c6d701b30fc 100644 --- a/intern/iksolver/intern/TNT/cmat.h +++ b/intern/iksolver/intern/TNT/cmat.h @@ -39,7 +39,6 @@ #include <stdlib.h> #include <assert.h> #include <iostream> -#include <strstream> #ifdef TNT_USE_REGIONS #include "region2d.h" #endif @@ -204,19 +203,7 @@ class Matrix copy(v); } - Matrix(Subscript M, Subscript N, const char *s) - { - initialize(M,N); - std::istrstream ins(s); - - Subscript i, j; - - for (i=0; i<M; i++) - for (j=0; j<N; j++) - ins >> row_[i][j]; - } - // destructor // ~Matrix() diff --git a/intern/iksolver/intern/TNT/fmat.h b/intern/iksolver/intern/TNT/fmat.h index eb5531815eb..daba50c993f 100644 --- a/intern/iksolver/intern/TNT/fmat.h +++ b/intern/iksolver/intern/TNT/fmat.h @@ -38,7 +38,6 @@ #include <cstdlib> #include <cassert> #include <iostream> -#include <strstream> #ifdef TNT_USE_REGIONS #include "region2d.h" #endif @@ -198,18 +197,6 @@ class Fortran_Matrix } - Fortran_Matrix(Subscript M, Subscript N, char *s) - { - initialize(M,N); - std::istrstream ins(s); - - Subscript i, j; - - for (i=1; i<=M; i++) - for (j=1; j<=N; j++) - ins >> (*this)(i,j); - } - // destructor ~Fortran_Matrix() { diff --git a/intern/iksolver/intern/TNT/fspvec.h b/intern/iksolver/intern/TNT/fspvec.h index 7ebba6f882d..1fafccdfe93 100644 --- a/intern/iksolver/intern/TNT/fspvec.h +++ b/intern/iksolver/intern/TNT/fspvec.h @@ -39,7 +39,6 @@ #include <cstdlib> #include <cassert> #include <iostream> -#include <strstream> using namespace std; diff --git a/intern/iksolver/intern/TNT/vec.h b/intern/iksolver/intern/TNT/vec.h index d4f7c2f4021..1729d83ca10 100644 --- a/intern/iksolver/intern/TNT/vec.h +++ b/intern/iksolver/intern/TNT/vec.h @@ -37,7 +37,6 @@ #include <stdlib.h> #include <assert.h> #include <iostream> -#include <strstream> namespace TNT { @@ -186,17 +185,6 @@ class Vector copy(v); } - Vector(Subscript N, char *s) : v_(0), vm1_(0), n_(0) - { - initialize(N); - std::istrstream ins(s); - - Subscript i; - - for (i=0; i<N; i++) - ins >> v_[i]; - } - // methods // diff --git a/intern/iksolver/intern/TNT/vecadaptor.h b/intern/iksolver/intern/TNT/vecadaptor.h index fc5930c1b4f..ef2e66f19e0 100644 --- a/intern/iksolver/intern/TNT/vecadaptor.h +++ b/intern/iksolver/intern/TNT/vecadaptor.h @@ -33,7 +33,6 @@ #include <cstdlib> #include <iostream> -#include <strstream> #include <cassert> #include "subscript.h" @@ -117,15 +116,6 @@ class Vector_Adaptor } - Vector_Adaptor(Subscript N, /*const*/ char *s) : v_(N) - { - istrstream ins(s); - for (Subscript i=0; i<N; i++) - ins >> v_[i] ; - - vm1_ = ( v_.size() > 0 ? &(v_[0]) -1 : NULL); - }; - Vector_Adaptor(Subscript N, const T& value = T()) : v_(N) { for (Subscript i=0; i<N; i++) |