Fix #244 and provide instances by entity type without subtypes

src/ifcparse/Ifc2x3enum.h

@@ -42,7 +42,7 @@ namespace Type {
     } Enum;
     IFC_PARSE_API boost::optional<Enum> Parent(Enum v);
     IFC_PARSE_API Enum FromString(const std::string& s);
-    IFC_PARSE_API std::string ToString(Enum v);
+    IFC_PARSE_API const std::string& ToString(Enum v);
     IFC_PARSE_API bool IsSimple(Enum v);
 }
 

src/ifcparse/Ifc4enum.h

@@ -42,7 +42,7 @@ namespace Type {
     } Enum;
     IFC_PARSE_API boost::optional<Enum> Parent(Enum v);
     IFC_PARSE_API Enum FromString(const std::string& s);
-    IFC_PARSE_API std::string ToString(Enum v);
+    IFC_PARSE_API const std::string& ToString(Enum v);
     IFC_PARSE_API bool IsSimple(Enum v);
 }
 

src/ifcparse/IfcFile.h

@@ -39,6 +39,28 @@ public:
 	typedef std::map<std::string, IfcSchema::IfcRoot*> entity_by_guid_t;
 	typedef std::map<unsigned int, std::vector<unsigned int> > entities_by_ref_t;
 	typedef entity_by_id_t::const_iterator const_iterator;
+
+	class type_iterator : public entities_by_type_t::const_iterator {
+	public:
+		type_iterator() : entities_by_type_t::const_iterator() {};
+
+		type_iterator(const entities_by_type_t::const_iterator& it)
+			: entities_by_type_t::const_iterator(it)
+		{};
+
+		entities_by_type_t::key_type const * operator->() const {
+			return &entities_by_type_t::const_iterator::operator->()->first;
+		}
+
+		const entities_by_type_t::key_type& operator*() const {
+			return entities_by_type_t::const_iterator::operator*().first;
+		}
+
+		const std::string& as_string() const {
+			return IfcSchema::Type::ToString(**this);
+		}
+	};
+
 private:
 	typedef std::map<IfcUtil::IfcBaseClass*, IfcUtil::IfcBaseClass*> entity_entity_map_t;
 
@@ -46,6 +68,7 @@ private:
 
 	entity_by_id_t byid;
 	entities_by_type_t bytype;
+	entities_by_type_t bytype_excl;
 	entities_by_ref_t byref;
 	entity_by_guid_t byguid;
 	entity_entity_map_t entity_file_map;
@@ -69,7 +92,13 @@ public:
 	/// Returns the last entity in the file, this probably is the entity
 	/// with the highest id (EXPRESS ENTITY_INSTANCE_NAME)
 	const_iterator end() const;
-	
+
+	type_iterator types_begin() const;
+	type_iterator types_end() const;
+
+	type_iterator types_incl_super_begin() const;
+	type_iterator types_incl_super_end() const;
+
 	/// Returns all entities in the file that match the template argument.
 	/// NOTE: This also returns subtypes of the requested type, for example:
 	/// IfcWall will also return IfcWallStandardCase entities
@@ -88,6 +117,9 @@ public:
 	/// IfcWall will also return IfcWallStandardCase entities
 	IfcEntityList::ptr entitiesByType(IfcSchema::Type::Enum t);
 
+	/// Returns all entities in the file that match the positional argument.
+	IfcEntityList::ptr entitiesByTypeExclSubtypes(IfcSchema::Type::Enum t);
+
 	/// Returns all entities in the file that match the positional argument.
 	/// NOTE: This also returns subtypes of the requested type, for example:
 	/// IfcWall will also return IfcWallStandardCase entities

src/ifcparse/IfcParse.cpp

@@ -1320,6 +1320,16 @@ bool IfcFile::Init(IfcParse::IfcSpfStream* s) {
 			}
 
 			IfcSchema::Type::Enum ty = instance->type();
