diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_1_Refine_1.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_1_Refine_1.tex index 243e5422083..f1a26c90594 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_1_Refine_1.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_1_Refine_1.tex @@ -9,6 +9,7 @@ Refines a given \ccc{AlgebraicKernel_d_1::AlgebraicReal_1}. \ccTypes \ccThree{typedef AlgebraicKernel_d_1::Algebraic_real_1}{argument_type+}{} \ccTypedef{typedef void result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_1::Algebraic_real_1 argument_type;}{} \ccOperations diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_1_Solve_1.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_1_Solve_1.tex index 7af4ff4133e..00e4186cb19 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_1_Solve_1.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_1_Solve_1.tex @@ -7,18 +7,18 @@ Computes the real roots of a univariate polynomial. \ccc{AdaptableBinaryFunction} \ccTypes -\ccThree{typedef AlgebraicKernel_d_1::Polynomial_1}{first_argument_type+}{} -\ccTypedef{typedef AlgebraicKernel_d_1::Polynomial_1 first_argument_type;}{} +\ccThree{typedef AlgebraicKernel_d_1::Polynomial_1}{argument_type+}{} +\ccTypedef{typedef AlgebraicKernel_d_1::Polynomial_1 argument_type;}{} \ccCreationVariable{fo} \ccOperations A model of this type must provide: -\ccThree{OutputIterator}{fo(first_argument_type,++}{} +\ccThree{OutputIterator}{fo(argument_type,++}{} \ccMethod{template < class OutputIterator > OutputIterator - operator()(const first_argument_type &p, + operator()(const argument_type &p, OutputIterator res, bool known_to_be_square_free=false);} {Copies in the output iterator the roots of \ccc{p} as objects of type \ccc{AlgebraicKernel_d_1::Algebraic_real_1}. The boolean indicates @@ -27,7 +27,7 @@ not known.} \ccMethod{template < class OutputIterator > OutputIterator - operator()(const first_argument_type &p, + operator()(const argument_type &p, OutputIterator res);} {Copies in the output iterator the roots of \ccc{p} with their multiplicity, as objects of type diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_BoundaryBetween_2.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_BoundaryBetween_2.tex index 5eb6d25b930..ea659cda7f4 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_BoundaryBetween_2.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_BoundaryBetween_2.tex @@ -11,7 +11,9 @@ Computes a number of type \ccTypes \ccThree{typedef AlgebraicKernel_d_2::Algebraic_real_2}{second_argument_type+}{} \ccTypedef{typedef AlgebraicKernel_d_1::Boundary result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 first_argument_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 second_argument_type;}{} \ccOperations @@ -52,7 +54,9 @@ Computes a number of type \ccTypes \ccThree{typedef AlgebraicKernel_d_2::Algebraic_real_2}{second_argument_type+}{} \ccTypedef{typedef AlgebraicKernel_d_1::Boundary result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 first_argument_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 second_argument_type;}{} \ccOperations diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Get_2.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Get_2.tex index 092fe7d9562..388ad7398ca 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Get_2.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Get_2.tex @@ -12,6 +12,7 @@ Returns the first coordinate of an \ccTypes \ccThree{typedef AlgebraicKernel_d_1::Algebraic_real_1}{argument_type+}{} \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_1 result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 argument_type;}{} \ccOperations @@ -49,6 +50,7 @@ Returns the second coordinate of an \ccTypes \ccThree{typedef AlgebraicKernel_d_1::Algebraic_real_1}{argument_type+}{} \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_1 result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 argument_type;}{} \ccOperations diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_IsCoprime_2.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_IsCoprime_2.tex index 9263c901b01..62f2ba32b52 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_IsCoprime_2.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_IsCoprime_2.tex @@ -22,7 +22,7 @@ A model \ccVar\ of this type must provide: \ccMethod{ result_type - operator()(const first_argument_type& p1 + operator()(const first_argument_type& p1, const second_argument_type& p2);} {} diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_LowerBoundary_2.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_LowerBoundary_2.tex index aa958c19e72..6632b7777c3 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_LowerBoundary_2.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_LowerBoundary_2.tex @@ -10,6 +10,7 @@ Returns the current lower boundary of of the first coordinate of an \ccTypes \ccThree{typedef AlgebraicKernel_d_2::Algebraic_real_2}{argument_type+}{} \ccTypedef{typedef AlgebraicKernel_d_1::Boundary result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 argument_type;}{} \ccOperations @@ -43,6 +44,7 @@ Returns the current lower boundary of of the second coordinate of an \ccTypes \ccThree{typedef AlgebraicKernel_d_2::Algebraic_real_2}{argument_type+}{} \ccTypedef{typedef AlgebraicKernel_d_1::Boundary result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 argument_type;}{} \ccOperations diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Refine_2.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Refine_2.tex index 2eead120283..e7b016f52d6 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Refine_2.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Refine_2.tex @@ -10,6 +10,7 @@ Refines the first coordinate of a given \ccTypes \ccThree{typedef AlgebraicKernel_d_2::Algebraic_real_2}{argument_type+}{} \ccTypedef{typedef void result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 argument_type;}{} @@ -54,6 +55,7 @@ Refines the second coordinate of a given \ccTypes \ccThree{typedef AlgebraicKernel_d_2::Algebraic_real_2}{argument_type+}{} \ccTypedef{typedef void result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 argument_type;}{} \ccOperations diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Solve_2.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Solve_2.tex index c1954221c57..55898a750c8 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Solve_2.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_Solve_2.tex @@ -6,6 +6,12 @@ Computes the pairs of real roots of a system of two bivariate polynomials. \ccRefines \ccc{AdaptableFunctor} with three arguments +\ccTypes +\ccThree{typedef AlgebraicKernel_d_2::Polynomial_2}{second_argument_type+}{} +\ccTypedef{typedef AlgebraicKernel_d_2::Polynomial_2 first_argument_type;}{} +\ccGlue +\ccTypedef{typedef AlgebraicKernel_d_2::Polynomial_2 second_argument_type;}{} + \ccCreationVariable{fo} \ccOperations @@ -14,8 +20,8 @@ A model \ccVar\ of this type must provide: \ccThree{OutputIterator}{fo(first_argument_type,++}{} \ccMethod{template < class OutputIterator > OutputIterator - operator()(const AlgebraicKernel_d_2::Polynomial_2 & p1, - const AlgebraicKernel_d_2::Polynomial_2 & p2, + operator()(const first_argument_type & p1, + const second_argument_type & p2, OutputIterator res);} {Copies in the output iterator the common roots of $p_1$ and $p_2$ with their multiplicity, as objects of type diff --git a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_UpperBoundary_2.tex b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_UpperBoundary_2.tex index ec18e13b80b..7e136c77e7a 100644 --- a/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_UpperBoundary_2.tex +++ b/Algebraic_kernel_d/doc_tex/Algebraic_kernel_d_ref/AlgebraicKernel_d_2_UpperBoundary_2.tex @@ -10,6 +10,7 @@ Returns the current upper boundary of of the first coordinate of an \ccTypes \ccThree{typedef AlgebraicKernel_d_2::Algebraic_real_2}{argument_type+}{} \ccTypedef{typedef AlgebraicKernel_d_1::Boundary result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 argument_type;}{} \ccOperations @@ -42,6 +43,7 @@ Returns the current upper boundary of of the second coordinate of an \ccTypes \ccThree{typedef AlgebraicKernel_d_2::Algebraic_real_2}{argument_type+}{} \ccTypedef{typedef AlgebraicKernel_d_1::Boundary result_type;}{} +\ccGlue \ccTypedef{typedef AlgebraicKernel_d_2::Algebraic_real_2 argument_type;}{} \ccOperations