Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
eiquadprog
Commits
cb676036
Commit
cb676036
authored
Sep 17, 2019
by
Gabriele Buondonno
Browse files
[eiquadprog-rt] Remove tabs
parent
0ed434cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/eiquadprog/eiquadprog-rt.hpp
View file @
cb676036
...
...
@@ -217,7 +217,7 @@ namespace eiquadprog
#ifdef OPTIMIZE_ADD_CONSTRAINT
typename
RtVectorX
<
nVars
>::
d
T1
;
// tmp vector
#endif
/// size of the active set A (containing the indices of the active constraints)
int
q
;
...
...
include/eiquadprog/eiquadprog-rt.hxx
View file @
cb676036
...
...
@@ -51,7 +51,7 @@ namespace eiquadprog
double
cc
,
ss
,
h
,
t1
,
t2
,
xny
;
#ifdef OPTIMIZE_ADD_CONSTRAINT
Eigen
::
Vector2d
cc_ss
;
Eigen
::
Vector2d
cc_ss
;
#endif
/* we have to find the Givens rotation which will reduce the element
...
...
@@ -85,14 +85,14 @@ namespace eiquadprog
else
d
(
j
-
1
)
=
h
;
xny
=
ss
/
(
1.0
+
cc
);
// #define OPTIMIZE_ADD_CONSTRAINT
#ifdef OPTIMIZE_ADD_CONSTRAINT // the optimized code is actually slower than the original
T1
=
J
.
col
(
j
-
1
);
cc_ss
(
0
)
=
cc
;
cc_ss
(
1
)
=
ss
;
J
.
col
(
j
-
1
).
noalias
()
=
J
.
template
middleCols
<
2
>(
j
-
1
)
*
cc_ss
;
J
.
col
(
j
)
=
xny
*
(
T1
+
J
.
col
(
j
-
1
))
-
J
.
col
(
j
);
T1
=
J
.
col
(
j
-
1
);
cc_ss
(
0
)
=
cc
;
cc_ss
(
1
)
=
ss
;
J
.
col
(
j
-
1
).
noalias
()
=
J
.
template
middleCols
<
2
>(
j
-
1
)
*
cc_ss
;
J
.
col
(
j
)
=
xny
*
(
T1
+
J
.
col
(
j
-
1
))
-
J
.
col
(
j
);
#else
// J.col(j-1) = J[:,j-1:j] * [cc; ss]
for
(
k
=
0
;
k
<
nVars
;
k
++
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment