Skip to content

Commit

Permalink
Removed unnecessary functions in GNENetHelper::AttributeCarriers. Refs …
Browse files Browse the repository at this point in the history 
…#13894
  • Loading branch information
@palvarezlopez
palvarezlopez committed Dec 19, 2023
1 parent b13cdd0 commit db034de
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 152 deletions.
84 changes: 0 additions & 84 deletions src/netedit/GNENetHelper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1874,17 +1874,6 @@ GNENetHelper::AttributeCarriers::retrieveDataInterval(const GNEAttributeCarrier
}


bool
GNENetHelper::AttributeCarriers::dataIntervalExist(GNEDataInterval* dataInterval) const {
// first check that interval pointer is valid
if (dataInterval) {
return (myDataIntervals.count(dataInterval) > 0);
} else {
throw ProcessError("Invalid data interval pointer");
}
}


const std::map<const GNEAttributeCarrier*, GNEDataInterval*>&
GNENetHelper::AttributeCarriers::getDataIntervals() const {
return myDataIntervals;
Expand Down Expand Up @@ -2233,17 +2222,6 @@ GNENetHelper::AttributeCarriers::deleteSingleJunction(GNEJunction* junction) {
}


bool
GNENetHelper::AttributeCarriers::edgeTypeExist(const GNEEdgeType* edgeType) const {
// first check that edgeType pointer is valid
if (edgeType) {
return (myEdgeTypes.count(edgeType->getID()) > 0);
} else {
throw ProcessError("Invalid edgeType pointer");
}
}


void
GNENetHelper::AttributeCarriers::insertEdgeType(GNEEdgeType* edgeType) {
// get pointer to create edge frame
Expand Down Expand Up @@ -2413,23 +2391,6 @@ GNENetHelper::AttributeCarriers::deleteConnection(GNEConnection* connection) {
}


bool
GNENetHelper::AttributeCarriers::additionalExist(const GNEAdditional* additional) const {
// first check that additional pointer is valid
if (additional) {
// search in additional elements
for (auto additionalPair : myAdditionals.at(additional->getTagProperty().getTag())) {
if (additionalPair.second == additional) {
return true;
}
}
return false;
} else {
throw ProcessError("Invalid additional pointer");
}
}


void
GNENetHelper::AttributeCarriers::insertAdditional(GNEAdditional* additional) {
if (myAdditionals.at(additional->getTagProperty().getTag()).count(additional) > 0) {
Expand Down Expand Up @@ -2474,23 +2435,6 @@ GNENetHelper::AttributeCarriers::deleteAdditional(GNEAdditional* additional) {
}


bool
GNENetHelper::AttributeCarriers::demandElementExist(GNEDemandElement* demandElement) const {
// first check that demandElement pointer is valid
if (demandElement) {
// search in demand elements
for (auto demandElementPair : myDemandElements.at(demandElement->getTagProperty().getTag())) {
if (demandElementPair.second == demandElement) {
return true;
}
}
return false;
} else {
throw ProcessError("Invalid demandElement pointer");
}
}


void
GNENetHelper::AttributeCarriers::insertDemandElement(GNEDemandElement* demandElement) {
if (myDemandElements.at(demandElement->getTagProperty().getTag()).count(demandElement) > 0) {
Expand Down Expand Up @@ -2547,17 +2491,6 @@ GNENetHelper::AttributeCarriers::deleteDemandElement(GNEDemandElement* demandEle
}


bool
GNENetHelper::AttributeCarriers::dataSetExist(GNEDataSet* dataSet) const {
// first check that dataSet pointer is valid
if (dataSet) {
return (myDataSets.count(dataSet->getID()) > 0);
} else {
throw ProcessError("Invalid dataSet pointer");
}
}


void
GNENetHelper::AttributeCarriers::insertDataSet(GNEDataSet* dataSet) {
if (myDataSets.count(dataSet->getID()) > 0) {
Expand Down Expand Up @@ -2590,23 +2523,6 @@ GNENetHelper::AttributeCarriers::deleteDataSet(GNEDataSet* dataSet) {
}


bool
GNENetHelper::AttributeCarriers::meanDataExist(const GNEMeanData* meanData) const {
// first check that meanData pointer is valid
if (meanData) {
// search in meanData elements
for (auto meanDataPair : myMeanDatas.at(meanData->getTagProperty().getTag())) {
if (meanDataPair.second == meanData) {
return true;
}
}
return false;
} else {
throw ProcessError("Invalid meanData pointer");
}
}


void
GNENetHelper::AttributeCarriers::insertMeanData(GNEMeanData* meanData) {
if (myMeanDatas.at(meanData->getTagProperty().getTag()).count(meanData->getID()) > 0) {
Expand Down
92 changes: 30 additions & 62 deletions src/netedit/GNENetHelper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ struct GNENetHelper {
/// @brief return selected junctions
std::vector<GNEJunction*> getSelectedJunctions() const;

/// @brief registers a junction in GNENet containers
/// @brief registers a junction in containers
GNEJunction* registerJunction(GNEJunction* junction);

/// @brief clear junctions
Expand Down Expand Up @@ -218,7 +218,7 @@ struct GNENetHelper {
*/
GNEEdgeType* retrieveEdgeType(const std::string& id, bool hardFail = true) const;

/// @brief registers a edge in GNENet containers
/// @brief registers a edge in containers
GNEEdgeType* registerEdgeType(GNEEdgeType* edgeType);

/// @brief map with the ID and pointer to edgeTypes of net
Expand Down Expand Up @@ -266,7 +266,7 @@ struct GNENetHelper {
*/
std::vector<GNEEdge*> getSelectedEdges() const;

/// @brief registers an edge with GNENet containers
/// @brief registers an edge with containers
GNEEdge* registerEdge(GNEEdge* edge);

/// @brief clear edges
Expand Down Expand Up @@ -524,9 +524,6 @@ struct GNENetHelper {
*/
GNEDataInterval* retrieveDataInterval(const GNEAttributeCarrier *AC, bool hardFail = true) const;

/// @brief return true if given data interval exist
bool dataIntervalExist(GNEDataInterval* dataInterval) const;

/// @brief get all data intervals of network
const std::map<const GNEAttributeCarrier*, GNEDataInterval*>& getDataIntervals() const;

Expand Down Expand Up @@ -597,171 +594,142 @@ struct GNENetHelper {
protected:
/// @name Junctions protected functions
/// @{
/// @brief inserts a single junction into the net and into the underlying netbuild-container

/// @brief insert junction in container
void insertJunction(GNEJunction* junction);

/// @brief deletes a single junction
/// @brief delete junction from container
void deleteSingleJunction(GNEJunction* junction);

/// @}

/// @name edge types protected functions
/// @{
/// @brief return true if given edgeType exist
bool edgeTypeExist(const GNEEdgeType* edgeType) const;

/// @brief inserts a single edgeType into the net and into the underlying netbuild-container
/// @brief insert edge type in container
void insertEdgeType(GNEEdgeType* edgeType);

/// @brief deletes edgeType
/// @brief delete edge type from container
void deleteEdgeType(GNEEdgeType* edgeType);

/// @}

/// @name edges protected functions
/// @{
/// @brief inserts a single edge into the net and into the underlying netbuild-container
/// @brief insert edge in container
void insertEdge(GNEEdge* edge);

/// @brief deletes a single edge
/// @brief delete edge from container
void deleteSingleEdge(GNEEdge* edge);

/// @}

/// @name lane protected functions
/// @{

/// @brief insert lane
/// @brief insert lane in container
void insertLane(GNELane* lane);

/// @brief delete lane
/// @brief delete lane from container
void deleteLane(GNELane* lane);

/// @}

/// @name crossing protected functions
/// @{

/// @brief insert crossing
/// @brief insert crossing in container
void insertCrossing(GNECrossing* crossing);

/// @brief delete crossing
/// @brief delete crossing from container
void deleteCrossing(GNECrossing* crossing);

/// @}

/// @name walking areas protected functions
/// @{

/// @brief insert walkingArea
/// @brief insert walkingArea in container
void insertWalkingArea(GNEWalkingArea* walkingArea);

/// @brief delete walkingArea
/// @brief delete walkingArea from container
void deleteWalkingArea(GNEWalkingArea* walkingArea);

/// @}

/// @name walking areas protected functions
/// @{

/// @brief insert connection
/// @brief insert connection in container
void insertConnection(GNEConnection* connection);

/// @brief delete connection
/// @brief delete connection from container
void deleteConnection(GNEConnection* connection);

/// @}

/// @name additionals protected functions
/// @{

/// @brief return true if given additional exist
bool additionalExist(const GNEAdditional* additional) const;

/**@brief Insert a additional element int GNENet container.
* @throw processError if route was already inserted
*/
/// @brief Insert a additional element in container.
void insertAdditional(GNEAdditional* additional);

/**@brief delete additional element of GNENet container
* @throw processError if additional wasn't previously inserted
*/
/// @brief delete additional element of container
void deleteAdditional(GNEAdditional* additional);

/// @}

/// @name demand elements protected functions
/// @{

/// @brief return true if given demand element exist
bool demandElementExist(GNEDemandElement* demandElement) const;

/**@brief Insert a demand element element int GNENet container.
* @throw processError if route was already inserted
*/
/// @brief Insert a demand element in container.
void insertDemandElement(GNEDemandElement* demandElement);

/**@brief delete demand element element of GNENet container
* @throw processError if demand element wasn't previously inserted
*/
/// @brief delete demand element of container
void deleteDemandElement(GNEDemandElement* demandElement, const bool updateFrames);

/// @}

/// @name datas protected functions
/// @{

/// @brief return true if given demand element exist
bool dataSetExist(GNEDataSet* dataSet) const;

/**@brief Insert a demand element element int GNENet container.
* @throw processError if route was already inserted
*/
/// @brief Insert a data set in container.
void insertDataSet(GNEDataSet* dataSet);

/**@brief delete demand element element of GNENet container
* @throw processError if demand element wasn't previously inserted
*/
/// @brief delete data set of container
void deleteDataSet(GNEDataSet* dataSet);

/// @}

/// @name data intervals protected functions
/// @{

/// @brief insert data interval
/// @brief insert data interval in container
void insertDataInterval(const GNEAttributeCarrier *AC, GNEDataInterval* dataInterval);

/// @brief delete data interval
/// @brief delete data interval of container
void deleteDataInterval(GNEDataInterval* dataInterval);

/// @}

/// @name generic datas protected functions
/// @{

/// @brief insert generic data
/// @brief insert generic data in container
void insertGenericData(GNEGenericData* genericData);

/// @brief delete generic data
/// @brief delete generic data of container
void deleteGenericData(GNEGenericData* genericData);

/// @}

/// @name Insertion and erasing of GNEMeanDatas items
/// @{

/// @brief return true if given meanData exist
bool meanDataExist(const GNEMeanData* meanData) const;

/**@brief Insert a meanData element int GNENet container.
* @throw processError if route was already inserted
*/
/// @brief Insert a meanData element in container.
void insertMeanData(GNEMeanData* meanData);

/**@brief delete meanData element of GNENet container
* @throw processError if meanData wasn't previously inserted
*/
/// @brief delete meanData element of container
void deleteMeanData(GNEMeanData* meanData);

/// @}
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/changes/GNEChange_Additional.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ GNEChange_Additional::~GNEChange_Additional() {
// show extra information for tests
WRITE_DEBUG("Deleting unreferenced " + myAdditional->getTagStr());
// make sure that additional isn't in net before removing
if (myAdditional->getNet()->getAttributeCarriers()->additionalExist(myAdditional)) {
if (myAdditional->getNet()->getAttributeCarriers()->retrieveAdditional(myAdditional, false)) {
// delete additional from net
myAdditional->getNet()->getAttributeCarriers()->deleteAdditional(myAdditional);
}
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/changes/GNEChange_DataInterval.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ GNEChange_DataInterval::~GNEChange_DataInterval() {
myDataInterval->decRef("GNEChange_DataInterval");
if (myDataInterval->unreferenced() &&
myDataInterval->getNet()->getAttributeCarriers()->retrieveDataSet(myDataSetParent->getID(), false) &&
myDataInterval->getNet()->getAttributeCarriers()->dataIntervalExist(myDataInterval)) {
myDataInterval->getNet()->getAttributeCarriers()->retrieveDataInterval(myDataInterval, false)) {
// show extra information for tests
WRITE_DEBUG("Deleting unreferenced " + myDataInterval->getTagStr() + " [" +
myDataInterval->getAttribute(SUMO_ATTR_BEGIN) + ", " +
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/changes/GNEChange_DemandElement.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ GNEChange_DemandElement::~GNEChange_DemandElement() {
// show extra information for tests
WRITE_DEBUG("Deleting unreferenced " + myDemandElement->getTagStr());
// make sure that element isn't in net before removing
if (myDemandElement->getNet()->getAttributeCarriers()->demandElementExist(myDemandElement)) {
if (myDemandElement->getNet()->getAttributeCarriers()->retrieveDemandElement(myDemandElement, false)) {
// remove demand element of network
myDemandElement->getNet()->getAttributeCarriers()->deleteDemandElement(myDemandElement, false);
}
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/changes/GNEChange_EdgeType.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ GNEChange_EdgeType::~GNEChange_EdgeType() {
// show extra information for tests
WRITE_DEBUG("Deleting unreferenced " + myEdgeType->getTagStr() + " '" + myEdgeType->getID() + "' GNEChange_EdgeType");
// make sure that edgeType isn't in net before removing
if (myEdgeType->getNet()->getAttributeCarriers()->edgeTypeExist(myEdgeType)) {
if (myEdgeType->getNet()->getAttributeCarriers()->retrieveEdgeType(myEdgeType->getID(), false)) {
// delete edgeType from net
myEdgeType->getNet()->getAttributeCarriers()->deleteEdgeType(myEdgeType);
}
Expand Down

0 comments on commit db034de

Please sign in to comment.