songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup + some optimizations.

This commit is contained in:
Guillaume Damiand 2014-12-23 09:34:09 +01:00
parent 91ede0a444
commit 919bf8af74
8 changed files with 237 additions and 470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -1178,7 +1178,6 @@ namespace CGAL {
Helper::template Foreach_enabled_attributes
<internal::Correct_invalid_attributes_functor<Self> >::
run(this,it,&marks);
}
for ( int i=0; i<=dimension; ++i)
@ -1708,6 +1707,7 @@ namespace CGAL {
* @param adart1 a first dart.
* @param adart2 a second dart.
* @param update_attributes a boolean to update the enabled attributes.
* (deprecated, now we use are_attributes_automatically_managed())
*/
template<unsigned int i>
void link_beta(Dart_handle adart1, Dart_handle adart2,
@ -2111,6 +2111,7 @@ namespace CGAL {
* @param adart1 the first dart.
* @param adart2 the second dart.
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @pre is_sewable<i>(adart1, adart2).
*/
template<unsigned int i>
@ -2351,7 +2352,7 @@ namespace CGAL {
else if ( i==1 ) unsew_1(adart);
else unsew_for_involution<i>(adart);
}
// else topo_unsew<i>(adart);
else topo_unsew<i>(adart);
}
/** Unsew by betai the given dart plus all the required darts
@ -2359,6 +2360,7 @@ namespace CGAL {
* are updated only if update_attributes==true.
* @param adart first dart.
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @pre !adart->is_free(i).
*/
template<unsigned int i>
@ -3682,14 +3684,14 @@ namespace CGAL {
/** Sets the automatic_attributes_management boolean.
*/
void set_automatic_attributes_management(bool automatic_attributes_management)
void set_automatic_attributes_management(bool newval)
{
if (this->automatic_attributes_management == false && automatic_attributes_management == true)
if (this->automatic_attributes_management == false && newval == true)
{
correct_invalid_attributes();
}
this->automatic_attributes_management = automatic_attributes_management;
this->automatic_attributes_management = newval;
}
protected:
@ -3714,7 +3716,8 @@ namespace CGAL {
/// Number of marked darts for each used marks.
mutable size_type mnb_marked_darts[NB_MARKS];
/// Automatic management of the attributes: true means attributes are allways maintained updated
/// Automatic management of the attributes:
/// true means attributes are always maintained updated during operations.
bool automatic_attributes_management;
/// Tuple of unary and binary functors (for all non void attributes).

24
Combinatorial_map/include/CGAL/Combinatorial_map_insertions.h
View File

@ -30,6 +30,7 @@ namespace CGAL
* @param amap the used combinatorial map.
* @param adart a dart of the edge (!=NULL && !=null_dart_handle).
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @return a dart of the new vertex.
*/
template<class CMap>
@ -72,7 +73,7 @@ insert_cell_0_in_cell_1( CMap& amap, typename CMap::Dart_handle adart,
amap.basic_link_beta_1(*it, d1);
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes)
{
// We copy all the attributes except for dim=0
CMap::Helper::template Foreach_enabled_attributes_except
@ -100,7 +101,7 @@ insert_cell_0_in_cell_1( CMap& amap, typename CMap::Dart_handle adart,
amap.free_mark(m);
amap.free_mark(mark);
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes)
{
CGAL::internal::Degroup_attribute_functor_run<CMap, 1>::
run(&amap, adart, amap.template beta<1>(adart));
@ -118,6 +119,7 @@ insert_cell_0_in_cell_1( CMap& amap, typename CMap::Dart_handle adart,
* @param amap the used combinatorial map.
* @param adart a dart of the facet to triangulate.
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @return A dart incident to the new vertex.
*/
template < class CMap >
@ -175,7 +177,7 @@ insert_cell_0_in_cell_2( CMap& amap, typename CMap::Dart_handle adart,
if ( prev!=amap.null_handle )
amap.template basic_link_beta_for_involution<2>(prev, n1);
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes)
{
CGAL::internal::Set_i_attribute_of_dart_functor<CMap, 0>::
run(&amap, n1, ah);
@ -201,7 +203,7 @@ insert_cell_0_in_cell_2( CMap& amap, typename CMap::Dart_handle adart,
nn2=amap.create_dart();
amap.link_beta_0(amap.beta(cur, dim), nn2);
amap.basic_link_beta_for_involution(n2, nn2, dim);
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes)
{
CGAL::internal::Set_i_attribute_of_dart_functor<CMap, 0>::
run(&amap, nn2, ah);
@ -261,7 +263,7 @@ insert_cell_0_in_cell_2( CMap& amap, typename CMap::Dart_handle adart,
amap.unmark(amap.beta(*itd, dim), treated);
}
if ( *itd!=adart )
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes)
{
CGAL::internal::Degroup_attribute_functor_run<CMap, 2>::
run(&amap, adart, *itd);
@ -281,6 +283,7 @@ insert_cell_0_in_cell_2( CMap& amap, typename CMap::Dart_handle adart,
* @param amap the used combinatorial map.
* @param adart1 a first dart of the facet (!=NULL && !=null_dart_handle).
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @return a dart of the new edge, not incident to the vertex of adart1.
*/
template<class CMap>
@ -351,7 +354,7 @@ insert_dangling_cell_1_in_cell_2( CMap& amap,
(amap.beta(it1, dim, CGAL_BETAINV(s1), 2), d2, dim);
}
}
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes)
{
CGAL::internal::Set_i_attribute_of_dart_functor<CMap, 0>::
run(&amap, d1, ah);
@ -405,6 +408,7 @@ bool is_insertable_cell_1_in_cell_2(const CMap& amap,
* @param adart1 a first dart of the facet (!=NULL && !=null_dart_handle).
* @param adart2 a second dart of the facet. If NULL insert a dangling edge.
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @return a dart of the new edge, and not incident to the
* same vertex than adart1.
*/
@ -415,7 +419,8 @@ insert_cell_1_in_cell_2(CMap& amap,
typename CMap::Dart_handle adart2,
bool update_attributes=true)
{
if ( adart2==amap.null_handle ) return insert_dangling_cell_1_in_cell_2(amap,adart1);
if ( adart2==amap.null_handle )
return insert_dangling_cell_1_in_cell_2(amap,adart1);
CGAL_assertion(is_insertable_cell_1_in_cell_2<CMap>(amap, adart1, adart2));
@ -490,7 +495,7 @@ insert_cell_1_in_cell_2(CMap& amap,
amap.mark(it1,treated);
}
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes)
{
CGAL::internal::Degroup_attribute_functor_run<CMap, 2>::run(&amap, d1, d2);
}
@ -580,6 +585,7 @@ bool is_insertable_cell_2_in_cell_3(const CMap& amap,
* @param afirst iterator on the begining of the path.
* @param alast iterator on the end of the path.
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @return a dart of the new 2-cell.
*/
template<class CMap, class InputIterator>
@ -702,7 +708,7 @@ insert_cell_2_in_cell_3(CMap& amap, InputIterator afirst, InputIterator alast,
if ( withBeta3 )
{ // Here we cannot use Degroup_attribute_functor_run as new darts do not
// have their 3-attribute
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes)
{
CGAL::internal::Degroup_attribute_functor_run<CMap, 3>::
run(&amap, first, amap.template beta<3>(first));

148
Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
View File

@ -82,6 +82,8 @@ namespace CGAL
* (i+1)-cells.
* @param amap the used combinatorial map.
* @param adart a dart of the i-cell to remove.
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @return the number of deleted darts.
*/
template<class CMap, unsigned int i, unsigned int nmi>
@ -115,7 +117,7 @@ namespace CGAL
++res;
}
if (update_attributes)
if (amap.are_attributes_automatically_managed() && update_attributes)
{
// We group the two (i+1)-cells incident if they exist.
if ( dg1!=amap.null_handle )
@ -167,9 +169,13 @@ namespace CGAL
amap.template basic_link_beta<i>(d1, d2);
amap.mark(d1, mark_modified_darts);
amap.mark(d2, mark_modified_darts);
first_modified_darts.push_back(d1);
modified_darts.push_back(d2);
// TODO push only one out of two dart ?
if (amap.are_attributes_automatically_managed() && update_attributes)
{
first_modified_darts.push_back(d1);
modified_darts.push_back(d2);
// TODO push only one out of two dart ?
}
/*if ( i==1 )
{
d2->basic_link_beta(d1, 0);
@ -184,7 +190,10 @@ namespace CGAL
amap.template unlink_beta<i>(d1);
CGAL_assertion( !amap.is_marked(d1, mark_modified_darts) );
amap.mark(d1, mark_modified_darts);
first_modified_darts.push_back(d1);
if (amap.are_attributes_automatically_managed() && update_attributes)
{
first_modified_darts.push_back(d1);
}
}
}
}
@ -195,7 +204,10 @@ namespace CGAL
amap.template unlink_beta<iinv>(d2);
CGAL_assertion( !amap.is_marked(d2, mark_modified_darts) );
amap.mark(d2, mark_modified_darts);
modified_darts.push_back(d2);
if (amap.are_attributes_automatically_managed() && update_attributes)
{
modified_darts.push_back(d2);
}
}
}
}
@ -209,12 +221,15 @@ namespace CGAL
amap.template unlink_beta<iinv>(d1);
CGAL_assertion( !amap.is_marked(d1, mark_modified_darts) );
amap.mark(d1, mark_modified_darts);
modified_darts.push_back(d1);
if (amap.are_attributes_automatically_managed() && update_attributes)
{
modified_darts.push_back(d1);
}
}
}
}
if (update_attributes)
if (amap.are_attributes_automatically_managed() && update_attributes)
{
// We test the split of all the incident cells for all the non
// void attributes.
@ -269,6 +284,8 @@ namespace CGAL
/** Remove a d-cell, in a d-map (special case).
* @param amap the used combinatorial map.
* @param adart a dart of the volume to remove.
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @return the number of deleted darts.
*/
template<class CMap,unsigned int i>
@ -299,18 +316,21 @@ namespace CGAL
if ( !amap.template is_free<CMap::dimension>(*it) &&
!amap.is_marked(amap.template beta<CMap::dimension>(*it), mark) )
{
modified_darts.push_back(amap.template beta<CMap::dimension>(*it));
if (amap.are_attributes_automatically_managed() && update_attributes)
{
modified_darts.push_back(amap.template beta<CMap::dimension>(*it));
}
amap.template unlink_beta_for_involution<CMap::dimension>(*it);
}
}
if (update_attributes)
if (amap.are_attributes_automatically_managed() && update_attributes)
{
// We test the split of all the incident cells for all the non
// void attributes.
CMap::Helper::template Foreach_enabled_attributes_except
<CGAL::internal::Test_split_attribute_functor<CMap,i>,
CMap::dimension>::run(&amap, modified_darts);
<CGAL::internal::Test_split_attribute_functor<CMap,i>,
CMap::dimension>::run(&amap, modified_darts);
}
// We remove all the darts of the d-cell.
@ -332,12 +352,14 @@ namespace CGAL
* @param amap the used combinatorial map.
* @param adart a dart of the vertex to remove.
* @param update_attributes a boolean to update the enabled attributes
* (deprecated, now we use are_attributes_automatically_managed())
* @return the number of deleted darts.
*/
template<class CMap,unsigned int nmi>
struct Remove_cell_functor<CMap,0,nmi>
{
static size_t run(CMap& amap, typename CMap::Dart_handle adart, bool update_attributes)
static size_t run(CMap& amap, typename CMap::Dart_handle adart,
bool update_attributes)
{
CGAL_assertion( (is_removable<CMap,0>(amap,adart)) );
@ -361,7 +383,7 @@ namespace CGAL
++res;
}
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes )
{
// We group the two edges incident if they exist.
if ( dg1!=amap.null_handle )
@ -387,14 +409,20 @@ namespace CGAL
{
amap.basic_link_beta_1(amap.template beta<0>(*it),
amap.template beta<1>(*it));
modified_darts.push_back(amap.template beta<0>(*it));
modified_darts2.push_back(amap.template beta<1>(*it));
// TODO push only one out of two dart ?
if (amap.are_attributes_automatically_managed() && update_attributes)
{
modified_darts.push_back(amap.template beta<0>(*it));
modified_darts2.push_back(amap.template beta<1>(*it));
// TODO push only one out of two dart ?
}
}
else
{
amap.template dart_unlink_beta<1>(amap.template beta<0>(*it));
modified_darts.push_back(amap.template beta<0>(*it));
if (amap.are_attributes_automatically_managed() && update_attributes)
{
modified_darts.push_back(amap.template beta<0>(*it));
}
}
for ( unsigned int j=2; j<=CMap::dimension; ++j )
@ -412,7 +440,10 @@ namespace CGAL
if ( !amap.template is_free<1>(*it) )
{
amap.template dart_unlink_beta<0>(amap.template beta<1>(*it));
modified_darts2.push_back(amap.template beta<1>(*it));
if (amap.are_attributes_automatically_managed() && update_attributes)
{
modified_darts2.push_back(amap.template beta<1>(*it));
}
}
for ( unsigned int j=2; j<=CMap::dimension; ++j )
@ -423,7 +454,7 @@ namespace CGAL
}
}
if (amap.are_attributes_automatically_managed())
if (amap.are_attributes_automatically_managed() && update_attributes)
{
// We test the split of all the incident cells for all the non
// void attributes.
@ -543,10 +574,13 @@ namespace CGAL
++res;
}
// We group the two (i+1)-cells incident if they exist.
if ( dg1!=amap.null_handle )
CGAL::internal::Group_attribute_functor_run<CMap,i-1>::
run(&amap, dg1, dg2);
if ( amap.are_attributes_automatically_managed() )
{
// We group the two (i+1)-cells incident if they exist.
if ( dg1!=amap.null_handle )
CGAL::internal::Group_attribute_functor_run<CMap,i-1>::
run(&amap, dg1, dg2);
}
// During the operation, we store in modified_darts the darts modified
// to test after the loop the non void attributes that are split.
@ -583,9 +617,12 @@ namespace CGAL
amap.template basic_link_beta_for_involution<i>(d1, d2);
amap.mark(d1, mark_modified_darts);
amap.mark(d2, mark_modified_darts);
modified_darts.push_back(d1);
modified_darts.push_back(d2);
// TODO push only one out of two dart ?
if ( amap.are_attributes_automatically_managed() )
{
modified_darts.push_back(d1);
modified_darts.push_back(d2);
// TODO push only one out of two dart ?
}
}
else
{
@ -594,7 +631,10 @@ namespace CGAL
amap.template unlink_beta<i>(d1);
CGAL_assertion( !amap.is_marked(d1, mark_modified_darts) );
amap.mark(d1, mark_modified_darts);
modified_darts.push_back(d1);
if ( amap.are_attributes_automatically_managed() )
{
modified_darts.push_back(d1);
}
}
}
}
@ -605,7 +645,10 @@ namespace CGAL
amap.template unlink_beta<i>(d2);
CGAL_assertion( !amap.is_marked(d2, mark_modified_darts) );
amap.mark(d2, mark_modified_darts);
modified_darts.push_back(d2);
if ( amap.are_attributes_automatically_managed() )
{
modified_darts.push_back(d2);
}
}
}
}
@ -618,16 +661,22 @@ namespace CGAL
amap.template unlink_beta<i>(d1);
CGAL_assertion( !amap.is_marked(d1, mark_modified_darts) );
amap.mark(d1, mark_modified_darts);
modified_darts.push_back(d1);
if ( amap.are_attributes_automatically_managed() )
{
modified_darts.push_back(d1);
}
}
}
}
// We test the split of all the incident cells for all the non
// void attributes.
CMap::Helper::template Foreach_enabled_attributes_except
if ( amap.are_attributes_automatically_managed() )
{
// We test the split of all the incident cells for all the non
// void attributes.
CMap::Helper::template Foreach_enabled_attributes_except
<CGAL::internal::Test_split_attribute_functor<CMap,i>, i>::
run(&amap, modified_darts, mark_modified_darts);
}
// We remove all the darts of the i-cell.
for ( it=to_erase.begin(); it!=to_erase.end(); ++it )
@ -691,10 +740,13 @@ namespace CGAL
++res;
}
// We group the two vertices incident if they exist.
if ( dg1!=amap.null_handle )
CGAL::internal::Group_attribute_functor_run<CMap, 0, 1>::
if ( amap.are_attributes_automatically_managed() )
{
// We group the two vertices incident if they exist.
if ( dg1!=amap.null_handle )
CGAL::internal::Group_attribute_functor_run<CMap, 0, 1>::
run(&amap, dg1, dg2);
}
// During the operation, we store in modified_darts the darts modified
// by beta0 to test after the loop non void attributes that are split.
@ -715,14 +767,20 @@ namespace CGAL
{
/*modified_darts2.push_back((*it)->template beta<0>());
if ( (*it)->beta(0)!=(*it)->beta(1) )*/
modified_darts.push_back(amap.template beta<1>(*it));
if ( amap.are_attributes_automatically_managed() )
{
modified_darts.push_back(amap.template beta<1>(*it));
}
amap.basic_link_beta_1(amap.template beta<0>(*it),
amap.template beta<1>(*it));
}
}
else
{
modified_darts2.push_back(amap.template beta<0>(*it));
if ( amap.are_attributes_automatically_managed() )
{
modified_darts2.push_back(amap.template beta<0>(*it));
}
amap.template dart_unlink_beta<1>(amap.template beta<0>(*it));
}
}
@ -730,7 +788,10 @@ namespace CGAL
{
if ( !amap.template is_free<1>(*it) )
{
modified_darts.push_back(amap.template beta<1>(*it));
if ( amap.are_attributes_automatically_managed() )
{
modified_darts.push_back(amap.template beta<1>(*it));
}
amap.template dart_unlink_beta<0>(amap.template beta<1>(*it));
}
}
@ -743,11 +804,14 @@ namespace CGAL
CGAL_assertion( amap.is_whole_map_unmarked(mark) );
amap.free_mark(mark);
// We test the split of all the incident cells for all the non
// void attributes.
CMap::Helper::template Foreach_enabled_attributes_except
if ( amap.are_attributes_automatically_managed() )
{
// We test the split of all the incident cells for all the non
// void attributes.
CMap::Helper::template Foreach_enabled_attributes_except
<CGAL::internal::Test_split_attribute_functor<CMap,1>, 1>::
run(&amap, modified_darts, modified_darts2);
}
#ifdef CGAL_CMAP_TEST_VALID_CONTRACTIONS
CGAL_assertion( amap.is_valid() );

