edgeSelector.hpp 66.8 KB
Newer Older
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1 2 3
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps  *
* version 0.1                                                                  *
4
* Copyright (C) 2009-2013, IGG Team, ICube, University of Strasbourg           *
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
*                                                                              *
* This library is free software; you can redistribute it and/or modify it      *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your     *
* option) any later version.                                                   *
*                                                                              *
* This library is distributed in the hope that it will be useful, but WITHOUT  *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or        *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License  *
* for more details.                                                            *
*                                                                              *
* You should have received a copy of the GNU Lesser General Public License     *
* along with this library; if not, write to the Free Software Foundation,      *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.           *
*                                                                              *
20
* Web site: http://cgogn.unistra.fr/                                           *
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
21 22 23 24 25 26 27 28 29 30
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/

namespace CGoGN
{

namespace Algo
{

31 32 33
namespace Surface
{

Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
namespace Decimation
{

/************************************************************************************
 *                                  MAP ORDER                                       *
 ************************************************************************************/

template <typename PFP>
bool EdgeSelector_MapOrder<PFP>::init()
{
	cur = this->m_map.begin() ;
	return true ;
}

template <typename PFP>
49
bool EdgeSelector_MapOrder<PFP>::nextEdge(Dart& d) const
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
50
{
Sauvage's avatar
Sauvage committed
51
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
52 53 54 55 56 57 58
	if(cur == m.end())
		return false ;
	d = cur ;
	return true ;
}

template <typename PFP>
Sylvain Thery's avatar
Sylvain Thery committed
59
void EdgeSelector_MapOrder<PFP>::updateAfterCollapse(Dart /*d2*/, Dart /*dd2*/)
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
60
{
Sauvage's avatar
Sauvage committed
61
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
62
	cur = m.begin() ;
63
	while( !m.edgeCanCollapse(cur))
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
64 65 66 67 68 69 70
	{
		m.next(cur) ;
		if(cur == m.end())
			break ;
	}
}

71

Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
72 73 74 75 76 77 78
/************************************************************************************
 *                                    RANDOM                                        *
 ************************************************************************************/

template <typename PFP>
bool EdgeSelector_Random<PFP>::init()
{
Sauvage's avatar
Sauvage committed
79
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104

	darts.reserve(m.getNbDarts()) ;
	darts.clear() ;

	for(Dart d = m.begin(); d != m.end(); m.next(d))
		darts.push_back(d) ;

	srand(time(NULL)) ;
	int remains = darts.size() ;
	for(unsigned int i = 0; i < darts.size()-1; ++i) // generate the random permutation
	{
		int r = (rand() % remains) + i ;
		// swap ith and rth elements
		Dart tmp = darts[i] ;
		darts[i] = darts[r] ;
		darts[r] = tmp ;
		--remains ;
	}
	cur = 0 ;
	allSkipped = true ;

	return true ;
}

template <typename PFP>
105
bool EdgeSelector_Random<PFP>::nextEdge(Dart& d) const
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
106 107 108 109 110 111 112 113
{
	if(cur == darts.size() && allSkipped)
		return false ;
	d = darts[cur] ;
	return true ;
}

template <typename PFP>
Sylvain Thery's avatar
Sylvain Thery committed
114
void EdgeSelector_Random<PFP>::updateAfterCollapse(Dart /*d2*/, Dart /*dd2*/)
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
115
{
Sauvage's avatar
Sauvage committed
116
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
117 118 119 120 121 122 123 124 125
	allSkipped = false ;
	do
	{
		++cur ;
		if(cur == darts.size())
		{
			cur = 0 ;
			allSkipped = true ;
		}
126
	} while( !m.edgeCanCollapse(darts[cur])) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
127 128
}

129 130 131
template <typename PFP>
void EdgeSelector_Random<PFP>::updateWithoutCollapse()
{
Sauvage's avatar
Sauvage committed
132
	typename PFP::MAP& m = this->m_map ;
133 134 135 136 137 138 139 140 141
	allSkipped = false ;
	do
	{
		++cur ;
		if(cur == darts.size())
		{
			cur = 0 ;
			allSkipped = true ;
		}
142
	} while( !m.edgeCanCollapse(darts[cur])) ;
143 144
}

Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
145 146 147 148 149 150 151
/************************************************************************************
 *                                 EDGE LENGTH                                      *
 ************************************************************************************/

template <typename PFP>
bool EdgeSelector_Length<PFP>::init()
{
Sauvage's avatar
Sauvage committed
152
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
153 154 155

	edges.clear() ;

156
	CellMarker<EDGE> eMark(m) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
157 158 159 160 161 162 163 164 165 166 167 168 169 170 171
	for(Dart d = m.begin(); d != m.end(); m.next(d))
	{
		if(!eMark.isMarked(d))
		{
			initEdgeInfo(d) ;
			eMark.mark(d) ;
		}
	}

	cur = edges.begin() ; // init the current edge to the first one

	return true ;
}

template <typename PFP>
172
bool EdgeSelector_Length<PFP>::nextEdge(Dart& d) const
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
173 174 175 176 177 178 179 180 181 182
{
	if(cur == edges.end() || edges.empty())
		return false ;
	d = (*cur).second ;
	return true ;
}

template <typename PFP>
void EdgeSelector_Length<PFP>::updateBeforeCollapse(Dart d)
{
Sauvage's avatar
Sauvage committed
183
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
184

185 186 187
	EdgeInfo *edgeE = &(edgeInfo[d]) ;
	if(edgeE->valid)
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
188

189 190 191
	edgeE = &(edgeInfo[m.phi1(d)]) ;
	if(edgeE->valid)					// remove all
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
192

193 194 195
	edgeE = &(edgeInfo[m.phi_1(d)]) ;	// the concerned edges
	if(edgeE->valid)
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
196 197 198 199
									// from the multimap
	Dart dd = m.phi2(d) ;
	if(dd != d)
	{
200 201 202
		edgeE = &(edgeInfo[m.phi1(dd)]) ;
		if(edgeE->valid)
			edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
203

204 205 206
		edgeE = &(edgeInfo[m.phi_1(dd)]) ;
		if(edgeE->valid)
			edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
207 208 209 210 211 212
	}
}

template <typename PFP>
void EdgeSelector_Length<PFP>::updateAfterCollapse(Dart d2, Dart dd2)
{
Sauvage's avatar
Sauvage committed
213
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
214 215 216 217 218 219 220 221 222

	Dart vit = d2 ;
	do
	{
		updateEdgeInfo(m.phi1(vit), false) ;			// must recompute some edge infos in the
		if(vit == d2 || vit == dd2)						// neighborhood of the collapsed edge
		{
			initEdgeInfo(vit) ;							// various optimizations are applied here by
														// treating differently :
223
			Dart vit2 = m.phi12(m.phi1(vit)) ;		// - edges for which the criteria must be recomputed
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
224 225 226 227 228
			Dart stop = m.phi2(vit) ;					// - edges that must be re-embedded
			do											// - edges for which only the collapsibility must be re-tested
			{
				updateEdgeInfo(vit2, false) ;
				updateEdgeInfo(m.phi1(vit2), false) ;
229
				vit2 = m.phi12(vit2) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
230 231 232 233 234
			} while(vit2 != stop) ;
		}
		else
			updateEdgeInfo(vit, true) ;

235
		vit = m.phi2_1(vit) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
236 237 238 239 240
	} while(vit != d2) ;

	cur = edges.begin() ; // set the current edge to the first one
}

241 242 243 244 245 246 247 248 249 250 251
template <typename PFP>
void EdgeSelector_Length<PFP>::updateWithoutCollapse()
{
	EdgeInfo& einfo = edgeInfo[(*cur).second] ;
	einfo.valid = false ;
	edges.erase(einfo.it) ;

	//edges.erase(cur) ;
	cur = edges.begin();
}

Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
252 253 254
template <typename PFP>
void EdgeSelector_Length<PFP>::initEdgeInfo(Dart d)
{
Sauvage's avatar
Sauvage committed
255
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
256 257 258 259 260 261 262 263 264 265 266
	EdgeInfo einfo ;
	if(m.edgeCanCollapse(d))
		computeEdgeInfo(d, einfo) ;
	else
		einfo.valid = false ;
	edgeInfo[d] = einfo ;
}

template <typename PFP>
void EdgeSelector_Length<PFP>::updateEdgeInfo(Dart d, bool recompute)
{
Sauvage's avatar
Sauvage committed
267
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298
	EdgeInfo& einfo = edgeInfo[d] ;
	if(recompute)
	{
		if(einfo.valid)
			edges.erase(einfo.it) ;			// remove the edge from the multimap
		if(m.edgeCanCollapse(d))
			computeEdgeInfo(d, einfo) ;
		else
			einfo.valid = false ;
	}
	else
	{
		if(m.edgeCanCollapse(d))
		{									// if the edge can be collapsed now
			if(!einfo.valid)				// but it was not before
				computeEdgeInfo(d, einfo) ;
		}
		else
		{									// if the edge cannot be collapsed now
			if(einfo.valid)					// and it was before
			{
				edges.erase(einfo.it) ;
				einfo.valid = false ;
			}
		}
	}
}

template <typename PFP>
void EdgeSelector_Length<PFP>::computeEdgeInfo(Dart d, EdgeInfo& einfo)
{
299
	VEC3 vec = Algo::Surface::Geometry::vectorOutOfDart<PFP>(this->m_map, d, this->m_position) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
300 301 302 303 304 305 306 307 308 309 310
	einfo.it = edges.insert(std::make_pair(vec.norm2(), d)) ;
	einfo.valid = true ;
}

/************************************************************************************
 *                            QUADRIC ERROR METRIC                                  *
 ************************************************************************************/

template <typename PFP>
bool EdgeSelector_QEM<PFP>::init()
{
Sauvage's avatar
Sauvage committed
311
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
312 313 314 315 316 317 318 319

	bool ok = false ;
	for(typename std::vector<ApproximatorGen<PFP>*>::iterator it = this->m_approximators.begin();
		it != this->m_approximators.end() && !ok;
		++it)
	{
		if((*it)->getApproximatedAttributeName() == "position")
		{
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
320 321
			assert((*it)->getType() != A_hQEM || !"Approximator(hQEM) and selector (EdgeSelector_QEM) are not compatible") ;
			assert((*it)->getType() != A_hHalfCollapse || !"Approximator(hHalfCollapse) and selector (EdgeSelector_QEM) are not compatible") ;
322
			m_positionApproximator = reinterpret_cast<Approximator<PFP, VEC3,EDGE>* >(*it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
323 324 325 326 327 328 329 330 331
			ok = true ;
		}
	}

	if(!ok)
		return false ;

	edges.clear() ;

332
	CellMarker<VERTEX> vMark(m) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
333 334 335 336
	for(Dart d = m.begin(); d != m.end(); m.next(d))
	{
		if(!vMark.isMarked(d))
		{
337
			Utils::Quadric<REAL> q ;	// create one quadric
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
338 339 340 341 342 343 344 345 346 347 348 349
			quadric[d] = q ;	// per vertex
			vMark.mark(d) ;
		}
	}

	DartMarker mark(m) ;
	for(Dart d = m.begin(); d != m.end(); m.next(d))
	{
		if(!mark.isMarked(d))
		{
			Dart d1 = m.phi1(d) ;				// for each triangle,
			Dart d_1 = m.phi_1(d) ;				// initialize the quadric of the triangle
350
			Utils::Quadric<REAL> q(this->m_position[d], this->m_position[d1], this->m_position[d_1]) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
351 352 353
			quadric[d] += q ;					// and add the contribution of
			quadric[d1] += q ;					// this quadric to the ones
			quadric[d_1] += q ;					// of the 3 incident vertices
Pierre Kraemer's avatar
Pierre Kraemer committed
354
			mark.markOrbit<FACE>(d) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
355 356 357
		}
	}

358
	CellMarker<EDGE> eMark(m) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
359 360 361 362 363 364 365 366 367 368 369 370 371 372 373
	for(Dart d = m.begin(); d != m.end(); m.next(d))
	{
		if(!eMark.isMarked(d))
		{
			initEdgeInfo(d) ;	// init the edges with their optimal position
			eMark.mark(d) ;		// and insert them in the multimap according to their error
		}
	}

	cur = edges.begin() ; // init the current edge to the first one

	return true ;
}

template <typename PFP>
374
bool EdgeSelector_QEM<PFP>::nextEdge(Dart& d) const
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
375 376 377 378 379 380 381 382 383 384
{
	if(cur == edges.end() || edges.empty())
		return false ;
	d = (*cur).second ;
	return true ;
}

template <typename PFP>
void EdgeSelector_QEM<PFP>::updateBeforeCollapse(Dart d)
{
Sauvage's avatar
Sauvage committed
385
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
386

387 388 389
	EdgeInfo *edgeE = &(edgeInfo[d]) ;
	if(edgeE->valid)
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
390

391 392 393
	edgeE = &(edgeInfo[m.phi1(d)]) ;
	if(edgeE->valid)					// remove all
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
394

395 396 397
	edgeE = &(edgeInfo[m.phi_1(d)]) ;	// the concerned edges
	if(edgeE->valid)
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
398 399 400 401
									// from the multimap
	Dart dd = m.phi2(d) ;
	if(dd != d)
	{
402 403 404
		edgeE = &(edgeInfo[m.phi1(dd)]) ;
		if(edgeE->valid)
			edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
405

406 407 408
		edgeE = &(edgeInfo[m.phi_1(dd)]) ;
		if(edgeE->valid)
			edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
409 410 411 412 413 414 415 416 417 418
	}

	tmpQ.zero() ;			// compute quadric for the new
	tmpQ += quadric[d] ;	// vertex as the sum of those
	tmpQ += quadric[dd] ;	// of the contracted vertices
}

template <typename PFP>
void EdgeSelector_QEM<PFP>::updateAfterCollapse(Dart d2, Dart dd2)
{
Sauvage's avatar
Sauvage committed
419
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
420 421 422 423 424 425 426 427 428 429 430

	quadric[d2] = tmpQ ;

	Dart vit = d2 ;
	do
	{
		updateEdgeInfo(m.phi1(vit), false) ;			// must recompute some edge infos in the
		if(vit == d2 || vit == dd2)						// neighborhood of the collapsed edge
		{
			initEdgeInfo(vit) ;							// various optimizations are applied here by
														// treating differently :
431
			Dart vit2 = m.phi12(m.phi1(vit)) ;		// - edges for which the criteria must be recomputed
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
432 433 434 435 436
			Dart stop = m.phi2(vit) ;					// - edges that must be re-embedded
			do											// - edges for which only the collapsibility must be re-tested
			{
				updateEdgeInfo(vit2, false) ;
				updateEdgeInfo(m.phi1(vit2), false) ;
437
				vit2 = m.phi12(vit2) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
438 439 440 441 442
			} while(vit2 != stop) ;
		}
		else
			updateEdgeInfo(vit, true) ;

443
		vit = m.phi2_1(vit) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
444 445 446 447 448
	} while(vit != d2) ;

	cur = edges.begin() ; // set the current edge to the first one
}

449 450 451 452 453 454 455 456 457 458 459
template <typename PFP>
void EdgeSelector_QEM<PFP>::updateWithoutCollapse()
{
	EdgeInfo& einfo = edgeInfo[(*cur).second] ;
	einfo.valid = false ;
	edges.erase(einfo.it) ;

	//edges.erase(cur) ;
	cur = edges.begin();
}

Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
460 461 462
template <typename PFP>
void EdgeSelector_QEM<PFP>::initEdgeInfo(Dart d)
{
Sauvage's avatar
Sauvage committed
463
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
464 465 466 467 468 469 470 471 472 473 474
	EdgeInfo einfo ;
	if(m.edgeCanCollapse(d))
		computeEdgeInfo(d, einfo) ;
	else
		einfo.valid = false ;
	edgeInfo[d] = einfo ;
}

template <typename PFP>
void EdgeSelector_QEM<PFP>::updateEdgeInfo(Dart d, bool recompute)
{
Sauvage's avatar
Sauvage committed
475
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506
	EdgeInfo& einfo = edgeInfo[d] ;
	if(recompute)
	{
		if(einfo.valid)
			edges.erase(einfo.it) ;		// remove the edge from the multimap
		if(m.edgeCanCollapse(d))
			computeEdgeInfo(d, einfo) ;
		else
			einfo.valid = false ;
	}
	else
	{
		if(m.edgeCanCollapse(d))
		{								 	// if the edge can be collapsed now
			if(!einfo.valid)				// but it was not before
				computeEdgeInfo(d, einfo) ;
		}
		else
		{								 // if the edge cannot be collapsed now
			if(einfo.valid)				 // and it was before
			{
				edges.erase(einfo.it) ;
				einfo.valid = false ;
			}
		}
	}
}

template <typename PFP>
void EdgeSelector_QEM<PFP>::computeEdgeInfo(Dart d, EdgeInfo& einfo)
{
Sauvage's avatar
Sauvage committed
507
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
508 509
	Dart dd = m.phi2(d) ;

510
	Utils::Quadric<REAL> quad ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
511 512 513 514 515
	quad += quadric[d] ;	// compute the sum of the
	quad += quadric[dd] ;	// two vertices quadrics

	m_positionApproximator->approximate(d) ;

516
	REAL err = quad(m_positionApproximator->getApprox(d)) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
517 518 519 520 521 522 523 524 525 526 527 528

	einfo.it = edges.insert(std::make_pair(err, d)) ;
	einfo.valid = true ;
}

/************************************************************************************
 *                            QUADRIC ERROR METRIC (Memoryless version)             *
 ************************************************************************************/

template <typename PFP>
bool EdgeSelector_QEMml<PFP>::init()
{
Sauvage's avatar
Sauvage committed
529
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
530 531 532 533 534 535 536 537

	bool ok = false ;
	for(typename std::vector<ApproximatorGen<PFP>*>::iterator it = this->m_approximators.begin();
		it != this->m_approximators.end() && !ok;
		++it)
	{
		if((*it)->getApproximatedAttributeName() == "position")
		{
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
538 539
			assert((*it)->getType() != A_hQEM || !"Approximator(hQEM) and selector (EdgeSelector_QEMml) are not compatible") ;
			assert((*it)->getType() != A_hHalfCollapse || !"Approximator(hHalfCollapse) and selector (EdgeSelector_QEMml) are not compatible") ;
540
			m_positionApproximator = reinterpret_cast<Approximator<PFP, VEC3,EDGE>* >(*it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
541 542 543 544 545 546 547 548 549
			ok = true ;
		}
	}

	if(!ok)
		return false ;

	edges.clear() ;

550
	CellMarker<VERTEX> vMark(m) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
551 552 553 554
	for(Dart d = m.begin(); d != m.end(); m.next(d))
	{
		if(!vMark.isMarked(d))
		{
555
			Utils::Quadric<REAL> q ;	// create one quadric
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
556 557 558 559 560 561 562 563 564 565 566 567
			quadric[d] = q ;	// per vertex
			vMark.mark(d) ;
		}
	}

	DartMarker mark(m) ;
	for(Dart d = m.begin(); d != m.end(); m.next(d))
	{
		if(!mark.isMarked(d))
		{
			Dart d1 = m.phi1(d) ;				// for each triangle,
			Dart d_1 = m.phi_1(d) ;				// initialize the quadric of the triangle
568
			Utils::Quadric<REAL> q(this->m_position[d], this->m_position[d1], this->m_position[d_1]) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
569 570 571
			quadric[d] += q ;					// and add the contribution of
			quadric[d1] += q ;					// this quadric to the ones
			quadric[d_1] += q ;					// of the 3 incident vertices
Pierre Kraemer's avatar
Pierre Kraemer committed
572
			mark.markOrbit<FACE>(d) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
573 574 575
		}
	}

576
	CellMarker<EDGE> eMark(m) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
577 578 579 580 581 582 583 584 585 586 587 588 589 590 591
	for(Dart d = m.begin(); d != m.end(); m.next(d))
	{
		if(!eMark.isMarked(d))
		{
			initEdgeInfo(d) ;	// init the edges with their optimal position
			eMark.mark(d) ;		// and insert them in the multimap according to their error
		}
	}

	cur = edges.begin() ; // init the current edge to the first one

	return true ;
}

template <typename PFP>
592
bool EdgeSelector_QEMml<PFP>::nextEdge(Dart& d) const
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
593 594 595 596 597 598 599 600 601 602
{
	if(cur == edges.end() || edges.empty())
		return false ;
	d = (*cur).second ;
	return true ;
}

template <typename PFP>
void EdgeSelector_QEMml<PFP>::updateBeforeCollapse(Dart d)
{
Sauvage's avatar
Sauvage committed
603
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
604

605 606 607
	EdgeInfo *edgeE = &(edgeInfo[d]) ;
	if(edgeE->valid)
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
608

609 610 611
	edgeE = &(edgeInfo[m.phi1(d)]) ;
	if(edgeE->valid)					// remove all
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
612

613 614 615
	edgeE = &(edgeInfo[m.phi_1(d)]) ;	// the concerned edges
	if(edgeE->valid)
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
616 617 618 619
									// from the multimap
	Dart dd = m.phi2(d) ;
	if(dd != d)
	{
620 621 622
		edgeE = &(edgeInfo[m.phi1(dd)]) ;
		if(edgeE->valid)
			edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
623

624 625 626
		edgeE = &(edgeInfo[m.phi_1(dd)]) ;
		if(edgeE->valid)
			edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648
	}
}

/**
 * Update quadric of a vertex
 * Discards quadrics of d and assigns freshly calculated
 * quadrics depending on the actual planes surrounding d
 * @param dart d
 */
template <typename PFP>
void EdgeSelector_QEMml<PFP>::recomputeQuadric(const Dart d, const bool recomputeNeighbors) {
	Dart dFront,dBack ;
	Dart dInit = d ;

	// Init Front
	dFront = dInit ;

	quadric[d].zero() ;

   	do {
   		// Make step
   		dBack = this->m_map.phi2(dFront) ;
649
       	dFront = this->m_map.phi2_1(dFront) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
650 651

       	if (dBack != dFront) { // if dFront is no border
652
           	quadric[d] += Utils::Quadric<REAL>(this->m_position[d],this->m_position[this->m_map.phi2(dFront)],this->m_position[dBack]) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
653 654 655 656 657 658 659 660 661 662
       	}
       	if (recomputeNeighbors)
       		recomputeQuadric(dBack, false) ;

    } while(dFront != dInit) ;
}

template <typename PFP>
void EdgeSelector_QEMml<PFP>::updateAfterCollapse(Dart d2, Dart dd2)
{
Sauvage's avatar
Sauvage committed
663
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
664 665 666 667 668 669 670 671 672 673 674 675 676

	// for local vertex and neighbors
	recomputeQuadric(d2, true) ;

	Dart vit = d2 ;
	do
	{
		updateEdgeInfo(m.phi1(vit), true) ;			// must recompute some edge infos in the
		if(vit == d2 || vit == dd2)					// neighborhood of the collapsed edge
			initEdgeInfo(vit) ;						// various optimizations are applied here by
		else										// treating differently :
			updateEdgeInfo(vit, true) ;

677
		Dart vit2 = m.phi12(m.phi1(vit)) ;		// - edges for which the criteria must be recomputed
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
678 679 680 681 682
		Dart stop = m.phi2(vit) ;					// - edges that must be re-embedded
		do											// - edges for which only the collapsibility must be re-tested
		{
			updateEdgeInfo(vit2, true) ;
			updateEdgeInfo(m.phi1(vit2), false) ;
683
			vit2 = m.phi12(vit2) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
684 685
		} while(vit2 != stop) ;

686
		vit = m.phi2_1(vit) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
687 688 689 690 691
	} while(vit != d2) ;

	cur = edges.begin() ; // set the current edge to the first one
}

692 693 694 695 696 697 698 699 700 701 702
template <typename PFP>
void EdgeSelector_QEMml<PFP>::updateWithoutCollapse()
{
	EdgeInfo& einfo = edgeInfo[(*cur).second] ;
	einfo.valid = false ;
	edges.erase(einfo.it) ;

	//edges.erase(cur) ;
	cur = edges.begin();
}

Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
703 704 705
template <typename PFP>
void EdgeSelector_QEMml<PFP>::initEdgeInfo(Dart d)
{
Sauvage's avatar
Sauvage committed
706
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
707 708 709 710 711 712 713 714 715 716 717
	EdgeInfo einfo ;
	if(m.edgeCanCollapse(d))
		computeEdgeInfo(d, einfo) ;
	else
		einfo.valid = false ;
	edgeInfo[d] = einfo ;
}

template <typename PFP>
void EdgeSelector_QEMml<PFP>::updateEdgeInfo(Dart d, bool recompute)
{
Sauvage's avatar
Sauvage committed
718
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749
	EdgeInfo& einfo = edgeInfo[d] ;
	if(recompute)
	{
		if(einfo.valid)
			edges.erase(einfo.it) ;		// remove the edge from the multimap
		if(m.edgeCanCollapse(d))
			computeEdgeInfo(d, einfo) ;
		else
			einfo.valid = false ;
	}
	else
	{
		if(m.edgeCanCollapse(d))
		{								 	// if the edge can be collapsed now
			if(!einfo.valid)				// but it was not before
				computeEdgeInfo(d, einfo) ;
		}
		else
		{								 // if the edge cannot be collapsed now
			if(einfo.valid)				 // and it was before
			{
				edges.erase(einfo.it) ;
				einfo.valid = false ;
			}
		}
	}
}

template <typename PFP>
void EdgeSelector_QEMml<PFP>::computeEdgeInfo(Dart d, EdgeInfo& einfo)
{
Sauvage's avatar
Sauvage committed
750
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
751 752
	Dart dd = m.phi2(d) ;

753
	Utils::Quadric<REAL> quad ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
754 755 756 757 758 759 760 761 762 763
	quad += quadric[d] ;	// compute the sum of the
	quad += quadric[dd] ;	// two vertices quadrics

	m_positionApproximator->approximate(d) ;

	REAL err = quad(m_positionApproximator->getApprox(d)) ;
	einfo.it = edges.insert(std::make_pair(err, d)) ;
	einfo.valid = true ;
}

764 765 766 767 768 769 770
/************************************************************************************
 *                            Metric based on Face Normal and Area deviation        *
 ************************************************************************************/

template <typename PFP>
bool EdgeSelector_NormalArea<PFP>::init()
{
Sauvage's avatar
Sauvage committed
771
	typename PFP::MAP& m = this->m_map ;
772 773 774 775 776 777 778 779

	bool ok = false ;
	for(typename std::vector<ApproximatorGen<PFP>*>::iterator it = this->m_approximators.begin();
		it != this->m_approximators.end() && !ok;
		++it)
	{
		if((*it)->getApproximatedAttributeName() == "position")
		{
Sauvage's avatar
Sauvage committed
780
//			assert((*it)->getType() == A_MidEdge || (*it)->getType() == A_NormalArea || !"Only MidEdge and NormalArea Approximator are valid") ;
781 782 783 784 785 786 787 788 789 790 791 792 793
			m_positionApproximator = reinterpret_cast<Approximator<PFP, VEC3,EDGE>* >(*it) ;
			ok = true ;
		}
	}

	if(!ok)
		return false ;

	edges.clear() ;

	TraversorE<MAP> travE(m);
	for(Dart dit = travE.begin() ; dit != travE.end() ; dit = travE.next())
	{
794 795 796 797 798
		computeEdgeMatrix(dit);
//		const VEC3 e = Algo::Geometry::vectorOutOfDart<PFP>(m, dit, this->m_position) ;
//		edgeMatrix[dit].identity();
//		edgeMatrix[dit] *= e.norm2();
//		edgeMatrix[dit] -= Geom::transposed_vectors_mult(e,e) ;
799 800 801 802 803 804 805 806 807 808 809 810 811
	}

	for(Dart dit = travE.begin() ; dit != travE.end() ; dit = travE.next())
	{
		initEdgeInfo(dit) ;	// init "edgeInfo" and "edges"
	}

	cur = edges.begin() ; // init the current edge to the first one

	return true ;
}

template <typename PFP>
812
bool EdgeSelector_NormalArea<PFP>::nextEdge(Dart& d) const
813 814 815 816 817 818 819 820 821 822
{
	if(cur == edges.end() || edges.empty())
		return false ;
	d = (*cur).second ;
	return true ;
}

template <typename PFP>
void EdgeSelector_NormalArea<PFP>::updateBeforeCollapse(Dart d)
{
Sauvage's avatar
Sauvage committed
823
	typename PFP::MAP& m = this->m_map ;
824 825
	assert(!m.isBoundaryEdge(d));

826 827 828 829 830 831
	EdgeInfo* edgeE = &(edgeInfo[d]) ;
	if(edgeE->valid)
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}
832

833 834 835 836 837 838 839 840 841 842 843 844 845
	edgeE = &(edgeInfo[m.phi1(d)]) ;
	if(edgeE->valid)					// remove all
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}

	edgeE = &(edgeInfo[m.phi_1(d)]) ;	// the concerned edges
	if(edgeE->valid)
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}
846 847 848

