OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0024004: Initialization of arrays TPoints, TEdges, TTriangles of the class IntPolyh_MaillageAffinage by exact values

Browse Source 
This commit implements two ideas for current version of OCCT:
1. Initialization of the arrays of the class IntPolyh_MaillageAffinage by exact values. The idea suggested by Roman Lygin (http://opencascade.blogspot.fr/2008/12/why-are-boolean-operations-so-sloooooow.html [^]);
2. Optimizing for loops. The idea has been taken from OCE (7b19650b29 [^]).
This commit is contained in:
emv 2013-05-30 10:19:57 +04:00
parent bd0c22ce9f
commit fee4fa0f01
1 changed files with 130 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

269
src/IntPolyh/IntPolyh_MaillageAffinage.cxx
View File

@ -168,15 +168,6 @@ IntPolyh_MaillageAffinage::IntPolyh_MaillageAffinage
FlecheMoy2(0.0), FlecheMoy2(0.0),
myEnlargeZone(Standard_False) myEnlargeZone(Standard_False)
{ {
TPoints1.Init(10000);
TEdges1.Init(30000);
TTriangles1.Init(20000);
TPoints2.Init(10000);
TEdges2.Init(30000);
TTriangles2.Init(20000);
TStartPoints.Init(10000);
} }
//======================================================================= //=======================================================================
//function : IntPolyh_MaillageAffinage //function : IntPolyh_MaillageAffinage
@ -205,16 +196,7 @@ IntPolyh_MaillageAffinage::IntPolyh_MaillageAffinage
FlecheMoy2(0.0), FlecheMoy2(0.0),
myEnlargeZone(Standard_False) myEnlargeZone(Standard_False)
{ {
TPoints1.Init(10000); }
TEdges1.Init(30000);
TTriangles1.Init(20000);
TPoints2.Init(10000);
TEdges2.Init(30000);
TTriangles2.Init(20000);
TStartPoints.Init(10000);
}
//======================================================================= //=======================================================================
//function : FillArrayOfPnt //function : FillArrayOfPnt
//purpose : Compute points on one surface and fill an array of points //purpose : Compute points on one surface and fill an array of points
@ -348,6 +330,7 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt
DegeneratedIndex(Upars, aNbU, aS, 2, aID1, aID2); DegeneratedIndex(Upars, aNbU, aS, 2, aID1, aID2);
} }
// //
TPoints.Init(aNbU*aNbV);
iCnt=0; iCnt=0;
for(i=1; i<=aNbU; ++i){ for(i=1; i<=aNbU; ++i){
bDegI=(aID1==i || aID2==i); bDegI=(aID1==i || aID2==i);
@ -361,7 +344,7 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt
// //
bDeg=bDegI || (aJD1==j || aJD2==j); bDeg=bDegI || (aJD1==j || aJD2==j);
if (bDeg) { if (bDeg) {
aIP.SetDegenerated(bDeg); aIP.SetDegenerated(bDeg);
} }
++iCnt; ++iCnt;
aBox.Add(aP); aBox.Add(aP);
@ -424,6 +407,7 @@ void IntPolyh_MaillageAffinage::FillArrayOfPnt
DegeneratedIndex(Upars, aNbU, aS, 2, aID1, aID2); DegeneratedIndex(Upars, aNbU, aS, 2, aID1, aID2);
} }
// //
TPoints.Init(aNbU*aNbV);
iCnt=0; iCnt=0;
for(i=1; i<=aNbU; ++i){ for(i=1; i<=aNbU; ++i){
bDegI=(aID1==i || aID2==i); bDegI=(aID1==i || aID2==i);
@ -621,6 +605,12 @@ void IntPolyh_MaillageAffinage::FillArrayOfEdges
Standard_Integer NbSamplesU=(SurfID==1)? NbSamplesU1:NbSamplesU2; Standard_Integer NbSamplesU=(SurfID==1)? NbSamplesU1:NbSamplesU2;
Standard_Integer NbSamplesV=(SurfID==1)? NbSamplesV1:NbSamplesV2; Standard_Integer NbSamplesV=(SurfID==1)? NbSamplesV1:NbSamplesV2;
//NbEdges = 3 + 3*(NbSamplesV-2) + 3*(NbSamplesU-2) +
// + 3*(NbSamplesU-2)*(NbSamplesV-2) + (NbSamplesV-1) + (NbSamplesU-1);
//NbSamplesU and NbSamples cannot be less than 2, so
Standard_Integer NbEdges = 3*NbSamplesU*NbSamplesV - 2*(NbSamplesU+NbSamplesV) + 1;
TEdges.Init(NbEdges);
Standard_Integer CpteurTabEdges=0; Standard_Integer CpteurTabEdges=0;
//maillage u0 v0 //maillage u0 v0
@ -736,7 +726,6 @@ void IntPolyh_MaillageAffinage::FillArrayOfEdges
CpteurTabEdges++; CpteurTabEdges++;
} }
TEdges.SetNbItems(CpteurTabEdges); TEdges.SetNbItems(CpteurTabEdges);
} }
//======================================================================= //=======================================================================
@ -757,7 +746,7 @@ void IntPolyh_MaillageAffinage::FillArrayOfTriangles
Standard_Integer NbSamplesU=(SurfID==1)? NbSamplesU1:NbSamplesU2; Standard_Integer NbSamplesU=(SurfID==1)? NbSamplesU1:NbSamplesU2;
Standard_Integer NbSamplesV=(SurfID==1)? NbSamplesV1:NbSamplesV2; Standard_Integer NbSamplesV=(SurfID==1)? NbSamplesV1:NbSamplesV2;
TTriangles.Init(2*(NbSamplesU-1)*(NbSamplesV-1));
//To provide recursion, I associate a point with two triangles //To provide recursion, I associate a point with two triangles
for(Standard_Integer BoucleMeshU=0; BoucleMeshU<NbSamplesU-1; BoucleMeshU++){ for(Standard_Integer BoucleMeshU=0; BoucleMeshU<NbSamplesU-1; BoucleMeshU++){
for(Standard_Integer BoucleMeshV=0; BoucleMeshV<NbSamplesV-1;BoucleMeshV++){ for(Standard_Integer BoucleMeshV=0; BoucleMeshV<NbSamplesV-1;BoucleMeshV++){
@ -769,10 +758,10 @@ void IntPolyh_MaillageAffinage::FillArrayOfTriangles
// IF ITS EDGE CONTACTS WITH THE COMMON BOX IP REMAINS = A 1 // IF ITS EDGE CONTACTS WITH THE COMMON BOX IP REMAINS = A 1
if( ( (TPoints[PntInit].PartOfCommon()) & (TPoints[PntInit+1].PartOfCommon()) ) if( ( (TPoints[PntInit].PartOfCommon()) & (TPoints[PntInit+1].PartOfCommon()) )
&&( (TPoints[PntInit+1].PartOfCommon()) & (TPoints[PntInit+NbSamplesV+1].PartOfCommon())) &&( (TPoints[PntInit+1].PartOfCommon()) & (TPoints[PntInit+NbSamplesV+1].PartOfCommon()))
&&( (TPoints[PntInit+NbSamplesV+1].PartOfCommon()) & (TPoints[PntInit].PartOfCommon())) ) &&( (TPoints[PntInit+NbSamplesV+1].PartOfCommon()) & (TPoints[PntInit].PartOfCommon())) )
//IF NOT IP=0 //IF NOT IP=0
TTriangles[CpteurTabTriangles].SetIndiceIntersectionPossible(0); TTriangles[CpteurTabTriangles].SetIndiceIntersectionPossible(0);
CpteurTabTriangles++; CpteurTabTriangles++;
@ -783,9 +772,9 @@ void IntPolyh_MaillageAffinage::FillArrayOfTriangles
if( ( (TPoints[PntInit].PartOfCommon()) & (TPoints[PntInit+NbSamplesV+1].PartOfCommon()) ) if( ( (TPoints[PntInit].PartOfCommon()) & (TPoints[PntInit+NbSamplesV+1].PartOfCommon()) )
&&( (TPoints[PntInit+NbSamplesV+1].PartOfCommon()) & (TPoints[PntInit+NbSamplesV].PartOfCommon())) &&( (TPoints[PntInit+NbSamplesV+1].PartOfCommon()) & (TPoints[PntInit+NbSamplesV].PartOfCommon()))
&&( (TPoints[PntInit+NbSamplesV].PartOfCommon()) & (TPoints[PntInit].PartOfCommon())) ) &&( (TPoints[PntInit+NbSamplesV].PartOfCommon()) & (TPoints[PntInit].PartOfCommon())) )
TTriangles[CpteurTabTriangles].SetIndiceIntersectionPossible(0); TTriangles[CpteurTabTriangles].SetIndiceIntersectionPossible(0);
CpteurTabTriangles++; CpteurTabTriangles++;
@ -3145,70 +3134,73 @@ Standard_Integer IntPolyh_MaillageAffinage::TriangleComparePSP ()
const Standard_Integer FinTT2 = TTriangles2.NbItems(); const Standard_Integer FinTT2 = TTriangles2.NbItems();
for(Standard_Integer i_S1=0; i_S1<FinTT1; i_S1++) { for(Standard_Integer i_S1=0; i_S1<FinTT1; i_S1++) {
IntPolyh_Triangle &Triangle1 = TTriangles1[i_S1];
if ((Triangle1.IndiceIntersectionPossible() == 0) ||
(Triangle1.GetFleche() < 0.))
continue;
for(Standard_Integer i_S2=0; i_S2<FinTT2; i_S2++){ for(Standard_Integer i_S2=0; i_S2<FinTT2; i_S2++){
if ( (TTriangles1[i_S1].IndiceIntersectionPossible() != 0) IntPolyh_Triangle &Triangle2 = TTriangles2[i_S2];
&&(TTriangles1[i_S1].GetFleche() >= 0.0) if ((Triangle2.IndiceIntersectionPossible() != 0) &&
&& (TTriangles2[i_S2].IndiceIntersectionPossible() != 0) (Triangle2.GetFleche() >= 0.)) {
&& (TTriangles2[i_S2].GetFleche() >= 0.0) ) { IntPolyh_StartPoint SP1, SP2;
IntPolyh_StartPoint SP1, SP2; //If a triangle is dead or not in BSB, comparison is not possible
//If a triangle is dead or not in BSB, comparison is not possible //
// Standard_Integer iDeg1, iDeg2, iDeg3, iDeg;
Standard_Integer iDeg1, iDeg2, iDeg3, iDeg; //
// const IntPolyh_Point& P1=TPoints1[Triangle1.FirstPoint()];
const IntPolyh_Point& P1=TPoints1[TTriangles1[i_S1].FirstPoint()]; const IntPolyh_Point& P2=TPoints1[Triangle1.SecondPoint()];
const IntPolyh_Point& P2=TPoints1[TTriangles1[i_S1].SecondPoint()]; const IntPolyh_Point& P3=TPoints1[Triangle1.ThirdPoint()];
const IntPolyh_Point& P3=TPoints1[TTriangles1[i_S1].ThirdPoint()]; iDeg1=(P1.Degenerated()) ? 1 : 0;
iDeg1=(P1.Degenerated()) ? 1 : 0; iDeg2=(P2.Degenerated()) ? 1 : 0;
iDeg2=(P2.Degenerated()) ? 1 : 0; iDeg3=(P3.Degenerated()) ? 1 : 0;
iDeg3=(P3.Degenerated()) ? 1 : 0; iDeg=iDeg1+iDeg2+iDeg3;
iDeg=iDeg1+iDeg2+iDeg3; if (iDeg>1) {
if (iDeg>1) { continue;
continue; }
} //
// const IntPolyh_Point& Q1=TPoints2[Triangle2.FirstPoint()];
const IntPolyh_Point& Q1=TPoints2[TTriangles2[i_S2].FirstPoint()]; const IntPolyh_Point& Q2=TPoints2[Triangle2.SecondPoint()];
const IntPolyh_Point& Q2=TPoints2[TTriangles2[i_S2].SecondPoint()]; const IntPolyh_Point& Q3=TPoints2[Triangle2.ThirdPoint()];
const IntPolyh_Point& Q3=TPoints2[TTriangles2[i_S2].ThirdPoint()]; iDeg1=(Q1.Degenerated()) ? 1 : 0;
iDeg1=(Q1.Degenerated()) ? 1 : 0; iDeg2=(Q2.Degenerated()) ? 1 : 0;
iDeg2=(Q2.Degenerated()) ? 1 : 0; iDeg3=(Q3.Degenerated()) ? 1 : 0;
iDeg3=(Q3.Degenerated()) ? 1 : 0; iDeg=iDeg1+iDeg2+iDeg3;
iDeg=iDeg1+iDeg2+iDeg3; if (iDeg>1) {
if (iDeg>1) { continue;
continue; }
} //
// if (TriContact(P1, P2, P3, Q1, Q2, Q3, CoupleAngle)) {
if (TriContact(P1, P2, P3, Q1, Q2, Q3, CoupleAngle)) { Triangle1.SetIndiceIntersection(1);//The triangle is cut by another
TTriangles1[i_S1].SetIndiceIntersection(1);//The triangle is cut by another Triangle2.SetIndiceIntersection(1);
TTriangles2[i_S2].SetIndiceIntersection(1);
Standard_Integer NbPoints;
Standard_Integer NbPoints; NbPoints=StartingPointsResearch(i_S1,i_S2,SP1, SP2);
NbPoints=StartingPointsResearch(i_S1,i_S2,SP1, SP2);
if (NbPoints==0) {
if (NbPoints==0) {
}
}
if ( (NbPoints>0)&&(NbPoints<3) ) {
if ( (NbPoints>0)&&(NbPoints<3) ) { SP1.SetCoupleValue(i_S1,i_S2);
SP1.SetCoupleValue(i_S1,i_S2); TStartPoints[CpteurTabSP]=SP1;
TStartPoints[CpteurTabSP]=SP1; CpteurTabSP++;
CpteurTabSP++;
}
}
if(NbPoints==2) {
if(NbPoints==2) { SP2.SetCoupleValue(i_S1,i_S2);
SP2.SetCoupleValue(i_S1,i_S2); TStartPoints[CpteurTabSP]=SP2;
TStartPoints[CpteurTabSP]=SP2; CpteurTabSP++;
CpteurTabSP++;
}
}
if(NbPoints>2) {
if(NbPoints>2) {
}
} CpteurTab++;
CpteurTab++; }
}
} }
} }
} }
@ -3238,54 +3230,53 @@ Standard_Integer IntPolyh_MaillageAffinage::TriangleCompare ()
Standard_Real CoupleAngle=-2.0; Standard_Real CoupleAngle=-2.0;
for(Standard_Integer i_S1=0; i_S1<FinTT1; i_S1++) { for(Standard_Integer i_S1=0; i_S1<FinTT1; i_S1++) {
IntPolyh_Triangle &Triangle1 = TTriangles1[i_S1];
if ((Triangle1.IndiceIntersectionPossible() == 0) ||
(Triangle1.GetFleche() < 0.))
continue;
for(Standard_Integer i_S2=0; i_S2<FinTT2; i_S2++){ for(Standard_Integer i_S2=0; i_S2<FinTT2; i_S2++){
if ( (TTriangles1[i_S1].IndiceIntersectionPossible() != 0) IntPolyh_Triangle &Triangle2 = TTriangles2[i_S2];
&&(TTriangles1[i_S1].GetFleche() >= 0.0) if ((Triangle2.IndiceIntersectionPossible() != 0) &&
&& (TTriangles2[i_S2].IndiceIntersectionPossible() != 0) (Triangle2.GetFleche() >= 0.)) {
&& (TTriangles2[i_S2].GetFleche() >= 0.0) ) { //If a triangle is dead or not in BSB, comparison is not possible
//If a triangle is dead or not in BSB, comparison is not possible Standard_Integer iDeg1, iDeg2, iDeg3, iDeg;
IntPolyh_Triangle &Triangle1 = TTriangles1[i_S1]; //
IntPolyh_Triangle &Triangle2 = TTriangles2[i_S2]; const IntPolyh_Point& P1=TPoints1[Triangle1.FirstPoint()];
// const IntPolyh_Point& P2=TPoints1[Triangle1.SecondPoint()];
Standard_Integer iDeg1, iDeg2, iDeg3, iDeg; const IntPolyh_Point& P3=TPoints1[Triangle1.ThirdPoint()];
// iDeg1=(P1.Degenerated()) ? 1 : 0;
const IntPolyh_Point& P1=TPoints1[Triangle1.FirstPoint()]; iDeg2=(P2.Degenerated()) ? 1 : 0;
const IntPolyh_Point& P2=TPoints1[Triangle1.SecondPoint()]; iDeg3=(P3.Degenerated()) ? 1 : 0;
const IntPolyh_Point& P3=TPoints1[Triangle1.ThirdPoint()]; iDeg=iDeg1+iDeg2+iDeg3;
iDeg1=(P1.Degenerated()) ? 1 : 0; if (iDeg>1) {
iDeg2=(P2.Degenerated()) ? 1 : 0; continue;
iDeg3=(P3.Degenerated()) ? 1 : 0; }
iDeg=iDeg1+iDeg2+iDeg3; //
if (iDeg>1) { const IntPolyh_Point& Q1=TPoints2[Triangle2.FirstPoint()];
continue; const IntPolyh_Point& Q2=TPoints2[Triangle2.SecondPoint()];
} const IntPolyh_Point& Q3=TPoints2[Triangle2.ThirdPoint()];
// iDeg1=(Q1.Degenerated()) ? 1 : 0;
const IntPolyh_Point& Q1=TPoints2[Triangle2.FirstPoint()]; iDeg2=(Q2.Degenerated()) ? 1 : 0;
const IntPolyh_Point& Q2=TPoints2[Triangle2.SecondPoint()]; iDeg3=(Q3.Degenerated()) ? 1 : 0;
const IntPolyh_Point& Q3=TPoints2[Triangle2.ThirdPoint()]; iDeg=iDeg1+iDeg2+iDeg3;
iDeg1=(Q1.Degenerated()) ? 1 : 0; if (iDeg>1) {
iDeg2=(Q2.Degenerated()) ? 1 : 0; continue;
iDeg3=(Q3.Degenerated()) ? 1 : 0; }
iDeg=iDeg1+iDeg2+iDeg3; //
if (iDeg>1) { if (TriContact(P1, P2, P3, Q1, Q2, Q3, CoupleAngle)) {
continue; if (CpteurTab >= NbTTC)
} {
// TTrianglesContacts.SetNbItems(CpteurTab);
if (TriContact(P1, P2, P3, Q1, Q2, Q3, CoupleAngle)) { return(CpteurTab);
if (CpteurTab >= NbTTC) }
{ TTrianglesContacts[CpteurTab].SetCoupleValue(i_S1, i_S2);
TTrianglesContacts.SetNbItems(CpteurTab); TTrianglesContacts[CpteurTab].SetAngleValue(CoupleAngle);
//test TTrianglesContacts[CpteurTab].Dump(CpteurTab);
return(CpteurTab);
} Triangle1.SetIndiceIntersection(1);//The triangle is cut by another
TTrianglesContacts[CpteurTab].SetCoupleValue(i_S1, i_S2); Triangle2.SetIndiceIntersection(1);
TTrianglesContacts[CpteurTab].SetAngleValue(CoupleAngle); CpteurTab++;
//test TTrianglesContacts[CpteurTab].Dump(CpteurTab); }
Triangle1.SetIndiceIntersection(1);//The triangle is cut by another
Triangle2.SetIndiceIntersection(1);
CpteurTab++;
}
} }
} }
} }