13
Combinatorial_map/include/CGAL/internal/Combinatorial_map_internal_functors.h
View File

@ -290,8 +290,8 @@ struct Correct_invalid_attributes_functor
unsigned int nb=0;
bool found_dart = false;
for ( CGAL::CMap_dart_iterator_of_cell<CMap,i>
it(*amap, adart); it.cont(); ++it, ++nb )
for ( CGAL::CMap_dart_iterator_basic_of_cell<CMap,i>
it(*amap, adart, amark); it.cont(); ++it, ++nb )
{
if ( a!=amap->template attribute<i>(it) )
{
@ -312,18 +312,13 @@ struct Correct_invalid_attributes_functor
amap->template set_dart_of_attribute<i>(a,adart);
}
// If the cells has less darts than the ref counter of the i-attribute,
// If the i-cell has less darts than the ref counter of the i-attribute,
// the i-attribute is shared by different cells => we duplicate it.
if ( nb!=amap->template get_attribute<i>(a).get_nb_refs() )
{
typename CMap::template Attribute_handle<i>::type
a2=amap->template create_attribute<i>(amap->template get_attribute<i>(a));
for ( CGAL::CMap_dart_iterator_of_cell<CMap,i>
it(*amap, adart); it.cont(); ++it )
{
amap->template set_dart_attribute<i>(it, a2);
}
amap->template set_attribute<i>(adart, a2);
}
}
};