									// from the multimap
	Dart dd = m.phi2(d) ;
849 850 851 852 853 854
	edgeE = &(edgeInfo[m.phi1(dd)]) ;
	if(edgeE->valid)
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}
855

856 857 858 859 860 861
	edgeE = &(edgeInfo[m.phi_1(dd)]) ;
	if(edgeE->valid)
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}
862 863 864
}

template <typename PFP>
Sylvain Thery's avatar
Sylvain Thery committed
865
void EdgeSelector_NormalArea<PFP>::updateAfterCollapse(Dart d2, Dart /*dd2*/)
866
{
Sauvage's avatar
Sauvage committed
867
	typename PFP::MAP& m = this->m_map ;
868 869 870 871 872

	// update the edge matrices
	Traversor2VE<MAP> te (m,d2);
	for(Dart dit = te.begin() ; dit != te.end() ; dit = te.next())
	{
873
		computeEdgeMatrix(dit);
874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899
	}

	// update the multimap

	Traversor2VVaE<MAP> tv (m,d2);
	CellMarker<EDGE> eMark (m);

	for(Dart dit = tv.begin() ; dit != tv.end() ; dit = tv.next())
	{
		Traversor2VE<MAP> te2 (m,dit);
		for(Dart dit2 = te2.begin() ; dit2 != te2.end() ; dit2 = te2.next())
		{
			if (!eMark.isMarked(dit2))
			{
				updateEdgeInfo(dit2) ;
				eMark.mark(dit2);
			}
		}
	}

	cur = edges.begin() ; // set the current edge to the first one
}

template <typename PFP>
void EdgeSelector_NormalArea<PFP>::initEdgeInfo(Dart d)
{
Sauvage's avatar
Sauvage committed
900
	typename PFP::MAP& m = this->m_map ;
901 902 903 904 905 906 907 908 909 910 911
	EdgeInfo einfo ;
	if(m.edgeCanCollapse(d))
		computeEdgeInfo(d, einfo) ;
	else
		einfo.valid = false ;
	edgeInfo[d] = einfo ;
}

template <typename PFP>
void EdgeSelector_NormalArea<PFP>::updateEdgeInfo(Dart d)
{
Sauvage's avatar
Sauvage committed
912
	typename PFP::MAP& m = this->m_map ;
913 914 915 916
	EdgeInfo& einfo = edgeInfo[d] ;

	if(einfo.valid)
		edges.erase(einfo.it) ;		// remove the edge from the multimap
917

918 919 920 921 922 923 924 925 926
	if(m.edgeCanCollapse(d))
		computeEdgeInfo(d, einfo) ;
	else
		einfo.valid = false ;
}

template <typename PFP>
void EdgeSelector_NormalArea<PFP>::computeEdgeInfo(Dart d, EdgeInfo& einfo)
{
Sauvage's avatar
Sauvage committed
927
	typename PFP::MAP& m = this->m_map ;
928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963
	Dart dd = m.phi2(d);
	Geom::Matrix33f M1; // init zero included
	Geom::Matrix33f M2; // init zero included

	assert(! m.isBoundaryEdge(d));

	Traversor2VF<MAP> td (m,d);
	Dart it = td.begin();
	it = td.next();
	Dart it2 = td.next();
	while( it2 != td.end())
	{
		M1 += edgeMatrix[m.phi1(it)];
		it = it2;
		it2 = td.next();
	}

	Traversor2VF<MAP> tdd (m,dd);
	it = tdd.begin();
	it = tdd.next();
	it2 = tdd.next();
	while( it2 != tdd.end())
	{
		M2 += edgeMatrix[m.phi1(it)];
		it = it2;
		it2 = tdd.next();
	}

	m_positionApproximator->approximate(d) ;
	const VEC3& a = m_positionApproximator->getApprox(d) ;

	const VEC3 av1 = a - this->m_position[d] ;
	const VEC3 av2 = a - this->m_position[dd] ;

	REAL err = av1 * (M1 * av1) + av2 * (M2 * av2);

964 965 966 967 968 969 970 971 972 973 974 975
/*
	// TODO : test to normalize by area
	// TODO : not border-safe
 	REAL area = 0.0;
	Traversor2EEaV<MAP> ta (m,d);
	for (Dart dita = ta.begin(); dita != ta.end(); dita=ta.next())
	{
		area += Algo::Geometry::triangleArea<PFP>(m,dita,this->m_position);
	}
	err /= area ; // résultats sensiblment identiques à ceux sans pris en compte de l'aire.
//	err /= area*area ; // ca favorise la contraction des gros triangles : maillages très in-homogènes et qualité géométrique mauvaise
*/
976
	einfo.it = edges.insert(std::make_pair(err, d)) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
977 978 979
	einfo.valid = true ;
}

980 981 982
template <typename PFP>
void EdgeSelector_NormalArea<PFP>::computeEdgeMatrix(Dart d)
{
983
	const typename PFP::VEC3 e = Algo::Surface::Geometry::vectorOutOfDart<PFP>(this->m_map, d, this->m_position) ;
984 985 986 987
	edgeMatrix[d].identity();
	edgeMatrix[d] *= e.norm2();
	edgeMatrix[d] -= Geom::transposed_vectors_mult(e,e) ;
	// TODO : test : try to normalize by area
Sauvage's avatar
Sauvage committed
988
//	edgeMatrix[d] /= e.norm2(); // pas d'amélioration significative par rapport à la version sans normalisation
989 990 991
//	edgeMatrix[d] /= e.norm2() * e.norm2(); // étonnament bon : sur certains maillages équivalant à la QEMml
}

Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
992 993 994 995 996 997 998
/************************************************************************************
 *                                   CURVATURE                                      *
 ************************************************************************************/

template <typename PFP>
bool EdgeSelector_Curvature<PFP>::init()
{
Sauvage's avatar
Sauvage committed
999
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1000 1001 1002 1003 1004 1005 1006 1007

	bool ok = false ;
	for(typename std::vector<ApproximatorGen<PFP>*>::iterator it = this->m_approximators.begin();
		it != this->m_approximators.end() && !ok;
		++it)
	{
		if((*it)->getApproximatedAttributeName() == "position")
		{
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1008 1009
			assert((*it)->getType() != A_hQEM || !"Approximator(hQEM) and selector (EdgeSelector_Curvature) are not compatible") ;
			assert((*it)->getType() != A_hHalfCollapse || !"Approximator(hHalfCollapse) and selector (EdgeSelector_Curvature) are not compatible") ;
1010
			m_positionApproximator = reinterpret_cast<Approximator<PFP, VEC3,EDGE>* >(*it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1011 1012 1013 1014 1015 1016 1017 1018 1019
			ok = true ;
		}
	}

	if(!ok)
		return false ;

	edges.clear() ;

1020
	CellMarker<VERTEX> eMark(m) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035
	for(Dart d = m.begin(); d != m.end(); m.next(d))
	{
		if(!eMark.isMarked(d))
		{
			initEdgeInfo(d) ;	// init the edges with their optimal position
			eMark.mark(d) ;		// and insert them in the multimap according to their error
		}
	}

	cur = edges.begin() ; // init the current edge to the first one

	return true ;
}

template <typename PFP>
1036
bool EdgeSelector_Curvature<PFP>::nextEdge(Dart& d) const
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1037 1038 1039 1040 1041 1042 1043 1044 1045 1046
{
	if(cur == edges.end() || edges.empty())
		return false ;
	d = (*cur).second ;
	return true ;
}

template <typename PFP>
void EdgeSelector_Curvature<PFP>::updateBeforeCollapse(Dart d)
{
Sauvage's avatar
Sauvage committed
1047
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1048

1049 1050 1051
	EdgeInfo *edgeE = &(edgeInfo[d]) ;
	if(edgeE->valid)
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1052

1053 1054 1055
	edgeE = &(edgeInfo[m.phi1(d)]) ;
	if(edgeE->valid)					// remove all
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1056

1057 1058 1059
	edgeE = &(edgeInfo[m.phi_1(d)]) ;	// the concerned edges
	if(edgeE->valid)
		edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1060 1061 1062 1063
									// from the multimap
	Dart dd = m.phi2(d) ;
	if(dd != d)
	{
1064 1065 1066
		edgeE = &(edgeInfo[m.phi1(dd)]) ;
		if(edgeE->valid)
			edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1067

1068 1069 1070
		edgeE = &(edgeInfo[m.phi_1(dd)]) ;
		if(edgeE->valid)
			edges.erase(edgeE->it) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1071 1072 1073 1074 1075 1076
	}
}

template <typename PFP>
void EdgeSelector_Curvature<PFP>::updateAfterCollapse(Dart d2, Dart dd2)
{
Sauvage's avatar
Sauvage committed
1077
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1078

1079 1080
	normal[d2] = Algo::Surface::Geometry::vertexNormal<PFP>(m, d2, this->m_position) ;
	Algo::Surface::Geometry::computeCurvatureVertex_NormalCycles<PFP>(m, d2, radius, this->m_position, normal, edgeangle, kmax, kmin, Kmax, Kmin, Knormal) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1081 1082 1083 1084 1085

	Dart vit = d2 ;
	do
	{
		Dart nVert = m.phi1(vit) ;
1086 1087
		normal[nVert] = Algo::Surface::Geometry::vertexNormal<PFP>(m, nVert, this->m_position) ;
		Algo::Surface::Geometry::computeCurvatureVertex_NormalCycles<PFP>(m, nVert, radius, this->m_position, normal, edgeangle, kmax, kmin, Kmax, Kmin, Knormal) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1088 1089 1090 1091 1092 1093

		updateEdgeInfo(m.phi1(vit), false) ;			// must recompute some edge infos in the
		if(vit == d2 || vit == dd2)						// neighborhood of the collapsed edge
		{
			initEdgeInfo(vit) ;							// various optimizations are applied here by
														// treating differently :
1094
			Dart vit2 = m.phi12(m.phi1(vit)) ;		// - edges for which the criteria must be recomputed
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1095 1096 1097 1098 1099
			Dart stop = m.phi2(vit) ;					// - edges that must be re-embedded
			do											// - edges for which only the collapsibility must be re-tested
			{
				updateEdgeInfo(vit2, false) ;
				updateEdgeInfo(m.phi1(vit2), false) ;
1100
				vit2 = m.phi12(vit2) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1101 1102 1103 1104 1105
			} while(vit2 != stop) ;
		}
		else
			updateEdgeInfo(vit, true) ;

1106
		vit = m.phi2_1(vit) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1107 1108 1109 1110 1111
	} while(vit != d2) ;

	cur = edges.begin() ; // set the current edge to the first one
}

1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122
template <typename PFP>
void EdgeSelector_Curvature<PFP>::updateWithoutCollapse()
{
	EdgeInfo& einfo = edgeInfo[(*cur).second] ;
	einfo.valid = false ;
	edges.erase(einfo.it) ;

	//edges.erase(cur) ;
	cur = edges.begin();
}

Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1123 1124 1125
template <typename PFP>
void EdgeSelector_Curvature<PFP>::initEdgeInfo(Dart d)
{
Sauvage's avatar
Sauvage committed
1126
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137
	EdgeInfo einfo ;
	if(m.edgeCanCollapse(d))
		computeEdgeInfo(d, einfo) ;
	else
		einfo.valid = false ;
	edgeInfo[d] = einfo ;
}

template <typename PFP>
void EdgeSelector_Curvature<PFP>::updateEdgeInfo(Dart d, bool recompute)
{
Sauvage's avatar
Sauvage committed
1138
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169
	EdgeInfo& einfo = edgeInfo[d] ;
	if(recompute)
	{
		if(einfo.valid)
			edges.erase(einfo.it) ;			// remove the edge from the multimap
		if(m.edgeCanCollapse(d))
			computeEdgeInfo(d, einfo) ;
		else
			einfo.valid = false ;
	}
	else
	{
		if(m.edgeCanCollapse(d))
		{									// if the edge can be collapsed now
			if(!einfo.valid)				// but it was not before
				computeEdgeInfo(d, einfo) ;
		}
		else
		{									// if the edge cannot be collapsed now
			if(einfo.valid)					// and it was before
			{
				edges.erase(einfo.it) ;
				einfo.valid = false ;
			}
		}
	}
}

template <typename PFP>
void EdgeSelector_Curvature<PFP>::computeEdgeInfo(Dart d, EdgeInfo& einfo)
{
Sauvage's avatar
Sauvage committed
1170
	typename PFP::MAP& m = this->m_map ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1171 1172
	Dart dd = m.phi2(d) ;

1173 1174
	unsigned int v1 = m.template getEmbedding<VERTEX>(d) ;
	unsigned int v2 = m.template getEmbedding<VERTEX>(dd) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1175 1176 1177 1178 1179 1180 1181

	m_positionApproximator->approximate(d) ;

	// temporary edge collapse
	Dart d2 = m.phi2(m.phi_1(d)) ;
	Dart dd2 = m.phi2(m.phi_1(dd)) ;
	m.extractTrianglePair(d) ;
1182
	unsigned int newV = m.template setOrbitEmbeddingOnNewCell<VERTEX>(d2) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1183 1184 1185
	this->m_position[newV] = m_positionApproximator->getApprox(d) ;

	// compute things on the coarse version of the mesh
1186 1187
	normal[newV] = Algo::Surface::Geometry::vertexNormal<PFP>(m, d2, this->m_position) ;
	Algo::Surface::Geometry::computeCurvatureVertex_NormalCycles<PFP>(m, d2, radius, this->m_position, normal, edgeangle, kmax, kmin, Kmax, Kmin, Knormal) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1188

1189 1190 1191
//	VEC3 norm = normal[newV] ;
	REAL mCurv = (kmax[newV] + kmin[newV]) / REAL(2) ;
//	VEC3 cDir1 = Kmax[newV] ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1192 1193 1194

	// vertex split to reset the initial connectivity and embeddings
	m.insertTrianglePair(d, d2, dd2) ;
1195 1196
	m.template setOrbitEmbedding<VERTEX>(d, v1) ;
	m.template setOrbitEmbedding<VERTEX>(dd, v2) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1197 1198 1199

	REAL err = 0 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
1200 1201
//	REAL norm_deviation_1 = REAL(1) / fabs(norm * normal[v1]) ;
//	REAL norm_deviation_2 = REAL(1) / fabs(norm * normal[v2]) ;
1202
//	err += norm_deviation_1 + norm_deviation_2 ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1203

Pierre Kraemer's avatar
Pierre Kraemer committed
1204 1205
	REAL mCurv_deviation_1 = fabs(mCurv - (kmax[v1] + kmin[v1] / REAL(2))) ;
	REAL mCurv_deviation_2 = fabs(mCurv - (kmax[v2] + kmin[v2] / REAL(2))) ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1206 1207
	err += mCurv_deviation_1 + mCurv_deviation_2 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
1208 1209
//	REAL cDir1_deviation_1 = REAL(1) / fabs(cDir1 * Kmax[v1]) ;
//	REAL cDir1_deviation_2 = REAL(1) / fabs(cDir1 * Kmax[v2]) ;
1210
//	err += cDir1_deviation_1 + cDir1_deviation_2 ;
Kenneth Vanhoey's avatar
Kenneth Vanhoey committed
1211 1212 1213 1214 1215

	einfo.it = edges.insert(std::make_pair(err, d)) ;
	einfo.valid = true ;
}

1216 1217 1218 1219 1220
/************************************************************************************
 *                            CURVATURE TENSOR                                      *
 ************************************************************************************/

template <typename PFP>
1221
bool EdgeSelector_CurvatureTensor<PFP>::init()
1222
{
Sauvage's avatar
Sauvage committed
1223
	typename PFP::MAP& m = this->m_map ;
1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242

	bool ok = false ;
	for(typename std::vector<ApproximatorGen<PFP>*>::iterator it = this->m_approximators.begin();
		it != this->m_approximators.end() && !ok;
		++it)
	{
		if((*it)->getApproximatedAttributeName() == "position")
		{
			assert((*it)->getType() == A_MidEdge || !"Only MidEdge Approximator is valid") ;
			m_positionApproximator = reinterpret_cast<Approximator<PFP, VEC3,EDGE>* >(*it) ;
			ok = true ;
		}
	}

	if(!ok)
		return false ;

	edges.clear() ;

1243
	TraversorE<MAP> travE(m);
1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259
//	for(Dart dit = travE.begin() ; dit != travE.end() ; dit = travE.next())
//	{
//		computeEdgeMatrix(dit);
//	}

	for(Dart dit = travE.begin() ; dit != travE.end() ; dit = travE.next())
	{
		initEdgeInfo(dit) ;	// init "edgeInfo" and "edges"
	}

	cur = edges.begin() ; // init the current edge to the first one

	return true ;
}

template <typename PFP>
1260
bool EdgeSelector_CurvatureTensor<PFP>::nextEdge(Dart& d) const
1261 1262 1263 1264 1265 1266 1267 1268
{
	if(cur == edges.end() || edges.empty())
		return false ;
	d = (*cur).second ;
	return true ;
}

template <typename PFP>
1269
void EdgeSelector_CurvatureTensor<PFP>::updateBeforeCollapse(Dart d)
1270
{
Sauvage's avatar
Sauvage committed
1271
	typename PFP::MAP& m = this->m_map ;
1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312
	assert(!m.isBoundaryEdge(d));

	EdgeInfo* edgeE = &(edgeInfo[d]) ;
	if(edgeE->valid)
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}

	edgeE = &(edgeInfo[m.phi1(d)]) ;
	if(edgeE->valid)					// remove all
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}

