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

Merged Degeneracy_strategy into enums.h

This commit is contained in:
Michael Kerber 2008-08-13 11:25:03 +00:00
parent ba18be8d30
commit 17df509a9b
5 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -272,7 +272,6 @@ Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Xy_coordinate_2.h -text
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/alg_real_utils.h -text
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h -text
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_pair_analysis_2.h -text
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Degeneracy_strategy.h -text
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Event_line_builder.h -text
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Shear_controller.h -text
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Shear_transformation.h -text

2
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h
View File

@ -39,7 +39,7 @@
#include <CGAL/Algebraic_curve_kernel_2/analyses/Shear_controller.h>
#include <CGAL/Algebraic_curve_kernel_2/analyses/Shear_transformation.h>
#include <CGAL/Algebraic_curve_kernel_2/analyses/Zero_resultant_exception.h>
#include <CGAL/Algebraic_curve_kernel_2/analyses/Degeneracy_strategy.h>
#include <CGAL/Algebraic_curve_kernel_2/enums.h>
#include <CGAL/Polynomial/sturm_habicht_sequence.h>
#include <CGAL/Algebraic_curve_kernel_2/analyses/shear.h>

2
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_pair_analysis_2.h
View File

@ -29,7 +29,7 @@
#include <CGAL/Algebraic_curve_kernel_2/analyses/Zero_resultant_exception.h>
#include <CGAL/Algebraic_curve_kernel_2/analyses/Shear_controller.h>
#include <CGAL/Algebraic_curve_kernel_2/analyses/Shear_transformation.h>
#include <CGAL/Algebraic_curve_kernel_2/analyses/Degeneracy_strategy.h>
#include <CGAL/Algebraic_curve_kernel_2/enums.h>
#include <CGAL/Algebraic_kernel_d/Non_generic_position_exception.h>
#include <CGAL/Algebraic_curve_kernel_2/Status_line_CPA_1.h>

35
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Degeneracy_strategy.h
View File

@ -1,35 +0,0 @@
// TODO: Add licence
//
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
//
// $URL:$
// $Id: $
//
//
// Author(s) : Michael Kerber <mkerber@mpi-inf.mpg.de>
//
// ============================================================================
#ifndef CGAL_ACK_DEGENERACY_STRATEGY
#define CGAL_ACK_DEGENERACY_STRATEGY 1
CGAL_BEGIN_NAMESPACE
/*!
* \brief Represents different strategies how to handle
* degenerate cases during the analysis
*
* Currently, there are two possible strategies implemented. See the
* constructor of \c Curve_analysis_2 for more details.
*/
enum Degeneracy_strategy {
SHEAR_STRATEGY = 0,
EXCEPTION_STRATEGY = 1,
SHEAR_ONLY_AT_IRRATIONAL_STRATEGY = 2
};
CGAL_END_NAMESPACE
#endif

15
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/enums.h
View File

@ -27,6 +27,21 @@ namespace CGALi {
};
/*!
* \brief Represents different strategies how to handle
* degenerate cases during the analysis
*
* Currently, there are two possible strategies implemented. See the
* constructor of \c Curve_analysis_2 for more details.
*/
enum Degeneracy_strategy {
SHEAR_STRATEGY = 0,
EXCEPTION_STRATEGY = 1,
SHEAR_ONLY_AT_IRRATIONAL_STRATEGY = 2
};
} // namespace CGALi
CGAL_END_NAMESPACE