3
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
View File

@ -52,7 +52,8 @@ include_directories(${QGLVIEWER_INCLUDE_DIR})
include_directories(BEFORE . ../../include/)
# ui file, created wih Qt Designer
qt4_wrap_ui(uis MainWindow.ui CreateMesh.ui CreateMenger.ui CreateSierpinskiCarpet.ui CreateSierpinskiTriangle.ui)
qt4_wrap_ui(uis MainWindow.ui CreateMesh.ui CreateMenger.ui
CreateSierpinskiCarpet.ui CreateSierpinskiTriangle.ui)
# qrc files (resources files, that contain icons, at least)
qt4_add_resources (RESOURCE_FILES ./Linear_cell_complex_3.qrc)

449
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
View File

@ -16,7 +16,8 @@
// $Id$
//
// Author(s) : Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
// Kumar Snehasish <kumar.snehasish@gmail.com>
// Contributor(s): Kumar Snehasish <kumar.snehasish@gmail.com>
// Sylvain Brandel <sylvain.brandel@liris.cnrs.fr>
//
#include "MainWindow.h"
#include <CGAL/Delaunay_triangulation_3.h>
@ -1197,7 +1198,6 @@ void MainWindow::onMengerInc()
{
scene.lcc->set_update_attributes(false);
}
std::cout << "automatic_attributes_management=" << scene.lcc->are_attributes_automatically_managed() << std::endl;
std::vector<Dart_handle> edges;
std::vector<Dart_handle> faces;
@ -1284,10 +1284,6 @@ void MainWindow::onMengerInc()
update_volume_list_add(scene.lcc->attribute<3>(mengerVolumes[i]));
}
// validate_attributes is called in set_update_attributes
// std::cout << "validate scene..." << std::endl;
// scene.lcc->validate_attributes();
scene.lcc->set_update_attributes(true);
}
@ -1732,15 +1728,13 @@ void MainWindow::onMengerDec()
void MainWindow::on_actionCreate_Sierpinski_Carpet_triggered ()
{
std::cout << "on_actionCreate_Sierpinski_Carpet_triggered" << std::endl;
neverUpdateAttributes = dialogsierpinskicarpet.never->isChecked();
duringConstructionUpdateAttributes = dialogsierpinskicarpet.during->isChecked();
afterConstructionUpdateAttributes = dialogsierpinskicarpet.after->isChecked();
updateAttributesMethodStdMap = dialogsierpinskicarpet.stdmap->isChecked();
updateAttributesMethodTraversal = dialogsierpinskicarpet.traversal->isChecked();
computeGeometry = false;
// par défaut la géométrie peut être calculée après construction
// By default, the geometry will be computed after the construction
isComputableGeometry = true;
dialogsierpinskicarpet.level->disconnect(this);
@ -1797,15 +1791,12 @@ void MainWindow::onSierpinskiCarpetOk()
void MainWindow::onSierpinskiCarpetChangeLevel(int newLevel)
{
// std::cout << "onSierpinskiCarpetChangeLevel, newLevel=" << newLevel << std::endl;
while ( newLevel > sierpinskiCarpetLevel ) onSierpinskiCarpetInc();
while ( newLevel < sierpinskiCarpetLevel ) onSierpinskiCarpetDec();
}
void MainWindow::onSierpinskiCarpetNeverUpdateAttributes(bool newValue)
{
std::cout << "onSierpinskiCarpetNeverUpdateAttributes, newValue=" << newValue << std::endl;
if (afterConstructionUpdateAttributes)
{
dialogsierpinskicarpet.groupBox2->setEnabled(false);
@ -1818,8 +1809,6 @@ void MainWindow::onSierpinskiCarpetNeverUpdateAttributes(bool newValue)
void MainWindow::onSierpinskiCarpetDuringConstructionUpdateAttributes(bool newValue)
{
std::cout << "onSierpinskiCarpetDuringConstructionUpdateAttributes, newValue=" << newValue << std::endl;
if (afterConstructionUpdateAttributes)
{
dialogsierpinskicarpet.groupBox2->setEnabled(false);
@ -1832,8 +1821,6 @@ void MainWindow::onSierpinskiCarpetDuringConstructionUpdateAttributes(bool newVa
void MainWindow::onSierpinskiCarpetAfterConstructionUpdateAttributes(bool newValue)
{
std::cout << "onSierpinskiCarpetAfterConstructionUpdateAttributes, newValue=" << newValue << std::endl;
if (!afterConstructionUpdateAttributes)
{
dialogsierpinskicarpet.groupBox2->setEnabled(true);
@ -1846,25 +1833,18 @@ void MainWindow::onSierpinskiCarpetAfterConstructionUpdateAttributes(bool newVal
void MainWindow::onSierpinskiCarpetUpdateAttributesMethodStdMap(bool newValue)
{
std::cout << "onSierpinskiCarpetUpdateAttributesMethodStdMap, newValue=" << newValue << std::endl;
updateAttributesMethodStdMap = true;
updateAttributesMethodTraversal = false;
}
void MainWindow::onSierpinskiCarpetUpdateAttributesMethodTraversal(bool newValue)
{
std::cout << "onSierpinskiCarpetUpdateAttributesMethodTraversal, newValue=" << newValue << std::endl;
updateAttributesMethodStdMap = false;
updateAttributesMethodTraversal = true;
}
void MainWindow::onSierpinskiCarpetComputeGeometry(bool newValue)
{
std::cout << "onSierpinskiComputeGeometry, newValue=" << newValue << std::endl;
sierpinski_carpet_compute_geometry();
computeGeometry = false;
@ -1873,7 +1853,6 @@ void MainWindow::onSierpinskiCarpetComputeGeometry(bool newValue)
emit(sceneChanged());
}
void MainWindow::onSierpinskiCarpetInc()
{
#ifdef CGAL_PROFILE_LCC_DEMO
@ -1885,10 +1864,10 @@ void MainWindow::onSierpinskiCarpetInc()
if (computeGeometry)
{
// ça veut dire que la géométrie pouvait être calculée après construction mais qu'elle ne l'a pas été
// Here case where the geometry could be computed after the construction, but it was not updated.
computeGeometry = false;
dialogsierpinskicarpet.computeGeometry->setEnabled(false);
// => on ne pourra plus jamais la calculer (seul endroit où ce booléen est modifié)
// => geometry will not be computed later.
isComputableGeometry = false;
}
@ -1935,24 +1914,22 @@ void MainWindow::onSierpinskiCarpetInc()
(scene.lcc)->free_mark(markEdges);
(scene.lcc)->free_mark(markFaces);
// std::cout << "nb_edges=" << edges.size() << std::endl;
if (afterConstructionUpdateAttributes)
{
if (updateAttributesMethodStdMap)
{
// on crée une map pour associer les plongements créés aux brins
// std::cout << "nbdarts=" << dart_map.size() << std::endl;
// on y fout les plongements existants déjà
// We create a map to associate embeddings to new darts
for(unsigned int i = 0; i < (unsigned int)edges.size(); i++)
{
dart_map.insert(std::pair<Dart_handle, LCC::Point>(edges[i], scene.lcc->point(edges[i])));
dart_map.insert(std::pair<Dart_handle, LCC::Point>
(edges[i], scene.lcc->point(edges[i])));
if (!(scene.lcc)->is_free(edges[i],2))
{
dart_map.insert(std::pair<Dart_handle, LCC::Point>((scene.lcc)->beta(edges[i],2), scene.lcc->point((scene.lcc)->beta(edges[i],2))));
dart_map.insert(std::pair<Dart_handle, LCC::Point>
((scene.lcc)->beta(edges[i],2),
scene.lcc->point((scene.lcc)->beta(edges[i],2))));
}
}
// std::cout << "nbdarts=" << dart_map.size() << std::endl;
}
}
@ -1962,9 +1939,6 @@ void MainWindow::onSierpinskiCarpetInc()
}
edges.clear();
// std::cout << "phase 1" << std::endl;
// std::cout << "nbfacesinit=" << nbfacesinit << std::endl;
for(unsigned int i = 0; i < nbfacesinit; i++)
{
sierpinski_carpet_split_face_in_nine(sierpinskiCarpetSurfaces[i]);
@ -1977,17 +1951,9 @@ void MainWindow::onSierpinskiCarpetInc()
if (neverUpdateAttributes)
{
std::cout << "validate scene..." << std::endl;
std::cout << "BOOST_VERSION=" << BOOST_VERSION << std::endl;
#if defined(BOOST_NO_VARIADIC_TEMPLATES)
std::cout << "BOOST_NO_VARIADIC_TEMPLATES" << " defined" << std::endl;
#else
std::cout << "BOOST_NO_VARIADIC_TEMPLATES" << " not defined" << std::endl;
#endif
scene.lcc->correct_invalid_attributes();
// maintenant que la scène est valide, on offre la possibilité de calculer une géométrie qui correspond à un tapis de Sierpinski
// Now that the map is valid, we can compute the geometry
if (isComputableGeometry)
{
computeGeometry = true;
@ -2010,15 +1976,10 @@ void MainWindow::onSierpinskiCarpetInc()
void MainWindow::sierpinski_carpet_update_geometry()
{
// std::cout << "phase 2" << std::endl;
// std::cout << "nbfaces=" << sierpinskiCarpetSurfaces.size() << std::endl;
if (updateAttributesMethodStdMap)
{
// std::cout << "nbdarts=" << dart_map.size() << std::endl;
for(unsigned int i = 0; i < (unsigned int)new_darts.size(); i++) {
// if (dart_map.find(new_darts[i]) == dart_map.end())
// std::cout << "key not found" << std::endl;
for(unsigned int i = 0; i < (unsigned int)new_darts.size(); i++)
{
sierpinski_carpet_copy_attributes_and_embed_vertex(new_darts[i], dart_map[new_darts[i]]);
}
@ -2032,17 +1993,21 @@ void MainWindow::sierpinski_carpet_update_geometry()
for(unsigned int i = 0; i < nbfacesinit; i++)
{
// on récupère la géométrie des 4 coins de la face courante
// Geometry of the 4 corners of the current face
LCC::Point p[4][4];
Dart_handle d00 = sierpinskiCarpetSurfaces[i];
Dart_handle d03 = scene.lcc->beta(d00,1,2,1,1,2,1,1);
Dart_handle d33 = scene.lcc->beta(d03,1,2,1,1,2,1,1);
Dart_handle d30 = scene.lcc->beta(d33,1,2,1,1,2,1,1);
sierpinski_carpet_compute_4x4_geometry_matrix(p, scene.lcc->point(d00), scene.lcc->point(d03), scene.lcc->point(d33), scene.lcc->point(d30));
sierpinski_carpet_compute_4x4_geometry_matrix(p,
scene.lcc->point(d00),
scene.lcc->point(d03),
scene.lcc->point(d33),
scene.lcc->point(d30));
Dart_handle dh = sierpinskiCarpetSurfaces[i];
// bord du bas
// bottom border
dh = scene.lcc->beta(dh,1,2,1);
if ( ! (scene.lcc)->is_marked(dh, markVertices) )
{
@ -2056,7 +2021,7 @@ void MainWindow::sierpinski_carpet_update_geometry()
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
// bord de droite
// right border
dh = scene.lcc->beta(dh,1,1,2,1);
if ( ! (scene.lcc)->is_marked(dh, markVertices) )
{
@ -2070,7 +2035,7 @@ void MainWindow::sierpinski_carpet_update_geometry()
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
// bord du haut
// top border
dh = scene.lcc->beta(dh,1,1,2,1);
if ( ! (scene.lcc)->is_marked(dh, markVertices) )
{
@ -2084,7 +2049,7 @@ void MainWindow::sierpinski_carpet_update_geometry()
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
// bord de gauche
// left border
dh = scene.lcc->beta(dh,1,1,2,1);
if ( ! (scene.lcc)->is_marked(dh, markVertices) )
{
@ -2100,186 +2065,21 @@ void MainWindow::sierpinski_carpet_update_geometry()
dh = sierpinskiCarpetSurfaces[i];
// milieu sommet en bas à gauche
// middle vertex, bottom left
dh = scene.lcc->beta(dh,1,1);
sierpinski_carpet_copy_attributes_and_embed_vertex(dh, p[1][1]);
// milieu sommet en haut à gauche
// middle vertex, top left
dh = scene.lcc->beta(dh,2,1,1);
sierpinski_carpet_copy_attributes_and_embed_vertex(dh, p[2][1]);
// milieu sommet en haut à droite
// middle vertex, top right
dh = scene.lcc->beta(dh,2,1,2,1,1,2,1);
sierpinski_carpet_copy_attributes_and_embed_vertex(dh, p[2][2]);
// milieu sommet en bas à droite
// middle vertex, bottom right
dh = scene.lcc->beta(dh,2,1,1);
sierpinski_carpet_copy_attributes_and_embed_vertex(dh, p[1][2]);
/*
Dart_handle dh = sierpinskiCarpetSurfaces[i];
LCC::Point p[4][4];
p[0][0] = scene.lcc->point(dh);
dh = scene.lcc->beta(dh,1,2,1,1,2,1,1);
p[0][3] = scene.lcc->point(dh);
dh = scene.lcc->beta(dh,1,2,1,1,2,1,1);
p[3][3] = scene.lcc->point(dh);
dh = scene.lcc->beta(dh,1,2,1,1,2,1,1);
p[3][0] = scene.lcc->point(dh);
// std::cout << " p00= " << p[0][0] << std::endl;
// std::cout << " p03= " << p[0][3] << std::endl;
// std::cout << " p33= " << p[3][3] << std::endl;
// std::cout << " p30= " << p[3][0] << std::endl;
dh = sierpinskiCarpetSurfaces[i];
LCC::Vector v1, v2, v3;
// bord du bas
dh = scene.lcc->beta(dh,1,2,1);
if ( (scene.lcc)->is_marked(dh, markVertices) )
{
p[0][1] = scene.lcc->point(dh);
}
else
{
v1 = LCC::Traits::Construct_vector() (p[0][0],p[0][3]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
p[0][1] = LCC::Traits::Construct_translated_point() (p[0][0],v2);
copy_attributes_and_embed_vertex(dh, p[0][1]);
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
dh = scene.lcc->beta(dh,1,2,1);
if ( (scene.lcc)->is_marked(dh, markVertices) )
{
p[0][2] = scene.lcc->point(dh);
}
else
{
v1 = LCC::Traits::Construct_vector() (p[0][0],p[0][3]);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[0][2] = LCC::Traits::Construct_translated_point() (p[0][0],v3);
copy_attributes_and_embed_vertex(dh, p[0][2]);
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
// bord de droite
dh = scene.lcc->beta(dh,1,1,2,1);
if ( (scene.lcc)->is_marked(dh, markVertices) )
{
p[1][3] = scene.lcc->point(dh);
}
else
{
v1 = LCC::Traits::Construct_vector() (p[0][3],p[3][3]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
p[1][3] = LCC::Traits::Construct_translated_point() (p[0][3],v2);
copy_attributes_and_embed_vertex(dh, p[1][3]);
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
dh = scene.lcc->beta(dh,1,2,1);
if ( (scene.lcc)->is_marked(dh, markVertices) )
{
p[2][3] = scene.lcc->point(dh);
}
else
{
v1 = LCC::Traits::Construct_vector() (p[0][3],p[3][3]);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[2][3] = LCC::Traits::Construct_translated_point() (p[0][3],v3);
copy_attributes_and_embed_vertex(dh, p[2][3]);
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
// bord du haut
dh = scene.lcc->beta(dh,1,1,2,1);
if ( (scene.lcc)->is_marked(dh, markVertices) )
{
p[3][2] = scene.lcc->point(dh);
}
else
{
v1 = LCC::Traits::Construct_vector() (p[3][3],p[3][0]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
p[3][2] = LCC::Traits::Construct_translated_point() (p[3][3],v2);
copy_attributes_and_embed_vertex(dh, p[3][2]);
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
dh = scene.lcc->beta(dh,1,2,1);
if ( (scene.lcc)->is_marked(dh, markVertices) )
{
p[3][1] = scene.lcc->point(dh);
}
else
{
v1 = LCC::Traits::Construct_vector() (p[3][3],p[3][0]);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[3][1] = LCC::Traits::Construct_translated_point() (p[3][3],v3);
copy_attributes_and_embed_vertex(dh, p[3][1]);
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
// bord de gauche
dh = scene.lcc->beta(dh,1,1,2,1);
if ( (scene.lcc)->is_marked(dh, markVertices) )
{
p[2][0] = scene.lcc->point(dh);
}
else
{
v1 = LCC::Traits::Construct_vector() (p[3][0],p[0][0]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
p[2][0] = LCC::Traits::Construct_translated_point() (p[3][0],v2);
copy_attributes_and_embed_vertex(dh, p[2][0]);
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
dh = scene.lcc->beta(dh,1,2,1);
if ( (scene.lcc)->is_marked(dh, markVertices) )
{
p[1][0] = scene.lcc->point(dh);
}
else
{
v1 = LCC::Traits::Construct_vector() (p[3][0],p[0][0]);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[1][0] = LCC::Traits::Construct_translated_point() (p[3][0],v3);
copy_attributes_and_embed_vertex(dh, p[1][0]);
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
dh = sierpinskiCarpetSurfaces[i];
// milieu sommet en bas à gauche
dh = scene.lcc->beta(dh,1,1);
v1 = LCC::Traits::Construct_vector() (p[0][1],p[3][1]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
p[1][1] = LCC::Traits::Construct_translated_point() (p[0][1],v2);
copy_attributes_and_embed_vertex(dh, p[1][1]);
// milieu sommet en haut à gauche
dh = scene.lcc->beta(dh,2,1,1);
v1 = LCC::Traits::Construct_vector() (p[0][1],p[3][1]);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[2][1] = LCC::Traits::Construct_translated_point() (p[0][1],v3);
copy_attributes_and_embed_vertex(dh, p[2][1]);
// milieu sommet en haut à droite
dh = scene.lcc->beta(dh,2,1,2,1,1,2,1);
v1 = LCC::Traits::Construct_vector() (p[3][2],p[0][2]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
p[2][2] = LCC::Traits::Construct_translated_point() (p[3][2],v2);
copy_attributes_and_embed_vertex(dh, p[2][2]);
// milieu sommet en bas à droite
dh = scene.lcc->beta(dh,2,1,1);
v1 = LCC::Traits::Construct_vector() (p[3][2],p[0][2]);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[1][2] = LCC::Traits::Construct_translated_point() (p[3][2],v3);
copy_attributes_and_embed_vertex(dh, p[1][2]);
*/
}
scene.lcc->unmark_all(markVertices);
@ -2303,7 +2103,8 @@ void MainWindow::sierpinski_carpet_compute_geometry()
Dart_handle dh = sierpinskiCarpetSurfaces[i];
// bord du bas
// Geometry of the 4 corners of the current face
// bottom border
dh = scene.lcc->beta(dh,1,2,1);
if ( ! (scene.lcc)->is_marked(dh, markVertices) )
{
@ -2317,7 +2118,7 @@ void MainWindow::sierpinski_carpet_compute_geometry()
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
// bord de droite
// right border
dh = scene.lcc->beta(dh,1,1,2,1);
if ( ! (scene.lcc)->is_marked(dh, markVertices) )
{
@ -2331,7 +2132,7 @@ void MainWindow::sierpinski_carpet_compute_geometry()
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
// bord du haut
// top border
dh = scene.lcc->beta(dh,1,1,2,1);
if ( ! (scene.lcc)->is_marked(dh, markVertices) )
{
@ -2345,7 +2146,7 @@ void MainWindow::sierpinski_carpet_compute_geometry()
CGAL::mark_cell<LCC,0>(*(scene.lcc), dh, markVertices);
}
// bord de gauche
// left border
dh = scene.lcc->beta(dh,1,1,2,1);
if ( ! (scene.lcc)->is_marked(dh, markVertices) )
{
@ -2361,19 +2162,19 @@ void MainWindow::sierpinski_carpet_compute_geometry()
dh = sierpinskiCarpetSurfaces[i];
// milieu sommet en bas à gauche
// middle vertex, bottom left
dh = scene.lcc->beta(dh,1,1);
scene.lcc->point(dh) = p[1][1];
// milieu sommet en haut à gauche
// middle vertex, top left
dh = scene.lcc->beta(dh,2,1,1);
scene.lcc->point(dh) = p[2][1];
// milieu sommet en haut à droite
// middle vertex, top right
dh = scene.lcc->beta(dh,2,1,2,1,1,2,1);
scene.lcc->point(dh) = p[2][2];
// milieu sommet en bas à droite
// middle vertex, bottom right
dh = scene.lcc->beta(dh,2,1,1);
scene.lcc->point(dh) = p[1][2];
@ -2383,7 +2184,9 @@ void MainWindow::sierpinski_carpet_compute_geometry()
CGAL_assertion( (scene.lcc)->is_whole_map_unmarked(markVertices) );
}
void MainWindow::sierpinski_carpet_compute_4x4_geometry_matrix(LCC::Point p[4][4], LCC::Point& p00, LCC::Point& p03, LCC::Point& p33, LCC::Point& p30)
void MainWindow::sierpinski_carpet_compute_4x4_geometry_matrix
(LCC::Point p[4][4], LCC::Point& p00, LCC::Point& p03,
LCC::Point& p33, LCC::Point& p30)
{
p[0][0] = p00;
p[0][3] = p03;
@ -2392,37 +2195,37 @@ void MainWindow::sierpinski_carpet_compute_4x4_geometry_matrix(LCC::Point p[4][4
LCC::Vector v1, v2, v3;
// bord du bas
// bottom border
v1 = LCC::Traits::Construct_vector() (p[0][0],p[0][3]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[0][1] = LCC::Traits::Construct_translated_point() (p[0][0],v2);
p[0][2] = LCC::Traits::Construct_translated_point() (p[0][0],v3);
// bord de droite
// right border
v1 = LCC::Traits::Construct_vector() (p[0][3],p[3][3]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[1][3] = LCC::Traits::Construct_translated_point() (p[0][3],v2);
p[2][3] = LCC::Traits::Construct_translated_point() (p[0][3],v3);
// bord du haut
// top border
v1 = LCC::Traits::Construct_vector() (p[3][3],p[3][0]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[3][2] = LCC::Traits::Construct_translated_point() (p[3][3],v2);
p[3][1] = LCC::Traits::Construct_translated_point() (p[3][3],v3);
// bord de gauche
// left border
v1 = LCC::Traits::Construct_vector() (p[3][0],p[0][0]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[2][0] = LCC::Traits::Construct_translated_point() (p[3][0],v2);
p[1][0] = LCC::Traits::Construct_translated_point() (p[3][0],v3);
// milieu colonne de gauche
// middle, left column
v1 = LCC::Traits::Construct_vector() (p[0][1],p[3][1]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p[1][1] = LCC::Traits::Construct_translated_point() (p[0][1],v2);
p[2][1] = LCC::Traits::Construct_translated_point() (p[0][1],v3);
// milieu colonne de droite
// middle, right column
v1 = LCC::Traits::Construct_vector() (p[3][2],p[0][2]);
v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
@ -2430,17 +2233,15 @@ void MainWindow::sierpinski_carpet_compute_4x4_geometry_matrix(LCC::Point p[4][4
p[1][2] = LCC::Traits::Construct_translated_point() (p[3][2],v3);
}
void MainWindow::sierpinski_carpet_copy_attributes_and_embed_vertex(Dart_handle dh, LCC::Point& p)
void MainWindow::sierpinski_carpet_copy_attributes_and_embed_vertex
(Dart_handle dh, LCC::Point& p)
{
LCC::Attribute_handle<0>::type ah = (scene.lcc)->create_vertex_attribute(p);
// std::cout << "one dart... " << dart_map[new_darts[i]] << " -- " << dart_map[scene.lcc->beta(new_darts[i],1)] << std::endl;
for ( LCC::Dart_of_cell_range<0>::iterator
it=(scene.lcc)->darts_of_cell<0>(dh).begin();
it != (scene.lcc)->darts_of_cell<0>(dh).end(); ++it )
{
// std::cout << "dart of the orbit" << std::endl;
// We copy all the attributes except for dim=0
// on recopie les attributs du premier brin de la première face ...
LCC::Helper::Foreach_enabled_attributes_except
<CGAL::internal::Group_attribute_functor_of_dart<LCC>, 0>::
run(scene.lcc,sierpinskiCarpetSurfaces[0],it);
@ -2473,35 +2274,14 @@ void MainWindow::sierpinski_carpet_split_edge_in_three(Dart_handle dh)
if (afterConstructionUpdateAttributes && updateAttributesMethodStdMap)
{
// std::cout << "sierpinski_carpet_split_edge_in_three" << std::endl;
// std::cout << "nbdarts=" << dart_map.size() << std::endl;
// LCC::Point p1 = scene.lcc->point(dh);
// LCC::Point p2 = scene.lcc->point(scene.lcc->other_extremity(dh));
LCC::Point p1 = dart_map[dh];
// std::cout << "nbdarts=" << dart_map.size() << std::endl;
LCC::Point p2 = dart_map[scene.lcc->other_extremity(dh)];
// std::cout << "nbdarts=" << dart_map.size() << std::endl;
// std::cout << "p1 = " << p1 << std::endl;
// std::cout << "p2 = " << p2 << std::endl;
LCC::Vector v1 = LCC::Traits::Construct_vector() (p1,p2);
LCC::Vector v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
LCC::Vector v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
p3 = LCC::Traits::Construct_translated_point() (p1,v2);
p4 = LCC::Traits::Construct_translated_point() (p1,v3);
// std::cout << "p3 = " << p3 << std::endl;
// std::cout << "p4 = " << p4 << std::endl;
/*
(scene.lcc)->insert_point_in_cell<1>(dh,p4);
(scene.lcc)->insert_point_in_cell<1>(dh,p3);
*/
/*
LCC::Attribute_handle<0>::type ah_p4 = (scene.lcc)->create_vertex_attribute(p4);
LCC::Attribute_handle<0>::type ah_p3 = (scene.lcc)->create_vertex_attribute(p3);
*/
}
Dart_handle d1=
@ -2512,41 +2292,13 @@ void MainWindow::sierpinski_carpet_split_edge_in_three(Dart_handle dh)
if (afterConstructionUpdateAttributes && updateAttributesMethodStdMap)
{
// dart_map.insert(std::pair<Dart_handle, LCC::Point>((scene.lcc)->beta(dh,1), p4));
// std::cout << "--> nbdarts=" << dart_map.size() << std::endl;
dart_map.insert(std::pair<Dart_handle, LCC::Point>(d1, p4));
// std::cout << "--> nbdarts=" << dart_map.size() << std::endl;
if (!(scene.lcc)->is_free(d1,2))
{
// std::cout << "d1 not 2-free" << std::endl;
//std::cout << dart_map[(scene.lcc)->beta(d1,2,1)] << std::endl;
dart_map.insert(std::pair<Dart_handle, LCC::Point>((scene.lcc)->beta(d1,2,1), p4));
}
// std::cout << "--> nbdarts=" << dart_map.size() << std::endl;
new_darts.push_back((scene.lcc)->beta(dh,1));
// dart_map.insert(std::pair<Dart_handle, LCC::Point>(dh, p3));
// new_darts.push_back(dh);
}
/*
int m=(scene.lcc)->get_new_mark();
for ( LCC::Dart_of_cell_basic_range<1>::iterator
it=(scene.lcc)->darts_of_cell_basic<1>(dh, m).begin();
it != (scene.lcc)->darts_of_cell_basic<1>(dh, m).end(); ++it )
{
std::cout << "dart of the orbit" << std::endl;
// We copy all the attributes except for dim=0
LCC::Helper::Foreach_enabled_attributes_except
<CGAL::internal::Group_attribute_functor_of_dart<LCC>, 0>::
run(scene.lcc,it,(scene.lcc)->beta(it,1));
// We initialise the 0-atttrib to ah
CGAL::internal::Set_i_attribute_of_dart_functor<LCC, 0>::
run(scene.lcc, (scene.lcc)->beta(it,1), ah_p4);
}
CGAL::internal::Degroup_attribute_functor_run<LCC, 1>::
run(scene.lcc, dh, (scene.lcc)->beta(dh,1));
CGAL_assertion((scene.lcc)->is_whole_map_unmarked(m));
(scene.lcc)->free_mark(m);
*/
Dart_handle d2=
CGAL::insert_cell_0_in_cell_1(*(scene.lcc),
@ -2556,42 +2308,18 @@ void MainWindow::sierpinski_carpet_split_edge_in_three(Dart_handle dh)
if (afterConstructionUpdateAttributes && updateAttributesMethodStdMap)
{
// dart_map.insert(std::pair<Dart_handle, LCC::Point>((scene.lcc)->beta(dh,1), p3));
dart_map.insert(std::pair<Dart_handle, LCC::Point>(d2, p3));
// std::cout << "--> nbdarts=" << dart_map.size() << std::endl;
if (!(scene.lcc)->is_free(d2,2))
{
// std::cout << "d2 not 2-free" << std::endl;
dart_map.insert(std::pair<Dart_handle, LCC::Point>((scene.lcc)->beta(d2,2,1), p3));
}
// std::cout << "--> nbdarts=" << dart_map.size() << std::endl;
new_darts.push_back((scene.lcc)->beta(dh,1));
// dart_map.insert(std::pair<Dart_handle, LCC::Point>(dh, p3));
// new_darts.push_back(dh);
}
/*
m=(scene.lcc)->get_new_mark();
for ( LCC::Dart_of_cell_basic_range<1>::iterator
it=(scene.lcc)->darts_of_cell_basic<1>(dh, m).begin();
it != (scene.lcc)->darts_of_cell_basic<1>(dh, m).end(); ++it )
{
// We copy all the attributes except for dim=0
LCC::Helper::Foreach_enabled_attributes_except
<CGAL::internal::Group_attribute_functor_of_dart<LCC>, 0>::
run(scene.lcc,it,(scene.lcc)->beta(it,1));
// We initialise the 0-atttrib to ah
CGAL::internal::Set_i_attribute_of_dart_functor<LCC, 0>::
run(scene.lcc, (scene.lcc)->beta(it,1), ah_p3);
}
CGAL::internal::Degroup_attribute_functor_run<LCC, 1>::
run(scene.lcc, dh, (scene.lcc)->beta(dh,1));
CGAL_assertion((scene.lcc)->is_whole_map_unmarked(m));
(scene.lcc)->free_mark(m);
*/
}
}
void MainWindow::sierpinski_carpet_split_face_in_three(Dart_handle dh, bool removecenter)
void MainWindow::sierpinski_carpet_split_face_in_three(Dart_handle dh,
bool removecenter)
{
Dart_handle d1=
CGAL::insert_cell_1_in_cell_2(*(scene.lcc),
@ -2650,7 +2378,8 @@ void MainWindow::sierpinski_carpet_split_face_in_nine(Dart_handle dh)
sierpinskiCarpetSurfaces.push_back(e2);
sierpinskiCarpetSurfaces.push_back(e1);
// on transmet le beta2 pour ne pas insérer dans new_darts un brin qui sera supprimé lors de la suppression de la face du milieu
// We give the beta2 to not insert in new_darts a dart that will be removed
// during the removal of the middle face
sierpinski_carpet_split_edge_in_three(scene.lcc->beta(e1,2));
sierpinski_carpet_split_edge_in_three(e2);
@ -2659,7 +2388,6 @@ void MainWindow::sierpinski_carpet_split_face_in_nine(Dart_handle dh)
sierpinski_carpet_split_face_in_three(scene.lcc->beta(e2,0), false);
}
void MainWindow::onSierpinskiCarpetDec()
{
#ifdef CGAL_PROFILE_LCC_DEMO
@ -2696,9 +2424,12 @@ void MainWindow::onSierpinskiCarpetDec()
for(unsigned int i = 0; i < edges.size(); i++)
{
CGAL::remove_cell<LCC,1>(*scene.lcc, scene.lcc->beta(edges[i],0), duringConstructionUpdateAttributes);
CGAL::remove_cell<LCC,1>(*scene.lcc, scene.lcc->beta(edges[i],1), duringConstructionUpdateAttributes);
CGAL::remove_cell<LCC,1>(*scene.lcc, edges[i], duringConstructionUpdateAttributes);
CGAL::remove_cell<LCC,1>(*scene.lcc, scene.lcc->beta(edges[i],0),
duringConstructionUpdateAttributes);
CGAL::remove_cell<LCC,1>(*scene.lcc, scene.lcc->beta(edges[i],1),
duringConstructionUpdateAttributes);
CGAL::remove_cell<LCC,1>(*scene.lcc, edges[i],
duringConstructionUpdateAttributes);
}
edges.clear();
@ -2768,20 +2499,17 @@ void MainWindow::onSierpinskiCarpetDec()
recreate_whole_volume_list();
// statusBar ()->showMessage (QString ("Menger Dec"),DELAY_STATUSMSG);
statusBar ()->showMessage (QString ("Menger Dec"),DELAY_STATUSMSG);
emit(sceneChanged());
}
///////////////////////////////////////////////////////////////////////////////////
// SIERPINSKI TRIANGLE
///////////////////////////////////////////////////////////////////////////////////
void MainWindow::on_actionCreate_Sierpinski_Triangle_triggered ()
{
std::cout << "on_actionCreate_Sierpinski_Triangle_triggered" << std::endl;
sierpinskiTriangleUpdateAttributes = dialogsierpinskitriangle.updateAttributes->isChecked();
sierpinskiTriangleUpdateAttributes
= dialogsierpinskitriangle.updateAttributes->isChecked();
dialogsierpinskitriangle.level->disconnect(this);
@ -2837,15 +2565,12 @@ void MainWindow::onSierpinskiTriangleOk()
void MainWindow::onSierpinskiTriangleChangeLevel(int newLevel)
{
// std::cout << "onSierpinskiTriangleChangeLevel, newLevel=" << newLevel << std::endl;
while ( newLevel > sierpinskiTriangleLevel ) onSierpinskiTriangleInc();
while ( newLevel < sierpinskiTriangleLevel ) onSierpinskiTriangleDec();
}
void MainWindow::onSierpinskiTriangleUpdateAttributes(bool newValue)
{
std::cout << "onSierpinskiTriangleUpdateAttributes, newValue=" << newValue << std::endl;
sierpinskiTriangleUpdateAttributes = newValue;
}
@ -2901,16 +2626,12 @@ void MainWindow::onSierpinskiTriangleInc()
(scene.lcc)->free_mark(markEdges);
(scene.lcc)->free_mark(markFaces);
std::cout << "nb_edges=" << edges.size() << std::endl;
for(unsigned int i = 0; i < (unsigned int)edges.size(); i++)
{
sierpinski_triangle_split_edge_in_two(edges[i]);
}
edges.clear();
std::cout << "nbfacesinit=" << nbfacesinit << std::endl;
for(unsigned int i = 0; i < nbfacesinit; i++)
{
sierpinski_triangle_split_face_in_four(sierpinskiTriangleSurfaces[i],true);
@ -2918,15 +2639,6 @@ void MainWindow::onSierpinskiTriangleInc()
if (!sierpinskiTriangleUpdateAttributes)
{
std::cout << "validate scene..." << std::endl;
std::cout << "BOOST_VERSION=" << BOOST_VERSION << std::endl;
#if defined(BOOST_NO_VARIADIC_TEMPLATES)
std::cout << "BOOST_NO_VARIADIC_TEMPLATES" << " defined" << std::endl;
#else
std::cout << "BOOST_NO_VARIADIC_TEMPLATES" << " not defined" << std::endl;
#endif
std::cout << "set 3-attributes on all 3-cells" << std::endl;
for(unsigned int i = nbfacesinit; i < (unsigned int)sierpinskiTriangleSurfaces.size(); i++)
{
LCC::Attribute_handle<3>::type ah = (scene.lcc)->create_attribute<3>();
@ -2943,8 +2655,6 @@ void MainWindow::onSierpinskiTriangleInc()
scene.lcc->correct_invalid_attributes();
}
// std::cout << removedTriangles.size() << std::endl;
#ifdef CGAL_PROFILE_LCC_DEMO
timer.stop();
std::cout<<"Time to increase the level of sierpinski triangle ("
@ -2998,7 +2708,7 @@ void MainWindow::sierpinski_triangle_split_face_in_four(Dart_handle dh, bool rem
// at this step, the map is correctly 0-embedded, any other attribute is set
// (call of insert_point_in_cell<1> with update_attributes set to true)
CGAL::remove_cell<LCC,2>(*scene.lcc,scene.lcc->beta(d3,2),sierpinskiTriangleUpdateAttributes); // BUG HERE
CGAL::remove_cell<LCC,2>(*scene.lcc,scene.lcc->beta(d3,2),sierpinskiTriangleUpdateAttributes);
if (sierpinskiTriangleUpdateAttributes)
{
@ -3011,26 +2721,6 @@ void MainWindow::sierpinski_triangle_split_face_in_four(Dart_handle dh, bool rem
(scene.lcc)->set_dart_attribute<0>(scene.lcc->beta(d2,1),(scene.lcc)->create_vertex_attribute(scene.lcc->point(d1)));
(scene.lcc)->set_dart_attribute<0>(scene.lcc->beta(d3,1),(scene.lcc)->create_vertex_attribute(scene.lcc->point(d2)));
(scene.lcc)->set_dart_attribute<0>(scene.lcc->beta(d1,1),(scene.lcc)->create_vertex_attribute(scene.lcc->point(d3)));
/*
// this treatment is now performed in onSierpinskiTriangleInc, just before validate_scene
LCC::Attribute_handle<3>::type a2 = (scene.lcc)->create_attribute<3>();
(scene.lcc)->set_dart_attribute<3>(d1,a2);
(scene.lcc)->set_dart_attribute<3>(scene.lcc->beta(d1,1),a2);
(scene.lcc)->set_dart_attribute<3>(scene.lcc->beta(d1,1,1),a2);
scene.lcc->info<3>(d1).color()=
(CGAL::Color(myrandom.get_int(0,256),
myrandom.get_int(0,256),
myrandom.get_int(0,256)));
LCC::Attribute_handle<3>::type a3 = (scene.lcc)->create_attribute<3>();
(scene.lcc)->set_dart_attribute<3>(d2,a3);
(scene.lcc)->set_dart_attribute<3>(scene.lcc->beta(d2,1),a3);
(scene.lcc)->set_dart_attribute<3>(scene.lcc->beta(d2,1,1),a3);
scene.lcc->info<3>(d2).color()=
(CGAL::Color(myrandom.get_int(0,256),
myrandom.get_int(0,256),
myrandom.get_int(0,256)));
*/
}
}
else
@ -3049,23 +2739,13 @@ void MainWindow::onSierpinskiTriangleDec()
timer.start();
#endif
// std::cout << sierpinskiTriangleLevel << std::endl;
this->sierpinskiTriangleLevel--;
int nbt = CGAL::ipower(3,this->sierpinskiTriangleLevel);
// std::cout << removedTriangles.size() << " " << nbt << std::endl;
// First we add triangles removed during construction process
for ( unsigned int i = removedTriangles.size() - nbt; i < removedTriangles.size(); i++)
{
/*
Dart_handle d = scene.lcc->make_triangle(scene.lcc->point(scene.lcc->beta(sierpinskiTriangleSurfaces[i],0)),
scene.lcc->point(scene.lcc->beta(sierpinskiTriangleSurfaces[i+1],0)),
scene.lcc->point(scene.lcc->beta(sierpinskiTriangleSurfaces[i+2],0)));
scene.lcc->sew<2>(scene.lcc->beta(d,1,1), scene.lcc->beta(sierpinskiTriangleSurfaces[i],1));
scene.lcc->sew<2>(scene.lcc->beta(d,1,1,1), scene.lcc->beta(sierpinskiTriangleSurfaces[i+1],1));
scene.lcc->sew<2>(scene.lcc->beta(d,1,1,1,1), scene.lcc->beta(sierpinskiTriangleSurfaces[i+2],1));
*/
Dart_handle d1 = scene.lcc->create_dart();
Dart_handle d2 = scene.lcc->create_dart();
Dart_handle d3 = scene.lcc->create_dart();
@ -3176,11 +2856,6 @@ void MainWindow::onSierpinskiTriangleDec()
// statusBar ()->showMessage (QString ("Sirpinski Triangle Dec"),DELAY_STATUSMSG);
emit(sceneChanged());
}
#undef DELAY_STATUSMSG

4
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.h
View File

@ -96,9 +96,7 @@ template < class First, class Second, class Third > struct Triplet
}
Triplet()
{
}
{}
};
class MainWindow : public CGAL::Qt::DemosMainWindow, private Ui::MainWindow

51
Linear_cell_complex/include/CGAL/Linear_cell_complex.h
View File

@ -114,6 +114,12 @@ namespace CGAL {
using Base::null_handle;
using Base::point_of_vertex_attribute;
using Base::are_attributes_automatically_managed;
using Base::mark;
using Base::unmark;
using Base::free_mark;
using Base::get_new_mark;
Linear_cell_complex_base() : Base()
{}
@ -352,18 +358,37 @@ namespace CGAL {
*/
void correct_invalid_attributes()
{
Base::correct_invalid_attributes();
// Copy of the code in CMap::correct_invalid_attributes() to avoid
// 2 iterations through the darts of the map.
// Each dart needs to have a 0-embedding
for (typename Dart_range::iterator it(this->darts().begin()),
itend(this->darts().end()); it != itend; ++it)
std::vector<int> marks(dimension+1);
for ( int i=0; i<=dimension; ++i)
marks[i] = -1;
Helper::template
Foreach_enabled_attributes<Reserve_mark_functor<Self> >::
run(this,&marks);
for ( typename Dart_range::iterator it(this->darts().begin()),
itend(this->darts().end()); it!=itend; ++it)
{
Helper::template Foreach_enabled_attributes
<internal::Correct_invalid_attributes_functor<Self> >::
run(this,it,&marks);
if ( vertex_attribute(it)==null_handle )
{
// If a dart don't have a 0-attribute, we create a Point at the origin
set_vertex_attribute(it, create_vertex_attribute(CGAL::ORIGIN));
}
}
for ( int i=0; i<=dimension; ++i)
if ( marks[i]!=-1 )
{
CGAL_assertion( this->is_whole_map_marked(marks[i]) );
free_mark(marks[i]);
}
}
/** test if the two given facets have the same geometry
@ -802,18 +827,18 @@ namespace CGAL {
return res;
}
/** Return the status of the managment of the attributes of the CMap
*/
bool are_attributes_automatically_managed() const
{
return Base::are_attributes_automatically_managed();
}
/** Set the status of the managment of the attributes of the CMap
*/
void set_update_attributes(bool automatic_attributes_management)
void set_update_attributes(bool newval)
{
Base::set_automatic_attributes_management(automatic_attributes_management);
if (this->automatic_attributes_management == false && newval == true)
{
// We need to recode this function because correct_invalid_attributes
// is not a virtual function.
correct_invalid_attributes();
}
this->automatic_attributes_management = newval;
}
};