Skip to content

Try to robustify Straight Skeleton #2917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sloriot wants to merge 18 commits into from
Closed

Try to robustify Straight Skeleton #2917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
72d82d8
robustify conversion to BigFloat
sloriot Mar 9, 2018
692aa74
factorize by the sqrt values to try to increase precision
sloriot Mar 9, 2018
1f7186b
use Root_of_2 to guarantee the validity of the predicate
sloriot Mar 9, 2018
691be33
Fixed SLS log tool compilation
MaelRL Mar 9, 2018
98a6221
Fixed compilation with GMPXX
MaelRL Mar 9, 2018
5f39212
more nt utils into a seperate file
sloriot Mar 6, 2019
972a1d8
decompose the time using roots
sloriot Mar 6, 2019
1ca61a2
WIP
sloriot Mar 27, 2019
b0b402b
WIP handle collinearity in event
sloriot Mar 28, 2019
654433f
compare distance rather than constructing them
sloriot Mar 28, 2019
7f93edc
WIP avoid computing the bisector_pt if it is an input
sloriot Mar 28, 2019
7242ddd
WIP add case for handling collinear edges
sloriot Mar 28, 2019
6272124
WIP handle degenerate case in intersecting 2 disconnected bisectors
sloriot Mar 28, 2019
ed1e69e
WIP handle cases where the denom of the main expression is 0
sloriot Apr 1, 2019
f308de7
WIP move evaluation into _aux
sloriot Apr 1, 2019
6c3f0d4
WIP predicate for field without sqrt
sloriot Apr 1, 2019
eb13ec9
call sqrt on Expr and not BigFloat
sloriot May 2, 2019
a69f545
WIP introduce a wrapper around constructed points
sloriot Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ Straight_skeleton_builder_2<Gt,Ss,V>::IsPseudoSplitEvent( EventPtr const& aEvent
}

if ( rPseudoSplitEvent )
rPseudoSplitEvent->SetTimeAndPoint(aEvent->time(),aEvent->point());
rPseudoSplitEvent->SetTimeAndPoint(aEvent->exact_time(),aEvent->exact_point());

return rPseudoSplitEvent ;
}
Expand Down
13 changes: 8 additions & 5 deletions Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include<ostream>

#include <CGAL/Straight_skeleton_2/Straight_skeleton_aux.h>
#include <CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h>

namespace CGAL {

Expand Down Expand Up @@ -74,10 +75,12 @@ class Event_2 : public Ref_counted_base

Triedge const& triedge () const { return mTriedge ; }
Trisegment_2_ptr const& trisegment() const { return mTrisegment; }
Point_2 const& point () const { return mP ; }
FT time () const { return mTime ; }
Point_2 const& point () const { return mP.pt ; } // TODO_INEXACT
CGAL_SS_i::Rational_point<Point_2, FT> const& exact_point() const { return mP; }
FT time () const { return mTime.to_nt() ; } // TODO_INEXACT
CGAL_SS_i::Rational_time<FT> exact_time () const { return mTime; }

void SetTimeAndPoint( FT aTime, Point_2 const& aP ) { mTime = aTime ; mP = aP ; }
void SetTimeAndPoint( CGAL_SS_i::Rational_time<FT> aTime, CGAL_SS_i::Rational_point<Point_2, FT> const& aP ) { mTime = aTime ; mP = aP ; }

friend std::ostream& operator<< ( std::ostream& ss, Self const& e )
{
Expand All @@ -96,8 +99,8 @@ private :

Triedge mTriedge ;
Trisegment_2_ptr mTrisegment ;
Point_2 mP ;
FT mTime ;
CGAL_SS_i::Rational_point<Point_2, FT> mP ;
Rational_time<FT> mTime ;
} ;

template<class SSkel_, class Traits_>
Expand Down
Loading