p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused stuff

This commit is contained in:
nsubiron 2019-03-29 17:19:46 +01:00
parent ff1322abb6
commit d657297770
10 changed files with 4 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LibCarla/source/carla/opendrive/parser/LaneParser.cpp
View File

@ -14,7 +14,7 @@ namespace carla {
namespace opendrive {
namespace parser {
void LaneParser::ParseLanes(
static void ParseLanes(
road::RoadId road_id,
double s,
const pugi::xml_node &parent_node,

12
LibCarla/source/carla/opendrive/parser/LaneParser.h
View File

@ -6,11 +6,8 @@
#pragma once
#include "carla/road/RoadTypes.h"
namespace pugi {
class xml_document;
class xml_node;
} // namespace pugi
namespace carla {
@ -23,20 +20,11 @@ namespace opendrive {
namespace parser {
class LaneParser {
private:
static void ParseLanes(
road::RoadId road_id,
double s,
const pugi::xml_node &parent_node,
carla::road::MapBuilder &map_builder);
public:
static void Parse(
const pugi::xml_document &xml,
carla::road::MapBuilder &map_builder);
};
} // namespace parser

1
LibCarla/source/carla/opendrive/parser/ObjectParser.h
View File

@ -8,7 +8,6 @@
namespace pugi {
class xml_document;
class xml_node;
} // namespace pugi
namespace carla {

1
LibCarla/source/carla/opendrive/parser/SignalParser.h
View File

@ -8,7 +8,6 @@
namespace pugi {
class xml_document;
class xml_node;
} // namespace pugi
namespace carla {

1
LibCarla/source/carla/road/Object.h
View File

@ -10,7 +10,6 @@
#include "carla/road/RoadTypes.h"
#include <string>
#include <vector>
namespace carla {
namespace road {

8
LibCarla/source/carla/road/RoadElementSet.h
View File

@ -44,14 +44,6 @@ namespace road {
return _vec;
}
/// Return a list of elements that have key
/// value GetDistance() <= s
auto GetSubset(const key_type k) const {
return MakeListView(
_vec.begin(),
std::lower_bound(_vec.begin(), _vec.end(), k, LessComp()));
}
/// Return a reversed list of elements that have key
/// value GetDistance() <= s
auto GetReverseSubset(const key_type k) const {

108
LibCarla/source/carla/road/element/Types.h
View File

@ -1,108 +0,0 @@
// Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
// de Barcelona (UAB).
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
#pragma once
#include "carla/road/element/Geometry.h"
#include "carla/road/element/RoadInfo.h"
#include <cstdio>
#include <memory>
namespace carla {
namespace road {
namespace element {
using id_type = size_t;
class RoadSegmentDefinition {
public:
RoadSegmentDefinition(RoadSegmentDefinition &&rsd)
: _id(rsd._id),
_successor_id(std::move(rsd._successor_id)),
_predecessor_id(std::move(rsd._predecessor_id)),
_successor_is_start(std::move(rsd._successor_is_start)),
_predecessors_is_start(std::move(rsd._predecessors_is_start)),
_geom(std::move(rsd._geom)),
_info(std::move(rsd._info)),
_next_lane(std::move(rsd._next_lane)),
_prev_lane(std::move(rsd._prev_lane)) {}
RoadSegmentDefinition(id_type id) {
DEBUG_ASSERT(id >= 0);
_id = id;
}
const id_type &GetId() const {
return _id;
}
void AddSuccessorID(const id_type &id, bool is_start = true) {
_successor_id.emplace_back(id);
_successor_is_start.emplace_back(is_start);
}
void AddPredecessorID(const id_type &id, bool is_start = true) {
_predecessor_id.emplace_back(id);
_predecessors_is_start.emplace_back(is_start);
}
void AddNextLaneInfo(int current_lane_id, int next_lane_id, int next_road_id) {
_next_lane[current_lane_id].emplace_back(std::pair<int, int>(next_lane_id, next_road_id));
}
void AddPrevLaneInfo(int current_lane_id, int next_lane_id, int next_road_id) {
_prev_lane[current_lane_id].emplace_back(std::pair<int, int>(next_lane_id, next_road_id));
}
// usage MakeGeometry<GeometryArc>(len, st_pos_offs, head, st_pos, curv)
template <typename T, typename ... Args>
void MakeGeometry(Args && ... args) {
_geom.emplace_back(std::make_unique<T>(std::forward<Args>(args) ...));
}
// usage MakeInfo<SpeedLimit>(30.0)
template <typename T, typename ... Args>
T *MakeInfo(Args && ... args) {
_info.emplace_back(std::make_shared<T>(std::forward<Args>(args) ...));
return static_cast<T *>(_info.back().get());
}
const std::vector<id_type> &GetPredecessorID() const {
return _predecessor_id;
}
const std::vector<id_type> &GetSuccessorID() const {
return _successor_id;
}
const std::vector<std::unique_ptr<Geometry>> &GetGeometry() const {
return _geom;
}
const std::vector<std::shared_ptr<RoadInfo>> &GetInfo() const {
return _info;
}
private:
friend class RoadSegment;
id_type _id;
std::vector<id_type> _successor_id;
std::vector<id_type> _predecessor_id;
std::vector<bool> _successor_is_start;
std::vector<bool> _predecessors_is_start;
std::vector<std::unique_ptr<Geometry>> _geom;
std::vector<std::shared_ptr<RoadInfo>> _info;
// first int current lane
// second int to which lane
// third int to which road
std::map<int, std::vector<std::pair<int, int>>> _next_lane;
std::map<int, std::vector<std::pair<int, int>>> _prev_lane;
};
} // namespace element
} // namespace road
} // namespace carla

7
LibCarla/source/carla/road/signal/SignalDependency.cpp
View File

@ -1,7 +0,0 @@
// Copyright (c) 2019 Computer Vision Center (CVC) at the Universitat Autonoma
// de Barcelona (UAB).
//
// This work is licensed under the terms of the MIT license.
// For a copy; see <https://opensource.org/licenses/MIT>.
#include "SignalDependency.h"

18
LibCarla/source/test/client/test_opendrive.cpp
View File

@ -21,26 +21,8 @@
#include <carla/road/element/RoadInfoVisitor.h>
#include <fstream>
#include <ostream>
#include <random>
#include <sstream>
#include <string>
namespace carla {
namespace road {
namespace element {
// static std::ostream &operator<<(std::ostream &out, Waypoint waypoint) {
// out << "Waypoint{road_id=" << waypoint.road_id
// << ", lane_id=" << waypoint.lane_id
// << ", s=" << waypoint.s << '}';
// return out;
// }
} // namespace element
} // namespace road
} // namespace carla
using namespace carla::road;
using namespace carla::road::element;
using namespace carla::geom;

4
PythonAPI/source/libcarla/Map.cpp
View File

@ -8,7 +8,9 @@
#include <carla/PythonUtil.h>
#include <carla/client/Map.h>
#include <carla/client/Waypoint.h>
#include "carla/road/element/WaypointInformationTypes.h"
#include <carla/road/element/WaypointInformationTypes.h>
#include <ostream>
#include <fstream>
namespace carla {