Commit df283e4f authored by Sylvain Thery's avatar Sylvain Thery

algo compilation bug

parent 74d64bc8
...@@ -106,7 +106,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed) ...@@ -106,7 +106,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed)
DartMarker<MAP> cmf(map); DartMarker<MAP> cmf(map);
cmf.markOrbit<FACE>(faceSeed); cmf.template markOrbit<FACE>(faceSeed);
propag.push_back(faceSeed); propag.push_back(faceSeed);
while (!propag.empty() || !propag_inv.empty()) while (!propag.empty() || !propag_inv.empty())
...@@ -120,7 +120,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed) ...@@ -120,7 +120,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed)
do do
{ {
Dart e = map.phi2(d); Dart e = map.phi2(d);
if (map.isBoundaryMarked2(e)) if (map.template isBoundaryMarked<2>(e))
{ {
e = findOtherInCouplesOfDarts(couples,d); e = findOtherInCouplesOfDarts(couples,d);
if (e!=NIL) if (e!=NIL)
...@@ -129,7 +129,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed) ...@@ -129,7 +129,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed)
{ {
propag_inv.push_back(e); propag_inv.push_back(e);
face2invert.push_back(e); face2invert.push_back(e);
cmf.markOrbit<FACE>(e); cmf.template markOrbit<FACE>(e);
} }
cmf.mark(map.phi2(e));// use cmf also to mark boudary cycle to invert cmf.mark(map.phi2(e));// use cmf also to mark boudary cycle to invert
} }
...@@ -140,7 +140,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed) ...@@ -140,7 +140,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed)
if (!cmf.isMarked(e)) if (!cmf.isMarked(e))
{ {
propag.push_back(e); propag.push_back(e);
cmf.markOrbit<FACE>(e); cmf.template markOrbit<FACE>(e);
} }
} }
d= map.phi1(d); d= map.phi1(d);
...@@ -157,7 +157,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed) ...@@ -157,7 +157,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed)
do do
{ {
Dart e = map.phi2(d); Dart e = map.phi2(d);
if (map.isBoundaryMarked2(e)) if (map.template isBoundaryMarked<2>(e))
{ {
e = findOtherInCouplesOfDarts(couples,d); e = findOtherInCouplesOfDarts(couples,d);
if (e!=NIL) if (e!=NIL)
...@@ -165,7 +165,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed) ...@@ -165,7 +165,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed)
if (!cmf.isMarked(e)) if (!cmf.isMarked(e))
{ {
propag.push_back(e); propag.push_back(e);
cmf.markOrbit<FACE>(e); cmf.template markOrbit<FACE>(e);
} }
cmf.mark(map.phi2(d));// use cmf also to mark boudary cycle to invert cmf.mark(map.phi2(d));// use cmf also to mark boudary cycle to invert
} }
...@@ -176,7 +176,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed) ...@@ -176,7 +176,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed)
{ {
propag_inv.push_back(e); propag_inv.push_back(e);
face2invert.push_back(e); face2invert.push_back(e);
cmf.markOrbit<FACE>(e); cmf.template markOrbit<FACE>(e);
} }
} }
d= map.phi1(d); // traverse all edges of face d= map.phi1(d); // traverse all edges of face
...@@ -195,7 +195,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed) ...@@ -195,7 +195,7 @@ void uniformOrientationCC(MAP& map, Dart faceSeed)
if (cmf.isMarked(e)) // check cmf for wrong orientation if (cmf.isMarked(e)) // check cmf for wrong orientation
{ {
reverse2MapFaceKeepPhi2<MAP>(map,e); reverse2MapFaceKeepPhi2<MAP>(map,e);
cmf.unmarkOrbit<FACE>(e); cmf.template unmarkOrbit<FACE>(e);
} }
} }
......
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