Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
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
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
09db8461
Commit
09db8461
authored
5 years ago
by
Joaquim Casals Buñuel
Browse files
Options
Downloads
Patches
Plain Diff
Fixed bug with converter.h vectors (negative entries were not allowed) & fixed wolf cmake file
parent
56224126
No related branches found
No related tags found
No related merge requests found
Pipeline
#4457
passed
5 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake_modules/wolfConfig.cmake
+7
-3
7 additions, 3 deletions
cmake_modules/wolfConfig.cmake
include/core/utils/converter.h
+2
-2
2 additions, 2 deletions
include/core/utils/converter.h
with
9 additions
and
5 deletions
cmake_modules/wolfConfig.cmake
+
7
−
3
View file @
09db8461
...
...
@@ -84,9 +84,13 @@ FIND_PACKAGE(YamlCpp REQUIRED)
list
(
APPEND wolf_INCLUDE_DIRS
${
YAMLCPP_INCLUDE_DIRS
}
)
list
(
APPEND wolf_LIBRARIES
${
YAMLCPP_LIBRARY
}
)
if
(
NOT Eigen_FOUND
)
#Eigen
# FIND_PACKAGE(Eigen3 REQUIRED)
# list(APPEND wolf_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIRS})
if
(
NOT Eigen3_FOUND
)
FIND_PACKAGE
(
Eigen3 REQUIRED
)
list
(
APPEND wolf_INCLUDE_DIRS
${
EIGEN3_INCLUDE_DIRS
}
)
endif
()
list
(
APPEND wolf_INCLUDE_DIRS
${
EIGEN3_INCLUDE_DIRS
}
)
SET
(
CMAKE_MODULE_PATH
${
BACKUP_MODULE_PATH
}
)
\ No newline at end of file
SET
(
CMAKE_MODULE_PATH
${
BACKUP_MODULE_PATH
}
)
This diff is collapsed.
Click to expand it.
include/core/utils/converter.h
+
2
−
2
View file @
09db8461
...
...
@@ -59,8 +59,8 @@ namespace utils{
* @return <b>{std::array<std::string, 2>}</b> pair ([N,M],[a1,a2,a3,...]) or just ([a1,a2,a3...])
*/
static
inline
std
::
array
<
std
::
string
,
2
>
splitMatrixStringRepresentation
(
std
::
string
matrix
){
std
::
regex
rgx
(
"
\\
[
\\
[((?:[0-9]+,?)+)
\\
],((?:
(?:
[0-9]*
\\
.
)?
[0-9]+,?)+)
\\
]"
);
std
::
regex
rgxStatic
(
"
\\
[((?:(?:[0-9]*
\\
.
)?
[0-9]+,?)+)
\\
]"
);
std
::
regex
rgx
(
"
\\
[
\\
[((?:[0-9]+,?)+)
\\
],((?:
-?
[0-9]*
(?:
\\
.[0-9]+
)?
,?)+)
\\
]"
);
std
::
regex
rgxStatic
(
"
\\
[((?:(?:
-?
[0-9]*
)(?:
\\
.[0-9]+
)?
,?)+)
\\
]"
);
std
::
smatch
matches
;
std
::
smatch
matchesStatic
;
std
::
array
<
std
::
string
,
2
>
values
=
{{
"[]"
,
"[]"
}};
...
...
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