Changeset 3254

Timestamp:

03/11/10 09:44:42 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added sme shared Bamg tools

Location:

issm/trunk/src/c

Files:

• Bamgx/BamgObjects.h (modified) (1 diff)
• Bamgx/shared/Adj.h (added)
• Bamgx/shared/BigPrimeNumber.cpp (added)
• Bamgx/shared/BigPrimeNumber.h (added)
• Bamgx/shared/Next.h (added)
• Bamgx/shared/Previous.h (added)
• Bamgx/shared/qualite.h (added)
• Bamgx/shared/shared.h (modified) (1 diff)
• Makefile.am (modified) (2 diffs)

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

@@ -33 +33 @@
 namespace bamg {
         
-        /*INLINE functions{{{1*/
-        inline  TriangleAdjacent Adj(const TriangleAdjacent & a)
-          { return  a.Adj();}
-
-        inline TriangleAdjacent Next(const TriangleAdjacent & ta) 
-          { return TriangleAdjacent(ta.t,NextEdge[ta.a]);}
-
-        inline TriangleAdjacent Previous(const TriangleAdjacent & ta) 
-          { return TriangleAdjacent(ta.t,PreviousEdge[ta.a]);}
-        inline void Adj(GeometricalEdge * & on,int &i) 
-          {int j=i;i=on->DirAdj[i];on=on->Adj[j];}
-        inline double qualite(const Vertex &va,const Vertex &vb,const Vertex &vc)
-          {
-                double ret; 
-                I2 ia=va,ib=vb,ic=vc;
-                I2 ab=ib-ia,bc=ic-ib,ac=ic-ia;
-                Icoor2 deta=Det(ab,ac);
-                if (deta <=0) ret = -1;
-                else {
-                        double a = sqrt((double) (ac,ac)),
-                                        b = sqrt((double) (bc,bc)),
-                                        c = sqrt((double) (ab,ab)),
-                                        p = a+b+c;
-                        double h= Max(Max(a,b),c),ro=deta/p;
-                        ret = ro/h;}
-                        return ret;
-          }
-        Icoor2 inline det(const Vertex & a,const Vertex & b,const Vertex & c){
-                register  Icoor2 bax = b.i.x - a.i.x ,bay = b.i.y - a.i.y; 
-                register  Icoor2 cax = c.i.x - a.i.x ,cay = c.i.y - a.i.y; 
-                return  bax*cay - bay*cax;
-        }
-
-        /*}}}1*/
-
         /*INLINE functions of CLASS VertexOnVertex{{{1*/
         inline void VertexOnVertex::Set(const Triangles & Th ,long i,Triangles & ThNew) { 

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

@@ -8 +8 @@
 
 #include "BigPrimeNumber.h"
+#include "qualite.h"
+#include "Next.h"
+#include "Previous.h"
+#include "Adj.h"
 #include "TheVertex.h"
 #include "FindTriangleAdjacent.h"

issm/trunk/src/c/Makefile.am

@@ -360 +360 @@
                                         ./Bamgx/shared/BigPrimeNumber.h\
                                         ./Bamgx/shared/BigPrimeNumber.cpp\
+                                        ./Bamgx/shared/Adj.h\
+                                        ./Bamgx/shared/Next.h\
+                                        ./Bamgx/shared/Previous.h\
+                                        ./Bamgx/shared/qualite.h\
                                         ./Bamgx/objects/Triangles.cpp\
                                         ./Bamgx/objects/Triangles.h\
@@ -728 +732 @@
                                         ./Bamgx/shared/BigPrimeNumber.h\
                                         ./Bamgx/shared/BigPrimeNumber.cpp\
+                                        ./Bamgx/shared/Adj.h\
+                                        ./Bamgx/shared/Next.h\
+                                        ./Bamgx/shared/Previous.h\
+                                        ./Bamgx/shared/qualite.h\
                                         ./Bamgx/objects/Triangles.cpp\
                                         ./Bamgx/objects/Triangles.h\