Commit 756266e9 authored by Sylvain Thery's avatar Sylvain Thery

remove alpha1 from traversor2

parent 03925b74
...@@ -53,7 +53,8 @@ Dart Traversor2VE<MAP>::next() ...@@ -53,7 +53,8 @@ Dart Traversor2VE<MAP>::next()
{ {
if(current != NIL) if(current != NIL)
{ {
current = m.alpha1(current) ; // current = m.alpha1(current) ;
current = m.phi2(m.phi_1(current)) ;
if(current == start) if(current == start)
current = NIL ; current = NIL ;
} }
...@@ -66,7 +67,7 @@ template <typename MAP> ...@@ -66,7 +67,7 @@ template <typename MAP>
Traversor2VF<MAP>::Traversor2VF(MAP& map, Dart dart) : m(map), start(dart) Traversor2VF<MAP>::Traversor2VF(MAP& map, Dart dart) : m(map), start(dart)
{ {
if(m.isBoundaryMarked(start)) // jump over a boundary face if(m.isBoundaryMarked(start)) // jump over a boundary face
start = m.alpha1(start) ; start = m.phi2(m.phi_1(start)) ;
} }
template <typename MAP> template <typename MAP>
...@@ -87,9 +88,9 @@ Dart Traversor2VF<MAP>::next() ...@@ -87,9 +88,9 @@ Dart Traversor2VF<MAP>::next()
{ {
if(current != NIL) if(current != NIL)
{ {
current = m.alpha1(current) ; current = m.phi2(m.phi_1(current)) ;
if(m.isBoundaryMarked(current)) // jump over a boundary face if(m.isBoundaryMarked(current)) // jump over a boundary face
current = m.alpha1(current) ; current = m.phi2(m.phi_1(current)) ;
if(current == start) if(current == start)
current = NIL ; current = NIL ;
} }
...@@ -135,7 +136,7 @@ template <typename MAP> ...@@ -135,7 +136,7 @@ template <typename MAP>
Traversor2VVaF<MAP>::Traversor2VVaF(MAP& map, Dart dart) : m(map) Traversor2VVaF<MAP>::Traversor2VVaF(MAP& map, Dart dart) : m(map)
{ {
if(m.isBoundaryMarked(dart)) if(m.isBoundaryMarked(dart))
dart = m.alpha1(dart) ; dart = m.phi2(m.phi_1(dart)) ;
start = m.phi1(m.phi1(dart)) ; start = m.phi1(m.phi1(dart)) ;
if(start == dart) if(start == dart)
start = m.phi1(dart) ; start = m.phi1(dart) ;
...@@ -163,9 +164,9 @@ Dart Traversor2VVaF<MAP>::next() ...@@ -163,9 +164,9 @@ Dart Traversor2VVaF<MAP>::next()
current = m.phi1(current) ; current = m.phi1(current) ;
if(current == stop) if(current == stop)
{ {
Dart d = m.alpha1(current) ; Dart d = m.phi2(m.phi_1(current)) ;
if(m.isBoundaryMarked(d)) // jump over a boundary face if(m.isBoundaryMarked(d)) // jump over a boundary face
d = m.alpha1(d) ; d = m.phi2(m.phi_1(d)) ;
current = m.phi1(m.phi1(d)) ; current = m.phi1(m.phi1(d)) ;
if(current == d) if(current == d)
current = m.phi1(d) ; current = m.phi1(d) ;
...@@ -251,7 +252,7 @@ Dart Traversor2EF<MAP>::next() ...@@ -251,7 +252,7 @@ Dart Traversor2EF<MAP>::next()
template <typename MAP> template <typename MAP>
Traversor2EEaV<MAP>::Traversor2EEaV(MAP& map, Dart dart) : m(map) Traversor2EEaV<MAP>::Traversor2EEaV(MAP& map, Dart dart) : m(map)
{ {
start = m.alpha1(dart) ; start = m.phi2(m.phi_1(dart)) ;
stop1 = dart ; stop1 = dart ;
stop2 = m.phi2(dart) ; stop2 = m.phi2(dart) ;
} }
...@@ -274,9 +275,9 @@ Dart Traversor2EEaV<MAP>::next() ...@@ -274,9 +275,9 @@ Dart Traversor2EEaV<MAP>::next()
{ {
if(current != NIL) if(current != NIL)
{ {
current = m.alpha1(current) ; current = m.phi2(m.phi_1(current)) ;
if(current == stop1) if(current == stop1)
current = m.alpha1(stop2) ; current = m.phi2(m.phi_1(stop2)) ;
else if(current == stop2) else if(current == stop2)
current = NIL ; current = NIL ;
} }
...@@ -360,11 +361,11 @@ Dart Traversor2FV<MAP>::next() ...@@ -360,11 +361,11 @@ Dart Traversor2FV<MAP>::next()
template <typename MAP> template <typename MAP>
Traversor2FFaV<MAP>::Traversor2FFaV(MAP& map, Dart dart) : m(map) Traversor2FFaV<MAP>::Traversor2FFaV(MAP& map, Dart dart) : m(map)
{ {
start = m.alpha1(m.alpha1(dart)) ; start = m.phi2(m.phi_1(m.phi2(m.phi_1(dart)))) ;
current = start ; current = start ;
if(start == dart) if(start == dart)
{ {
stop = m.alpha1(dart) ; stop = m.phi2(m.phi_1(dart)) ;
start = next() ; start = next() ;
} }
stop = dart ; stop = dart ;
...@@ -390,14 +391,14 @@ Dart Traversor2FFaV<MAP>::next() ...@@ -390,14 +391,14 @@ Dart Traversor2FFaV<MAP>::next()
{ {
if(current != NIL) if(current != NIL)
{ {
current = m.alpha1(current) ; current = m.phi2(m.phi_1(current)) ;
if(current == stop) if(current == stop)
{ {
Dart d = m.phi1(current) ; Dart d = m.phi1(current) ;
current = m.alpha1(m.alpha1(d)) ; current = m.phi2(m.phi_1(m.phi2(m.phi_1(d)))) ;
if(current == d) if(current == d)
{ {
stop = m.alpha1(d) ; stop = m.phi2(m.phi_1(d)) ;
return next() ; return next() ;
} }
stop = d ; stop = d ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment