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
fdc0f042
Commit
fdc0f042
authored
1 year ago
by
Joan Vallvé Navarro
Browse files
Options
Downloads
Patches
Plain Diff
remove loader in autoSetup, taken from problem
parent
f160f93d
No related branches found
No related tags found
1 merge request
!448
Draft: Resolve "Implementation of new nodes creation"
Pipeline
#19043
canceled
1 year ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/core/solver/solver_manager.h
+0
-2
0 additions, 2 deletions
include/core/solver/solver_manager.h
src/solver/solver_manager.cpp
+3
-8
3 additions, 8 deletions
src/solver/solver_manager.cpp
with
3 additions
and
10 deletions
include/core/solver/solver_manager.h
+
0
−
2
View file @
fdc0f042
...
...
@@ -133,13 +133,11 @@ class SolverManager
static
SolverManagerPtr
autoSetup
(
const
ProblemPtr
&
_problem
,
const
std
::
string
&
_input_yaml_file
,
std
::
vector
<
std
::
string
>
_primary_schema_folders
,
LoaderPtr
_loader
=
nullptr
,
bool
_skip_yaml_validation
=
false
);
static
SolverManagerPtr
autoSetup
(
const
ProblemPtr
&
_problem
,
YAML
::
Node
_param_node
,
std
::
vector
<
std
::
string
>
_primary_schema_folders
,
LoaderPtr
_loader
=
nullptr
,
bool
_skip_yaml_validation
=
false
);
virtual
~
SolverManager
();
...
...
This diff is collapsed.
Click to expand it.
src/solver/solver_manager.cpp
+
3
−
8
View file @
fdc0f042
...
...
@@ -59,7 +59,6 @@ SolverManager::~SolverManager() {}
SolverManagerPtr
SolverManager
::
autoSetup
(
const
ProblemPtr
&
_problem
,
const
std
::
string
&
_input_yaml_file
,
std
::
vector
<
std
::
string
>
_schema_folders
,
LoaderPtr
_loader
,
bool
_skip_yaml_validation
)
{
// Load YAML node: yaml schema server only used to flatten "follows", not validation
...
...
@@ -67,13 +66,12 @@ SolverManagerPtr SolverManager::autoSetup(const ProblemPtr& _problem,
yaml_schema_cpp
::
YamlServer
server
=
yaml_schema_cpp
::
YamlServer
({},
_input_yaml_file
);
// Call autoSetup via YAML node
return
SolverManager
::
autoSetup
(
_problem
,
server
.
getNode
(),
_schema_folders
,
_loader
,
_skip_yaml_validation
);
return
SolverManager
::
autoSetup
(
_problem
,
server
.
getNode
(),
_schema_folders
,
_skip_yaml_validation
);
}
SolverManagerPtr
SolverManager
::
autoSetup
(
const
ProblemPtr
&
_problem
,
YAML
::
Node
_param_node
,
std
::
vector
<
std
::
string
>
_schema_folders
,
LoaderPtr
_loader
,
bool
_skip_yaml_validation
)
{
// VALIDATION ===============================================================================
...
...
@@ -93,12 +91,9 @@ SolverManagerPtr SolverManager::autoSetup(const ProblemPtr& _problem,
throw
std
::
runtime_error
(
"Solver could not be created! Missing type or plugin"
);
}
// Load plugin if not loaded (
null loader -> use
problem loader)
// Load plugin if not loaded (
using
problem
's
loader)
auto
plugin
=
_param_node
[
"plugin"
].
as
<
std
::
string
>
();
if
(
_loader
)
_loader
->
loadPlugin
(
plugin
);
// if already loaded does nothing
else
_problem
->
getLoader
()
->
loadPlugin
(
plugin
);
// if already loaded does nothing
_problem
->
getLoader
()
->
loadPlugin
(
plugin
);
// if already loaded does nothing
// SCHEMA FOLDERS (optional _schema_folders specify folders where to search schemas before installed ones)
// Add the installed schema folders after optional input folders
...
...
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