Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jrl-walkgen
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Guilhem Saurel
jrl-walkgen
Commits
67ad0e16
Commit
67ad0e16
authored
14 years ago
by
Olivier Stasse
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Fix a problem related to the number of variables dumped."
This reverts commit
03c3697c
.
parent
7dc568ac
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/TestObject.cpp
+33
-41
33 additions, 41 deletions
tests/TestObject.cpp
tests/TestObject.h
+0
-3
0 additions, 3 deletions
tests/TestObject.h
with
33 additions
and
44 deletions
tests/TestObject.cpp
+
33
−
41
View file @
67ad0e16
...
...
@@ -117,7 +117,6 @@ namespace PatternGeneratorJRL
MAL_VECTOR_RESIZE
(
m_PreviousVelocity
,
m_HDR
->
numberDof
());
MAL_VECTOR_RESIZE
(
m_PreviousAcceleration
,
m_HDR
->
numberDof
());
m_NbOfStoredVariables
=
0
;
}
TestObject
::~
TestObject
()
...
...
@@ -203,39 +202,38 @@ namespace PatternGeneratorJRL
aof
.
open
(
aFileName
.
c_str
(),
ofstream
::
app
);
aof
.
precision
(
8
);
aof
.
setf
(
ios
::
scientific
,
ios
::
floatfield
);
aof
<<
filterprecision
(
m_OneStep
.
NbOfIt
*
0.005
)
<<
" "
// 1
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
x
[
0
]
)
<<
" "
// 2
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
y
[
0
]
)
<<
" "
// 3
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
z
[
0
]
)
<<
" "
// 4
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
yaw
)
<<
" "
// 5
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
x
[
1
]
)
<<
" "
// 6
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
y
[
1
]
)
<<
" "
// 7
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
z
[
1
]
)
<<
" "
// 8
<<
filterprecision
(
m_OneStep
.
ZMPTarget
(
0
)
)
<<
" "
// 9
<<
filterprecision
(
m_OneStep
.
ZMPTarget
(
1
)
)
<<
" "
// 10
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
x
)
<<
" "
// 11
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
y
)
<<
" "
// 12
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
z
)
<<
" "
// 13
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
theta
)
<<
" "
// 14
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
omega
)
<<
" "
// 15
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
omega2
)
<<
" "
// 16
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
x
)
<<
" "
// 17
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
y
)
<<
" "
// 18
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
z
)
<<
" "
// 19
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
theta
)
<<
" "
// 20
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
omega
)
<<
" "
// 21
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
omega2
)
<<
" "
// 22
aof
<<
filterprecision
(
m_OneStep
.
NbOfIt
*
0.005
)
<<
" "
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
x
[
0
]
)
<<
" "
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
y
[
0
]
)
<<
" "
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
z
[
0
]
)
<<
" "
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
yaw
)
<<
" "
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
x
[
1
]
)
<<
" "
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
y
[
1
]
)
<<
" "
<<
filterprecision
(
m_OneStep
.
finalCOMPosition
.
z
[
1
]
)
<<
" "
<<
filterprecision
(
m_OneStep
.
ZMPTarget
(
0
)
)
<<
" "
<<
filterprecision
(
m_OneStep
.
ZMPTarget
(
1
)
)
<<
" "
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
x
)
<<
" "
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
y
)
<<
" "
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
z
)
<<
" "
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
theta
)
<<
" "
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
omega
)
<<
" "
<<
filterprecision
(
m_OneStep
.
LeftFootPosition
.
omega2
)
<<
" "
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
x
)
<<
" "
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
y
)
<<
" "
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
z
)
<<
" "
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
theta
)
<<
" "
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
omega
)
<<
" "
<<
filterprecision
(
m_OneStep
.
RightFootPosition
.
omega2
)
<<
" "
<<
filterprecision
(
m_OneStep
.
ZMPTarget
(
0
)
*
cos
(
m_CurrentConfiguration
(
5
))
-
m_OneStep
.
ZMPTarget
(
1
)
*
sin
(
m_CurrentConfiguration
(
5
))
+
m_CurrentConfiguration
(
0
)
)
<<
" "
// 23
+
m_CurrentConfiguration
(
0
)
)
<<
" "
<<
filterprecision
(
m_OneStep
.
ZMPTarget
(
0
)
*
sin
(
m_CurrentConfiguration
(
5
))
+
m_OneStep
.
ZMPTarget
(
1
)
*
cos
(
m_CurrentConfiguration
(
5
))
+
m_CurrentConfiguration
(
1
)
)
<<
" "
// 24
<<
filterprecision
(
m_CurrentConfiguration
(
0
)
)
<<
" "
// 25
<<
filterprecision
(
m_CurrentConfiguration
(
1
)
)
<<
" "
// 26
+
m_CurrentConfiguration
(
1
)
)
<<
" "
<<
filterprecision
(
m_CurrentConfiguration
(
0
)
)
<<
" "
<<
filterprecision
(
m_CurrentConfiguration
(
1
)
)
<<
" "
<<
endl
;
aof
.
close
();
m_NbOfStoredVariables
=
26
;
}
}
...
...
@@ -258,33 +256,27 @@ namespace PatternGeneratorJRL
arif
.
open
(
aFileName
.
c_str
(),
ifstream
::
in
);
// Time
vector
<
double
>
LocalInput
;
LocalInput
.
resize
(
m_NbOfStoredVariables
);
vector
<
double
>
ReferenceInput
;
ReferenceInput
.
resize
(
m_NbOfStoredVariables
);
unsigned
int
LineNumber
=
0
;
double
LocalInput
[
70
],
ReferenceInput
[
70
];
while
((
!
alif
.
eof
())
||
(
!
arif
.
eof
()))
{
for
(
unsigned
int
i
=
0
;
i
<
m_NbOfStoredVariables
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
70
;
i
++
)
alif
>>
LocalInput
[
i
];
for
(
unsigned
int
i
=
0
;
i
<
m_NbOfStoredVariables
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
70
;
i
++
)
arif
>>
ReferenceInput
[
i
];
for
(
unsigned
int
i
=
0
;
i
<
m_NbOfStoredVariables
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
70
;
i
++
)
{
if
(
fabs
(
LocalInput
[
i
]
-
ReferenceInput
[
i
])
>=
1e-5
)
{
cout
<<
" LineNumber: "
<<
LineNumber
<<
" ... failed with: "
<<
"LocalInput["
<<
i
<<
"]: "
<<
LocalInput
[
i
]
<<
" ReferenceInput["
<<
i
<<
"]: "
<<
ReferenceInput
[
i
]
<<
endl
;
cout
<<
"... failed with: "
<<
"LocalInput["
<<
i
<<
"]: "
<<
LocalInput
[
i
]
<<
" ReferenceInput["
<<
i
<<
"]: "
<<
ReferenceInput
[
i
]
<<
endl
;
return
false
;
}
}
LineNumber
++
;
}
alif
.
close
();
...
...
This diff is collapsed.
Click to expand it.
tests/TestObject.h
+
0
−
3
View file @
67ad0e16
...
...
@@ -162,9 +162,6 @@ namespace PatternGeneratorJRL
/*! \brief Patten Generator Interface. */
int
m_PGIInterface
;
/*! \brief Nb of variables store into the debug files.*/
unsigned
int
m_NbOfStoredVariables
;
};
...
...
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