Skip to content
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.

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

Add missing fmpz_mod_mpoly_compose_ functions #2068

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions doc/source/fmpz_mod_mpoly.rst
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ Evaluation
Return `1` for success and `0` for failure.

.. function:: int fmpz_mod_mpoly_compose_fmpz_mod_mpoly_geobucket(fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_t B, fmpz_mod_mpoly_struct * const * C, const fmpz_mod_mpoly_ctx_t ctxB, const fmpz_mod_mpoly_ctx_t ctxAC)
int fmpz_mod_mpoly_compose_fmpz_mod_mpoly_horner(fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_t B, fmpz_mod_mpoly_struct * const * C, const fmpz_mod_mpoly_ctx_t ctxB, const fmpz_mod_mpoly_ctx_t ctxAC)
int fmpz_mod_mpoly_compose_fmpz_mod_mpoly(fmpz_mod_mpoly_t A, const fmpz_mod_mpoly_t B, fmpz_mod_mpoly_struct * const * C, const fmpz_mod_mpoly_ctx_t ctxB, const fmpz_mod_mpoly_ctx_t ctxAC)

Set *A* to the evaluation of *B* where the variables are replaced by the corresponding elements of the array *C*.
Expand Down
9 changes: 9 additions & 0 deletions src/fmpz_mod_mpoly.h
Original file line number Diff line number Diff line change
Expand Up @@ -570,10 +570,19 @@ int fmpz_mod_mpoly_compose_fmpz_mod_mpoly_geobucket(fmpz_mod_mpoly_t A,
const fmpz_mod_mpoly_t B, fmpz_mod_mpoly_struct * const * C,
const fmpz_mod_mpoly_ctx_t ctxB, const fmpz_mod_mpoly_ctx_t ctxAC);

int fmpz_mod_mpoly_compose_fmpz_mod_mpoly_horner(fmpz_mod_mpoly_t A,
const fmpz_mod_mpoly_t B, fmpz_mod_mpoly_struct * const * C,
const fmpz_mod_mpoly_ctx_t ctxB, const fmpz_mod_mpoly_ctx_t ctxAC);

int fmpz_mod_mpoly_compose_fmpz_mod_mpoly(fmpz_mod_mpoly_t A,
const fmpz_mod_mpoly_t B, fmpz_mod_mpoly_struct * const * C,
const fmpz_mod_mpoly_ctx_t ctxB, const fmpz_mod_mpoly_ctx_t ctxAC);

void fmpz_mod_mpoly_compose_fmpz_mod_mpoly_gen(fmpz_mod_mpoly_t A,
const fmpz_mod_mpoly_t B, const slong * c,
const fmpz_mod_mpoly_ctx_t ctxB, const fmpz_mod_mpoly_ctx_t ctxAC);


/* Multiplication ************************************************************/

void fmpz_mod_mpoly_mul(fmpz_mod_mpoly_t A,
Expand Down
6 changes: 3 additions & 3 deletions src/fmpz_mod_mpoly/compose_fmpz_mod_mpoly.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ int fmpz_mod_mpoly_compose_fmpz_mod_mpoly(
matrix_no_good:

fmpz_mat_clear(M);
/*

for (i = 0; i < ctxB->minfo->nvars; i++)
{
if (C[i]->length > 1)
{
return nmod_mpoly_compose_nmod_mpoly_horner(A, B, C, ctxB, ctxAC);
return fmpz_mod_mpoly_compose_fmpz_mod_mpoly_horner(A, B, C, ctxB, ctxAC);
}
}
*/

return fmpz_mod_mpoly_compose_fmpz_mod_mpoly_geobucket(A, B, C, ctxB, ctxAC);
}
48 changes: 48 additions & 0 deletions src/fmpz_mod_mpoly/compose_fmpz_mod_mpoly_gen.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
Copyright (C) 2020 Daniel Schultz

This file is part of FLINT.

FLINT is free software: you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License (LGPL) as published
by the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. See <https://www.gnu.org/licenses/>.
*/

#include "fmpz_mat.h"
#include "mpoly.h"
#include "fmpz_mod_mpoly.h"

/* evaluate B(x_1,...,x_n) at x_i = y_c[i], y_j are vars of ctxAC */
void fmpz_mod_mpoly_compose_fmpz_mod_mpoly_gen(fmpz_mod_mpoly_t A,
const fmpz_mod_mpoly_t B, const slong * c,
const fmpz_mod_mpoly_ctx_t ctxB, const fmpz_mod_mpoly_ctx_t ctxAC)
{
fmpz_mat_t M;

if (B->length == 0)
{
fmpz_mod_mpoly_zero(A, ctxAC);
return;
}

fmpz_mat_init(M, ctxAC->minfo->nfields + 1, ctxB->minfo->nfields);
mpoly_compose_mat_gen(M, c, ctxB->minfo, ctxAC->minfo);

if (A == B)
{
fmpz_mod_mpoly_t T;
fmpz_mod_mpoly_init(T, ctxAC);
_fmpz_mod_mpoly_compose_mat(T, B, M, ctxB, ctxAC);
fmpz_mod_mpoly_swap(A, T, ctxAC);
fmpz_mod_mpoly_clear(T, ctxAC);

Check warning on line 38 in src/fmpz_mod_mpoly/compose_fmpz_mod_mpoly_gen.c

View check run for this annotation

Codecov / codecov/patch

src/fmpz_mod_mpoly/compose_fmpz_mod_mpoly_gen.c#L34-L38

Added lines #L34 - L38 were not covered by tests
}
else
{
_fmpz_mod_mpoly_compose_mat(A, B, M, ctxB, ctxAC);
}

fmpz_mat_clear(M);

return;
}
Loading
Loading