New EntitySet type

Author: lelandaisb

src/Core/Geom/GeomEntity.cpp

@@ -99,7 +99,7 @@ getRepresentation(Utils::DisplayRepresentation& dr, bool checkDestroyed) const
 template<typename T>
 void GeomEntity::
 buildSerializedRepresentation(Utils::SerializedRepresentation& description, const std::string& title, 
-    const std::set<T*, decltype(&Utils::Entity::compareEntity)> elements) const
+    const Utils::EntitySet<T*> elements) const
 {
     if (!elements.empty()){
         Utils::SerializedRepresentation	sr (title,TkUtil::NumericConversions::toStr(elements.size()));

src/Core/protected/Geom/GeomEntity.h

@@ -169,7 +169,7 @@ class GeomEntity : public Internal::InternalEntity{
 #ifndef SWIG
     template<typename T>
     void buildSerializedRepresentation(Utils::SerializedRepresentation& description, const std::string& title, 
-                                                const std::set<T*, decltype(&Utils::Entity::compareEntity)> elements) const;
+                                                const Utils::EntitySet<T*> elements) const;
 #endif
 
 private:

src/Core/protected/Geom/IncidentGeomEntitiesVisitor.h

@@ -55,10 +55,10 @@ class GetDownIncidentGeomEntitiesVisitor : public ConstGeomEntityVisitor
         } 
     }
 
-    const std::set<GeomEntity*, decltype(&Utils::Entity::compareEntity)>& get() {return m_down_incident_entities;}
-    const std::set<Surface*, decltype(&Utils::Entity::compareEntity)>& getSurfaces() {return m_down_incident_surfaces;}
-    const std::set<Curve*, decltype(&Utils::Entity::compareEntity)>& getCurves() {return m_down_incident_curves;}
-    const std::set<Vertex*, decltype(&Utils::Entity::compareEntity)>& getVertices() {return m_down_incident_vertices;}
+    const Utils::EntitySet<GeomEntity*>& get() {return m_down_incident_entities;}
+    const Utils::EntitySet<Surface*>& getSurfaces() {return m_down_incident_surfaces;}
+    const Utils::EntitySet<Curve*>& getCurves() {return m_down_incident_curves;}
+    const Utils::EntitySet<Vertex*>& getVertices() {return m_down_incident_vertices;}
 
     GetDownIncidentGeomEntitiesVisitor()
     : m_down_incident_entities(&Utils::Entity::compareEntity)
@@ -69,10 +69,10 @@ class GetDownIncidentGeomEntitiesVisitor : public ConstGeomEntityVisitor
     virtual ~GetDownIncidentGeomEntitiesVisitor() = default;
 
 private:
-    std::set<GeomEntity*, decltype(&Utils::Entity::compareEntity)> m_down_incident_entities;
-    std::set<Surface*, decltype(&Utils::Entity::compareEntity)> m_down_incident_surfaces;
-    std::set<Curve*, decltype(&Utils::Entity::compareEntity)> m_down_incident_curves;
-    std::set<Vertex*, decltype(&Utils::Entity::compareEntity)> m_down_incident_vertices;
+    Utils::EntitySet<GeomEntity*> m_down_incident_entities;
+    Utils::EntitySet<Surface*> m_down_incident_surfaces;
+    Utils::EntitySet<Curve*> m_down_incident_curves;
+    Utils::EntitySet<Vertex*> m_down_incident_vertices;
 };
 
 class GetUpIncidentGeomEntitiesVisitor : public ConstGeomEntityVisitor
@@ -116,10 +116,10 @@ class GetUpIncidentGeomEntitiesVisitor : public ConstGeomEntityVisitor
     }
     virtual void visit(const Volume*) {}
 
-    const std::set<GeomEntity*, decltype(&Utils::Entity::compareEntity)>& get() {return m_up_incident_entities;}
-    const std::set<Volume*, decltype(&Utils::Entity::compareEntity)>& getVolumes() {return m_up_incident_volumes;}
-    const std::set<Surface*, decltype(&Utils::Entity::compareEntity)>& getSurfaces() {return m_up_incident_surfaces;}
-    const std::set<Curve*, decltype(&Utils::Entity::compareEntity)>& getCurves() {return m_up_incident_curves;}
+    const Utils::EntitySet<GeomEntity*>& get() {return m_up_incident_entities;}
+    const Utils::EntitySet<Volume*>& getVolumes() {return m_up_incident_volumes;}
+    const Utils::EntitySet<Surface*>& getSurfaces() {return m_up_incident_surfaces;}
+    const Utils::EntitySet<Curve*>& getCurves() {return m_up_incident_curves;}
 
     GetUpIncidentGeomEntitiesVisitor()
     : m_up_incident_entities(&Utils::Entity::compareEntity)
