0029502: Improve performance of the ShapeUpgrade_UnifySameDomain::UnifyEdges() method
authoremv <emv@opencascade.com>
Tue, 13 Feb 2018 12:01:39 +0000 (15:01 +0300)
committerapn <apn@opencascade.com>
Thu, 15 Feb 2018 13:51:46 +0000 (16:51 +0300)
Avoid repeated merging of the same chains of edges by processing all edges at once.

Test cases for the issue.

src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
tests/bugs/modalg_7/bug29502 [new file with mode: 0644]
tests/perf/modalg/bug29502_1 [new file with mode: 0644]
tests/perf/modalg/bug29502_2 [new file with mode: 0644]
tests/perf/modalg/bug29502_3 [new file with mode: 0644]

index 667f419..6d61038 100644 (file)
@@ -1645,122 +1645,48 @@ void ShapeUpgrade_UnifySameDomain::IntUnifyFaces(const TopoDS_Shape& theInpShape
 void ShapeUpgrade_UnifySameDomain::UnifyEdges()
 {
   TopoDS_Shape aRes = myContext->Apply(myShape);
-
-  TopTools_IndexedMapOfShape ChangedFaces;
-
   // creating map of edge faces
   TopTools_IndexedDataMapOfShapeListOfShape aMapEdgeFaces;
   TopExp::MapShapesAndAncestors(aRes, TopAbs_EDGE, TopAbs_FACE, aMapEdgeFaces);
-  
   // creating map of vertex edges
   TopTools_IndexedDataMapOfShapeListOfShape aMapEdgesVertex;
   TopExp::MapShapesAndUniqueAncestors(aRes, TopAbs_VERTEX, TopAbs_EDGE, aMapEdgesVertex);
-  
-  TopTools_MapOfShape SharedVert;
-
-  TopTools_IndexedMapOfShape anOldEdges;
-  TopExp::MapShapes(myInitShape, TopAbs_EDGE, anOldEdges);
-
-  TopTools_DataMapOfShapeShape NewEdges2OldEdges;
-  for (int i = 1; i <= anOldEdges.Extent(); i++)
-  {
-    const TopoDS_Shape& anOldEdge = anOldEdges(i);
-    TopoDS_Shape aNewEdge = myContext->Apply(anOldEdge);
-    if (!aNewEdge.IsNull() && !aNewEdge.IsSame(anOldEdge))
-      NewEdges2OldEdges.Bind(aNewEdge, anOldEdge);
-  }
 
   if (mySafeInputMode)
     UpdateMapOfShapes(myKeepShapes, myContext);
 
-  TopExp_Explorer exp;
-  // processing separate wires
-  for (exp.Init(aRes, TopAbs_WIRE, TopAbs_FACE); exp.More(); exp.Next()) 
+  // Sequence of the edges of the shape
+  TopTools_SequenceOfShape aSeqEdges;
+  const Standard_Integer aNbE = aMapEdgeFaces.Extent();
+  for (Standard_Integer i = 1; i <= aNbE; ++i)
+    aSeqEdges.Append(aMapEdgeFaces.FindKey(i));
+
+  // Prepare map of shared vertices (with the number of connected edges greater then 2)
+  TopTools_MapOfShape aSharedVert;
+  CheckSharedVertices(aSeqEdges, aMapEdgesVertex, myKeepShapes, aSharedVert);
+  // Merge the edges avoiding removal of the shared vertices
+  Standard_Boolean isMerged = MergeSeq(aSeqEdges, myAngTol, myLinTol, myConcatBSplines,
+                                       mySafeInputMode, myContext, aSharedVert);
+  // Collect faces to rebuild
+  TopTools_IndexedMapOfShape aChangedFaces;
+  if (isMerged)
   {
-    TopTools_SequenceOfShape SeqEdges;
-    TopExp_Explorer expE(exp.Current(), TopAbs_EDGE);
-    for (; expE.More(); expE.Next())
-      SeqEdges.Append(expE.Current());
-    SharedVert.Clear();
-    CheckSharedVertices(SeqEdges, aMapEdgesVertex, myKeepShapes, SharedVert); 
-    MergeSeq(SeqEdges, myAngTol, myLinTol, myConcatBSplines, mySafeInputMode, myContext,
-      SharedVert);
-  }
-
-  // processing each face
-  for (exp.Init(aRes, TopAbs_FACE); exp.More(); exp.Next()) {
-    TopoDS_Shape aFace = exp.Current().Oriented(TopAbs_FORWARD);
-    TopTools_IndexedDataMapOfShapeListOfShape aMapFacesEdges;
-    TopTools_SequenceOfShape aNonSharedEdges;
-    for (TopExp_Explorer expe(aFace,TopAbs_EDGE); expe.More(); expe.Next()) {
-      TopoDS_Edge edge = TopoDS::Edge(expe.Current());
-      const TopTools_ListOfShape& aList = aMapEdgeFaces.FindFromKey(edge);
-      TopTools_ListIteratorOfListOfShape anIter(aList);
-      Standard_Integer NbFacesPerEdge = aList.Extent();
-      for ( ; anIter.More(); anIter.Next()) {
-        const TopoDS_Shape& aFace1 = anIter.Value();
-        if (aFace1.IsSame(aFace) && NbFacesPerEdge != 1)
-          continue;
-        if (NbFacesPerEdge == 1)
-          //store non-shared edges separately 
-          aNonSharedEdges.Append(edge);
-        else 
-        {
-          if (aMapFacesEdges.Contains(aFace1))
-            aMapFacesEdges.ChangeFromKey(aFace1).Append(edge);
-          else 
-          {
-            TopTools_ListOfShape ListEdges;
-            ListEdges.Append(edge);
-            aMapFacesEdges.Add(aFace1, ListEdges);
-          }
-        }
-      }
-    }
-      
-    for (Standard_Integer i=1; i<=aMapFacesEdges.Extent(); i++)
+    for (Standard_Integer i = 1; i <= aNbE; ++i)
     {
-      const TopTools_ListOfShape& ListEdges = aMapFacesEdges.FindFromIndex(i);
-      TopTools_SequenceOfShape SeqEdges;
-      TopTools_ListIteratorOfListOfShape anIter(ListEdges);
-      for ( ; anIter.More(); anIter.Next())
-        SeqEdges.Append(anIter.Value());
-      if (SeqEdges.Length()==1) 
-        continue;  
-
-      SharedVert.Clear();
-      CheckSharedVertices(SeqEdges, aMapEdgesVertex, myKeepShapes, SharedVert);
-      if (MergeSeq(SeqEdges, myAngTol, myLinTol, myConcatBSplines, mySafeInputMode,
-        myContext, SharedVert))
+      const TopoDS_Shape& aE = aMapEdgeFaces.FindKey(i);
+      if (myContext->IsRecorded(aE))
       {
-        TopoDS_Face tmpF = TopoDS::Face(exp.Current());
-        if ( !ChangedFaces.Contains(tmpF) )
-          ChangedFaces.Add(tmpF);
-        tmpF = TopoDS::Face(aMapFacesEdges.FindKey(i));
-        if ( !ChangedFaces.Contains(tmpF) )
-          ChangedFaces.Add(tmpF);
+        TopTools_ListIteratorOfListOfShape it(aMapEdgeFaces(i));
+        for (; it.More(); it.Next())
+          aChangedFaces.Add(it.Value());
       }
     }
-    
-    if ( aNonSharedEdges.Length() > 1 )
-    {
-      SharedVert.Clear();
-      CheckSharedVertices(aNonSharedEdges, aMapEdgesVertex, myKeepShapes, SharedVert);
-      if (MergeSeq(aNonSharedEdges, myAngTol, myLinTol, myConcatBSplines, mySafeInputMode,
-        myContext, SharedVert))
-      {
-        TopoDS_Face tmpF = TopoDS::Face(exp.Current());
-        if ( !ChangedFaces.Contains(tmpF) )
-          ChangedFaces.Add(tmpF);
-      }
-    }
-
-  } // end processing each face
+  }
 
   // fix changed faces and replace them in the local context
   Standard_Real aPrec = Precision::Confusion();
-  for (Standard_Integer i = 1; i <= ChangedFaces.Extent(); i++) {
-    TopoDS_Face aFace = TopoDS::Face(myContext->Apply(ChangedFaces.FindKey(i)));
+  for (Standard_Integer i = 1; i <= aChangedFaces.Extent(); i++) {
+    TopoDS_Face aFace = TopoDS::Face(myContext->Apply(aChangedFaces.FindKey(i)));
     if (aFace.IsNull())
       continue;
 
@@ -1798,7 +1724,7 @@ void ShapeUpgrade_UnifySameDomain::UnifyEdges()
     myContext->Replace(aFace,aNewFace);
   }
 
-  if (ChangedFaces.Extent() > 0) {
+  if (aChangedFaces.Extent() > 0) {
     // fix changed shell and replace it in the local context
     TopoDS_Shape aRes1 = myContext->Apply(aRes);
     Standard_Boolean isChanged = Standard_False;
diff --git a/tests/bugs/modalg_7/bug29502 b/tests/bugs/modalg_7/bug29502
new file mode 100644 (file)
index 0000000..f4d0770
--- /dev/null
@@ -0,0 +1,30 @@
+puts "========"
+puts "OCC29502"
+puts "========"
+puts ""
+#################################################
+# Improve performance of the ShapeUpgrade_UnifySameDomain::UnifyEdges() method
+#################################################
+
+# create cylinder
+cylinder c 0 0 0 0 0 1 10
+mkface f c 0 2*pi -10 10
+
+# split seam edge by the vertex
+vertex v 10 0 0
+bclearobjects
+bcleartools
+baddobjects f
+baddtools v
+bfillds
+bsplit r
+explode r f
+
+# perform unification of the seam edge:
+# the split vertex should be removed
+unifysamedom result r_1
+
+checkshape result
+checkprops result -equal f
+checknbshapes result -ref [nbshapes f]
+
diff --git a/tests/perf/modalg/bug29502_1 b/tests/perf/modalg/bug29502_1
new file mode 100644 (file)
index 0000000..6f74231
--- /dev/null
@@ -0,0 +1,19 @@
+puts "============"
+puts "OCC29502"
+puts "============"
+puts ""
+###############################
+## Improve performance of the ShapeUpgrade_UnifySameDomain::UnifyEdges() method
+###############################
+
+restore [locate_data_file bug29502_faces.brep] cf
+
+dchrono h restart
+
+unifysamedom result cf +b
+
+dchrono h stop counter unifysamedom
+
+checkshape result
+checkprops result -equal cf -skip
+checknbshapes result -vertex 146 -edge 217 -wire 72 -face 72 -t
diff --git a/tests/perf/modalg/bug29502_2 b/tests/perf/modalg/bug29502_2
new file mode 100644 (file)
index 0000000..02586ba
--- /dev/null
@@ -0,0 +1,19 @@
+puts "============"
+puts "OCC29502"
+puts "============"
+puts ""
+###############################
+## Improve performance of the ShapeUpgrade_UnifySameDomain::UnifyEdges() method
+###############################
+
+restore [locate_data_file bug29502_split_faces.brep] cf
+
+dchrono h restart
+
+unifysamedom result cf -f +b
+
+dchrono h stop counter unifysamedom
+
+checkshape result
+checkprops result -equal cf -skip
+checknbshapes result -vertex 365 -edge 652 -wire 288 -face 288 -t
diff --git a/tests/perf/modalg/bug29502_3 b/tests/perf/modalg/bug29502_3
new file mode 100644 (file)
index 0000000..fcb1267
--- /dev/null
@@ -0,0 +1,19 @@
+puts "============"
+puts "OCC29502"
+puts "============"
+puts ""
+###############################
+## Improve performance of the ShapeUpgrade_UnifySameDomain::UnifyEdges() method
+###############################
+
+restore [locate_data_file bug29502_split_faces.brep] cf
+
+dchrono h restart
+
+unifysamedom result cf +b
+
+dchrono h stop counter unifysamedom
+
+checkshape result
+checkprops result -l 2900 -s 14400 -skip
+checknbshapes result -vertex 146 -edge 217 -wire 72 -face 72 -t