Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
uam_task_ctrl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pep Martí Saumell
uam_task_ctrl
Commits
0bda60f7
Commit
0bda60f7
authored
8 years ago
by
asantamaria
Browse files
Options
Downloads
Patches
Plain Diff
minor changes to leave CalcPinv working in master
parent
8e8992f1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/common_fc.h
+0
-2
0 additions, 2 deletions
src/common_fc.h
src/tasks/ir.cpp
+1
-2
1 addition, 2 deletions
src/tasks/ir.cpp
with
1 addition
and
4 deletions
src/common_fc.h
+
0
−
2
View file @
0bda60f7
...
@@ -59,8 +59,6 @@ class CCommon_Fc
...
@@ -59,8 +59,6 @@ class CCommon_Fc
*
*
* Compute the matrix pseudo-inverse using SVD
* Compute the matrix pseudo-inverse using SVD
*/
*/
//static Eigen::MatrixXd CalcPinv(const Eigen::MatrixXd &a);
template
<
typename
_Matrix_Type_
>
static
_Matrix_Type_
CalcPinv
(
const
_Matrix_Type_
&
a
,
double
epsilon
=
std
::
numeric_limits
<
double
>::
epsilon
())
template
<
typename
_Matrix_Type_
>
static
_Matrix_Type_
CalcPinv
(
const
_Matrix_Type_
&
a
,
double
epsilon
=
std
::
numeric_limits
<
double
>::
epsilon
())
{
{
Eigen
::
JacobiSVD
<
_Matrix_Type_
>
svdd
(
a
,
Eigen
::
ComputeThinU
|
Eigen
::
ComputeThinV
);
Eigen
::
JacobiSVD
<
_Matrix_Type_
>
svdd
(
a
,
Eigen
::
ComputeThinU
|
Eigen
::
ComputeThinV
);
...
...
This diff is collapsed.
Click to expand it.
src/tasks/ir.cpp
+
1
−
2
View file @
0bda60f7
...
@@ -44,8 +44,7 @@ void CTaskIR::TaskErrorJac(const int& arm_dof, const double& inf_rad, const Eige
...
@@ -44,8 +44,7 @@ void CTaskIR::TaskErrorJac(const int& arm_dof, const double& inf_rad, const Eige
}
}
// }
// }
//Eigen::MatrixXd Hinv = UAM::CCommon_Fc::CalcPinv(H);
Eigen
::
MatrixXd
Hinv
=
UAM
::
CCommon_Fc
::
CalcPinv
(
H
);
Eigen
::
MatrixXd
Hinv
=
H
.
transpose
();
// weighting matrix
// weighting matrix
Eigen
::
MatrixXd
temp
=
JIR
*
Hinv
*
JIR
.
transpose
();
Eigen
::
MatrixXd
temp
=
JIR
*
Hinv
*
JIR
.
transpose
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment