Coding - Refactor resource management and shape processing to optimize extent checks

Author: dpasukhi

src/FoundationClasses/TKernel/Resource/Resource_Manager.cxx

@@ -499,7 +499,7 @@ void Resource_Manager::SetResource(const char* aResource, const char16_t* aValue
   TCollection_ExtendedString ExtValue = aValue;
   TCollection_AsciiString    FormatStr(ExtValue.Length() * 3 + 10, ' ');
 
-  *myExtStrMap.Bound(Resource, ExtValue) = ExtValue;
+  myExtStrMap.Bound(Resource, ExtValue);
   //
   pStr = (Standard_PCharacter)FormatStr.ToCString();
   //
@@ -516,9 +516,9 @@ void Resource_Manager::SetResource(const char* aResource, const char16_t* aValue
 //=======================================================================
 void Resource_Manager::SetResource(const char* aResource, const char* aValue)
 {
-  TCollection_AsciiString Resource  = aResource;
-  TCollection_AsciiString Value     = aValue;
-  *myUserMap.Bound(Resource, Value) = Value;
+  TCollection_AsciiString Resource = aResource;
+  TCollection_AsciiString Value    = aValue;
+  myUserMap.Bound(Resource, Value);
 }
 
 //=======================================================================

src/ModelingAlgorithms/TKBO/BOPTools/BOPTools_AlgoTools.cxx

@@ -380,8 +380,9 @@ void BOPTools_AlgoTools::OrientFacesOnShell(TopoDS_Shape& aShell)
       NCollection_List<TopoDS_Shape>::Iterator anIt(aLF);
       for (; anIt.More(); anIt.Next())
       {
-        const TopoDS_Shape& aF = anIt.Value();
-        if (aFM.Add(aF) == aFM.Extent())
+        const TopoDS_Shape& aF          = anIt.Value();
+        const int           aPrevExtent = aFM.Extent();
+        if (aFM.Add(aF) > aPrevExtent)
         {
           aLFTmp.Append(aF);
         }
@@ -483,8 +484,9 @@ void BOPTools_AlgoTools::OrientFacesOnShell(TopoDS_Shape& aShell)
       NCollection_List<TopoDS_Shape>::Iterator anIt(aLF);
       for (; anIt.More(); anIt.Next())
       {
-        const TopoDS_Face& aF = (*(TopoDS_Face*)(&anIt.Value()));
-        if (aProcessedFaces.Add(aF) == aProcessedFaces.Extent())
+        const TopoDS_Face& aF          = (*(TopoDS_Face*)(&anIt.Value()));
+        const int          aPrevExtent = aProcessedFaces.Extent();
+        if (aProcessedFaces.Add(aF) > aPrevExtent)
         {
           aBB.Add(aShellNew, aF);
         }

src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_Builder1.cxx

@@ -1850,14 +1850,16 @@ int TopOpeBRepBuild_Builder1::TwoPiecesON(const NCollection_Sequence<TopoDS_Shap
         //// ????
         else if (aStateObj == TopAbs_IN && aStateTool == TopAbs_IN)
         {
-          if (myProcessedPartsON2d.Add(aPieceObj) == myProcessedPartsON2d.Extent())
+          const int aPrevExtent = myProcessedPartsON2d.Extent();
+          if (myProcessedPartsON2d.Add(aPieceObj) > aPrevExtent)
           {                                     // we proceed IsSame only if we didn't it before
             IsSame2d(aSeq, aListOfPiecesOut2d); // Perform IsSame 2d and keep periodic parts
           }
         }
         else if (aStateObj == TopAbs_OUT && aStateTool == TopAbs_OUT)
         {
-          if (myProcessedPartsON2d.Add(aPieceObj) == myProcessedPartsON2d.Extent())
+          const int aPrevExtent = myProcessedPartsON2d.Extent();
+          if (myProcessedPartsON2d.Add(aPieceObj) > aPrevExtent)
           {                                     // we proceed IsSame only if we didn't it before
             IsSame2d(aSeq, aListOfPiecesOut2d); // Perform IsSame 2d and keep periodic parts
           }
@@ -1925,7 +1927,8 @@ int TopOpeBRepBuild_Builder1::TwoPiecesON(const NCollection_Sequence<TopoDS_Shap
         }
         else if (aStateObj == TopAbs_IN && aStateTool == TopAbs_IN)
         {
-          if (myProcessedPartsON2d.Add(aPieceObj) == myProcessedPartsON2d.Extent())
+          const int aPrevExtent = myProcessedPartsON2d.Extent();
+          if (myProcessedPartsON2d.Add(aPieceObj) > aPrevExtent)
           {                                     // we proceed IsSame only if we didn't it before
             IsSame2d(aSeq, aListOfPiecesOut2d); // Perform IsSame 2d and keep periodic parts
           }

src/ModelingAlgorithms/TKFeat/LocOpe/LocOpe_BuildShape.cxx

@@ -69,9 +69,13 @@ void LocOpe_BuildShape::Perform(const NCollection_List<TopoDS_Shape>& L)
 
   for (itl.Initialize(L); itl.More(); itl.Next())
   {
-    if (itl.Value().ShapeType() == TopAbs_FACE && mapF.Add(itl.Value()))
+    if (itl.Value().ShapeType() == TopAbs_FACE)
     {
-      B.Add(C, itl.Value());
+      const int aPrevExtent = mapF.Extent();
+      if (mapF.Add(itl.Value()) > aPrevExtent)
+      {
+        B.Add(C, itl.Value());
+      }
     }
   }
 
@@ -336,7 +340,8 @@ static void Add(const int                                                      i
   NCollection_List<TopoDS_Shape>::Iterator itl(mapEF(ind));
   for (; itl.More(); itl.Next())
   {
-    if (mapF.Add(itl.Value()))
+    const int aPrevExtent = mapF.Extent();
+    if (mapF.Add(itl.Value()) > aPrevExtent)
     {
       TopExp_Explorer exp;
       for (exp.Init(itl.Value(), TopAbs_EDGE);