	edgeE = &(edgeInfo[m.phi_1(d)]) ;	// the concerned edges
	if(edgeE->valid)
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}

									// from the multimap
	Dart dd = m.phi2(d) ;
	edgeE = &(edgeInfo[m.phi1(dd)]) ;
	if(edgeE->valid)
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}

	edgeE = &(edgeInfo[m.phi_1(dd)]) ;
	if(edgeE->valid)
	{
		edges.erase(edgeE->it) ;
		edgeE->valid = false;
	}
}

template <typename PFP>
Sylvain Thery's avatar
Sylvain Thery committed
1313
void EdgeSelector_CurvatureTensor<PFP>::updateAfterCollapse(Dart d2, Dart /*dd2*/)
1314
{
Sauvage's avatar
Sauvage committed
1315
	typename PFP::MAP& m = this->m_map ;
1316
	CellMarkerStore<EDGE> eMark (m);
1317

1318 1319 1320 1321 1322 1323 1324 1325 1326
	// update edge angles
	Traversor2VF<MAP> tf (m,d2);
	for(Dart dit = tf.begin(); dit != tf.end(); dit = tf.next())
	{
		Traversor2FE<MAP> te (m,dit);
		for(Dart dit2 = te.begin(); dit2 != te.end(); dit2=te.next())
		{
			if (!eMark.isMarked(dit2))
			{
1327
				edgeangle[dit2] = Algo::Surface::Geometry::computeAngleBetweenNormalsOnEdge<PFP>(m, dit2, this->m_position) ;