Changeset 3237

Timestamp:

03/09/10 15:38:32 (15 years ago)

Author:

Mathieu Morlighem

Message:

shared/FindTriangle.h not needed anymore

Location:

issm/trunk/src/c/Bamgx

Files:

• BamgObjects.h (modified) (1 diff)
• objects/CrackedEdge.h (modified) (1 diff)
• objects/Edge.h (modified) (1 diff)
• shared/FindTriangle.cpp (deleted)
• shared/FindTriangle.h (deleted)
• shared/FindTriangleAdjacent.h (added)
• shared/shared.h (modified) (2 diffs)

issm/trunk/src/c/Bamgx/BamgObjects.h

@@ -134 +134 @@
                 return  bax*cay - bay*cax;
         }
-        inline  TriangleAdjacent FindTriangleAdjacent(Edge &E){
-                Vertex * a = E.v[0];
-                Vertex * b = E.v[1];
-
-                Triangle * t = a->t;
-                int i = a->vint;
-                TriangleAdjacent ta(t,EdgesVertexTriangle[i][0]); // Previous edge
-                if (!t || i<0 || i>=3){
-                        throw ErrorException(__FUNCT__,exprintf("!t || i<0 !! i>=3"));
-                }
-                if ( a!=(*t)(i)){
-                        throw ErrorException(__FUNCT__,exprintf("a!=(*t)(i)"));
-                }
-                int k=0;
-                do { // turn around vertex in direct sens (trigo)
-                        k++;
-                        if (k>=20000){
-                                throw ErrorException(__FUNCT__,exprintf("k>=20000"));
-                        }
-                        //  in no crack => ta.EdgeVertex(1) == a otherwise ??? 
-                        if (ta.EdgeVertex(1) ==  a && ta.EdgeVertex(0) ==  b) return ta; // find 
-                        ta = ta.Adj();
-                        if (ta.EdgeVertex(0) ==  a && ta.EdgeVertex(1) ==  b) return ta; // find 
-                        --ta;
-                } while (t != (Triangle *)ta);
-                throw ErrorException(__FUNCT__,exprintf("FindTriangleAdjacent: triangle not found"));
-                return TriangleAdjacent(0,0);//for compiler
-        }
+
         /*}}}1*/
 

issm/trunk/src/c/Bamgx/objects/CrackedEdge.h

@@ -13 +13 @@
 #include "Triangle.h"
 #include "../shared/TheVertex.h"
+#include "../shared/FindTriangleAdjacent.h"
 
 namespace bamg {

issm/trunk/src/c/Bamgx/objects/Edge.h

@@ -50 +50 @@
 
         };
-
-        //FOR NOW
-        inline TriangleAdjacent FindTriangleAdjacent(Edge &E);
-
 }
 #endif

issm/trunk/src/c/Bamgx/shared/shared.h

@@ -10 +10 @@
 #include "CloseBoundaryEdge.h"
 #include "CloseBoundaryEdgeV2.h"
-#include "FindTriangle.h"
 #include "ForceEdge.h"
 #include "shared.h"
@@ -16 +15 @@
 #include "swap.h"
 #include "TheVertex.h"
+#include "FindTriangleAdjacent.h"
 
 #endif