+
+			{
+				IfcEntityList::ptr instances_by_type = entitiesByTypeExclSubtypes(ty);
+				if (!instances_by_type) {
+					instances_by_type = IfcEntityList::ptr(new IfcEntityList());
+					bytype_excl[ty] = instances_by_type;
+				}
+				instances_by_type->push(instance);
+			}
+
 			for (;;) {
 				IfcEntityList::ptr instances_by_type = entitiesByType(ty);
 				if (!instances_by_type) {
@@ -1334,7 +1344,7 @@ bool IfcFile::Init(IfcParse::IfcSpfStream* s) {
 					break;
 				}
 			}
-			
+
 			if (byid.find(current_id) != byid.end()) {
 				std::stringstream ss;
 				ss << "Overwriting instance with name #" << current_id;
@@ -1567,6 +1577,16 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity) {
 
 	// The mapping by entity type is updated.
 	IfcSchema::Type::Enum ty = new_entity->type();
+
+	{
+		IfcEntityList::ptr instances_by_type = entitiesByTypeExclSubtypes(ty);
+		if (!instances_by_type) {
+			instances_by_type = IfcEntityList::ptr(new IfcEntityList());
+			bytype_excl[ty] = instances_by_type;
+		}
+		instances_by_type->push(new_entity);
+	}
+
 	for (;;) {
 		IfcEntityList::ptr instances_by_type = entitiesByType(ty);
 		if (!instances_by_type) {
@@ -1582,7 +1602,7 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity) {
 			break;
 		}
 	}
-	
+
 	int new_id = -1;
 	if (!new_entity->entity->file) {
 		// For newly created entities ensure a valid ENTITY_INSTANCE_NAME is set
@@ -1720,10 +1740,33 @@ void IfcFile::removeEntity(IfcUtil::IfcBaseClass* entity) {
 	}
 	
 	byid.erase(byid.find(id));
-	
-	IfcEntityList::ptr instances_of_same_type = entitiesByType(entity->type());
-	instances_of_same_type->remove(entity);
 
+	IfcSchema::Type::Enum ty = entity->type();
+
+	{
+		IfcEntityList::ptr instances_of_same_type = entitiesByTypeExclSubtypes(ty);
+		instances_of_same_type->remove(entity);
+		if (instances_of_same_type->size() == 0) {
+			bytype_excl.erase(ty);
+		}
+	}
+
+	for (;;) {
+		IfcEntityList::ptr instances_of_same_type = entitiesByType(ty);
+		if (instances_of_same_type) {
+			instances_of_same_type->remove(entity);
+		}
+		if (instances_of_same_type->size() == 0) {
+			bytype.erase(ty);
+		}
+		boost::optional<IfcSchema::Type::Enum> pt = IfcSchema::Type::Parent(ty);
+		if (pt) {
+			ty = *pt;
+		} else {
+			break;
+		}
+	}
+	
 	delete entity->entity;
 	delete entity;
 }
@@ -1733,6 +1776,11 @@ IfcEntityList::ptr IfcFile::entitiesByType(IfcSchema::Type::Enum t) {
 	return (it == bytype.end()) ? IfcEntityList::ptr() : it->second;
 }
 
+IfcEntityList::ptr IfcFile::entitiesByTypeExclSubtypes(IfcSchema::Type::Enum t) {
+	entities_by_type_t::const_iterator it = bytype_excl.find(t);
+	return (it == bytype_excl.end()) ? IfcEntityList::ptr() : it->second;
+}
+
 IfcEntityList::ptr IfcFile::entitiesByType(const std::string& t) {
 	return entitiesByType(IfcSchema::Type::FromString(boost::to_upper_copy(t)));
 }
@@ -1787,6 +1835,22 @@ IfcFile::entity_by_id_t::const_iterator IfcFile::end() const {
 	return byid.end();
 }
 
+IfcFile::type_iterator IfcFile::types_begin() const {
+	return bytype_excl.begin();
+}
+
+IfcFile::type_iterator IfcFile::types_end() const {
+	return bytype_excl.end();
+}
+
+IfcFile::type_iterator IfcFile::types_incl_super_begin() const {
+	return bytype.begin();
+}
+
+IfcFile::type_iterator IfcFile::types_incl_super_end() const {
+	return bytype.end();
+}
+
 std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f) {
 	f.header().write(os);