@@ -130,10 +130,10 @@ class GetUpIncidentGeomEntitiesVisitor : public ConstGeomEntityVisitor
     virtual ~GetUpIncidentGeomEntitiesVisitor() = default;
 
 private:    
-    std::set<GeomEntity*, decltype(&Utils::Entity::compareEntity)> m_up_incident_entities;
-    std::set<Volume*, decltype(&Utils::Entity::compareEntity)> m_up_incident_volumes;
-    std::set<Surface*, decltype(&Utils::Entity::compareEntity)> m_up_incident_surfaces;
-    std::set<Curve*, decltype(&Utils::Entity::compareEntity)> m_up_incident_curves;
+    Utils::EntitySet<GeomEntity*> m_up_incident_entities;
+    Utils::EntitySet<Volume*> m_up_incident_volumes;
+    Utils::EntitySet<Surface*> m_up_incident_surfaces;
+    Utils::EntitySet<Curve*> m_up_incident_curves;
 };
 
 class GetAdjacentGeomEntitiesVisitor : public ConstGeomEntityVisitor
@@ -176,11 +176,11 @@ class GetAdjacentGeomEntitiesVisitor : public ConstGeomEntityVisitor
         m_adjacent_entities.insert(m_adjacent_volumes.begin(), m_adjacent_volumes.end());
     }
 
-    const std::set<GeomEntity*, decltype(&Utils::Entity::compareEntity)>& get() {return m_adjacent_entities;}
-    const std::set<Volume*, decltype(&Utils::Entity::compareEntity)>& getVolumes() {return m_adjacent_volumes;}
-    const std::set<Surface*, decltype(&Utils::Entity::compareEntity)>& getSurfaces() {return m_adjacent_surfaces;}
-    const std::set<Curve*, decltype(&Utils::Entity::compareEntity)>& getCurves() {return m_adjacent_curves;}
-    const std::set<Vertex*, decltype(&Utils::Entity::compareEntity)>& getVertices() {return m_adjacent_vertices;}
+    const Utils::EntitySet<GeomEntity*>& get() {return m_adjacent_entities;}
+    const Utils::EntitySet<Volume*>& getVolumes() {return m_adjacent_volumes;}
+    const Utils::EntitySet<Surface*>& getSurfaces() {return m_adjacent_surfaces;}
+    const Utils::EntitySet<Curve*>& getCurves() {return m_adjacent_curves;}
+    const Utils::EntitySet<Vertex*>& getVertices() {return m_adjacent_vertices;}
 
     GetAdjacentGeomEntitiesVisitor()
     : m_adjacent_entities(&Utils::Entity::compareEntity)
@@ -192,11 +192,11 @@ class GetAdjacentGeomEntitiesVisitor : public ConstGeomEntityVisitor
     virtual ~GetAdjacentGeomEntitiesVisitor() = default;
 
 private:    
-    std::set<GeomEntity*, decltype(&Utils::Entity::compareEntity)> m_adjacent_entities; 
-    std::set<Volume*, decltype(&Utils::Entity::compareEntity)> m_adjacent_volumes;
-    std::set<Surface*, decltype(&Utils::Entity::compareEntity)> m_adjacent_surfaces;
-    std::set<Curve*, decltype(&Utils::Entity::compareEntity)> m_adjacent_curves;
-    std::set<Vertex*, decltype(&Utils::Entity::compareEntity)> m_adjacent_vertices;
+    Utils::EntitySet<GeomEntity*> m_adjacent_entities; 
+    Utils::EntitySet<Volume*> m_adjacent_volumes;
+    Utils::EntitySet<Surface*> m_adjacent_surfaces;
+    Utils::EntitySet<Curve*> m_adjacent_curves;
+    Utils::EntitySet<Vertex*> m_adjacent_vertices;
 };
 /*----------------------------------------------------------------------------*/
 } // end namespace Geom

src/Utils/protected/Utils/Entity.h

@@ -13,6 +13,7 @@
 #include "Utils/SerializedRepresentation.h"
 #include <vector>
 #include <map>
+#include <set>
 /*----------------------------------------------------------------------------*/
 namespace TkUtil {
 class Log;
@@ -380,7 +381,9 @@ private :
 
 Entity::objectType typesToType (FilterEntity::objectType types);
 FilterEntity::objectType typeToTypes (Entity::objectType type);
-
+#ifndef SWIG
+template<typename T> using EntitySet = std::set<T, decltype(&Utils::Entity::compareEntity)>;
+#endif
 /*----------------------------------------------------------------------------*/
 } // end namespace Utils
 /*----------------------------------------------------------------------------*/