Skip to content
Snippets Groups Projects
Commit 4675b9c7 authored by Julian Tusch's avatar Julian Tusch :no_entry_sign:
Browse files

updated std::list to std::vector, cleanup

parent 3b7460a6
No related branches found
No related tags found
3 merge requests!460Draft: fluxio/dev-skill-timeout,!449Fluxio preliminary release,!446Draft: Fluxio related changes
Showing
with 9 additions and 33 deletions
#include "FluxioEdge.h"
#include "FluxioNode.h"
#include "FluxioParameter.h"
......@@ -23,7 +22,7 @@ namespace armarx
FluxioEdge
FluxioEdge::FromIce(const manager::dto::FluxioEdge& i,
std::vector<FluxioNode>& nodes,
std::list<FluxioParameter>& parameters)
std::vector<FluxioParameter>& parameters)
{
FluxioEdge ret;
......
#pragma once
#include <list>
#include <vector>
#include <RobotAPI/interface/skills/SkillManagerInterface.h>
#include "FluxioNode.h"
#include "FluxioParameter.h"
......@@ -22,7 +20,7 @@ namespace armarx
static FluxioEdge FromIce(const manager::dto::FluxioEdge& i,
std::vector<FluxioNode>& nodes,
std::list<FluxioParameter>& parameters);
std::vector<FluxioParameter>& parameters);
};
} // namespace skills
} // namespace armarx
#include "FluxioNode.h"
#include <RobotAPI/interface/skills/SkillManagerInterface.h>
namespace armarx
......
#include "FluxioParameter.h"
#include <algorithm>
#include <vector>
#include "RobotAPI/libraries/skills/core/FluxioProfile.h"
#include <RobotAPI/interface/skills/SkillManagerInterface.h>
#include "FluxioValue.h"
namespace armarx
......@@ -45,7 +42,7 @@ namespace armarx
FluxioParameter*
FluxioParameter::FromFluxioIdentificatorIce(const manager::dto::FluxioIdentificator& i,
std::list<FluxioParameter>& parameters)
std::vector<FluxioParameter>& parameters)
{
const auto& parameterIt =
std::find_if(parameters.begin(),
......
#pragma once
#include <list>
#include <string>
#include <vector>
#include <RobotAPI/interface/skills/SkillManagerInterface.h>
#include "FluxioValue.h"
namespace armarx
......@@ -27,7 +24,7 @@ namespace armarx
static FluxioParameter*
FromFluxioIdentificatorIce(const manager::dto::FluxioIdentificator& i,
std::list<FluxioParameter>& parameters);
std::vector<FluxioParameter>& parameters);
static FluxioParameter FromIce(const manager::dto::FluxioParameter& i,
std::map<std::string, FluxioProfile>& profilesMap);
};
......
#include "FluxioParameterNode.h"
#include <RobotAPI/interface/skills/SkillManagerInterface.h>
#include "FluxioParameter.h"
namespace armarx
......@@ -35,7 +33,7 @@ namespace armarx
FluxioParameterNode
FluxioParameterNode::FromIce(const manager::dto::FluxioNode& i,
std::list<FluxioParameter>& parameters)
std::vector<FluxioParameter>& parameters)
{
FluxioParameterNode ret;
ret.nodeId = i.nodeId;
......
#pragma once
#include <list>
#include <vector>
#include <RobotAPI/interface/skills/SkillManagerInterface.h>
#include "FluxioNode.h"
#include "FluxioParameter.h"
......@@ -18,7 +16,7 @@ namespace armarx
manager::dto::FluxioNode toManagerIce() const override;
static FluxioParameterNode FromIce(const manager::dto::FluxioNode& i,
std::list<FluxioParameter>& parameters);
std::vector<FluxioParameter>& parameters);
};
} // namespace skills
} // namespace armarx
#include "FluxioProfile.h"
#include <ArmarXCore/core/logging/Logging.h>
#include <RobotAPI/interface/skills/SkillManagerInterface.h>
namespace armarx
......
#include "FluxioSkill.h"
#include <vector>
#include <ArmarXCore/core/logging/Logging.h>
#include <RobotAPI/interface/skills/SkillManagerInterface.h>
#include "FluxioEdge.h"
#include "FluxioNode.h"
#include "FluxioParameterNode.h"
......
#pragma once
#include <list>
#include <string>
#include <vector>
#include <RobotAPI/interface/skills/SkillManagerInterface.h>
#include "FluxioEdge.h"
#include "FluxioNode.h"
#include "FluxioParameter.h"
......@@ -25,7 +22,7 @@ namespace armarx
false; // TODO: change from explicit to implicit storing of executable state
bool native = true;
FluxioProvider* skillProviderPtr;
std::list<FluxioParameter> parameters = {};
std::vector<FluxioParameter> parameters = {};
std::vector<FluxioNode>* nodesPtr = nullptr;
std::vector<FluxioEdge>* edgesPtr = nullptr;
......
#include "FluxioValue.h"
#include "FluxioProfile.h"
namespace armarx
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment